Merge openembedded@openembedded.bkbits.net:packages-devel

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/20 14:53:40-06:00 ti.com!kergoth
Merge openembedded@openembedded.bkbits.net:packages-devel
into odin.sc.ti.com:/home/kergoth/code/packages

2004/11/20 14:53:29-06:00 ti.com!kergoth
Make sysvinit buildable when MACHINE isnt set.

2004/11/20 13:37:35-06:00 ti.com!kergoth
Fix m4 build: it helps to actually check in the patch.

BKrev: 419faed5LrotZK1H8sNbf6fRABPztw

diff --git a/m4/m4/make.patch b/m4/m4/make.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index 3bc0eb4..b1c2c01 100644 (file)
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -10,7 +10,12 @@ FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
 FILES_sysv-rc = "${sbindir}"
 PR = "r1"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+python () {
+       mach = oe.data.getVar('MACHINE', d, 1)
+       if mach:
+               oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
+}
+
 USE_VT ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \

diff --git a/sysvinit/sysvinit_2.86.oe b/sysvinit/sysvinit_2.86.oe
index e69de29..5c77a2d 100644 (file)
--- a/sysvinit/sysvinit_2.86.oe
+++ b/sysvinit/sysvinit_2.86.oe
@@ -0,0 +1,78 @@
+SECTION = "base"
+DESCRIPTION = "System-V like init."
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+FILES_${PN} += "/sbin /bin"
+PR = "r0"
+
+python () {
+       mach = oe.data.getVar('MACHINE', d, 1)
+       if mach:
+               oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
+}
+
+USE_VT ?= "1"
+
+SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz \
+          file://sysvinit-2.86.patch;patch=1 \
+          file://install.patch;patch=1 \
+           file://need \
+           file://provide \
+           file://inittab \
+           file://rcS-default \
+           file://rc \
+           file://rcS"
+S = "${WORKDIR}/sysvinit-2.85"
+B = "${S}/src"
+
+CFLAGS_prepend = "-D_GNU_SOURCE "
+export LCRYPT = "-lcrypt"
+EXTRA_OEMAKE += "'INSTALL=install' \
+                'bindir=/bin' \
+                'sbindir=/sbin' \
+                'usrbindir=${bindir}' \
+                'usrsbindir=${sbindir}' \
+                'includedir=${includedir}' \
+                'mandir=${mandir}'"
+
+do_install () {
+       oe_runmake 'ROOT=${D}' install
+       install -d ${D}/${sysconfdir} \
+                  ${D}/${sysconfdir}/default \
+                  ${D}/${sysconfdir}/init.d
+       install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
+       if [ ! -z "${SERIAL_CONSOLE}" ]; then
+               echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab
+       fi
+       if [ "${USE_VT}" == "1" ]; then
+               cat <<EOF >>${D}/etc/inittab
+# /sbin/getty invocations for the runlevels.
+#
+# The "id" field MUST be the same as the last
+# characters of the device (after "tty").
+#
+# Format:
+#  <id>:<runlevels>:<action>:<process>
+#
+1:2345:respawn:/sbin/getty 38400 tty1
+# 2:23:respawn:/sbin/getty 38400 tty2
+# 3:23:respawn:/sbin/getty 38400 tty3
+# 4:23:respawn:/sbin/getty 38400 tty4
+EOF
+       fi
+       install -m 0644    ${WORKDIR}/rcS-default       ${D}/etc/default/rcS
+       install -m 0755    ${WORKDIR}/rc                ${D}/etc/init.d
+       install -m 0755    ${WORKDIR}/rcS               ${D}/etc/init.d
+}
+
+
+do_install_append_ramses () {
+       cat <<EOF >>${D}/etc/inittab
+# Bluetooth
+#1:2345:respawn:/sbin/getty -L 115200 tts/1
+# External serial port
+4:2345:respawn:/sbin/getty -L 115200 tts/4
+# Framebuffer
+v1:2345:respawn:/sbin/getty -L 115200 vc/1
+EOF
+}