Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...

[vuplus_openembedded] / packages / sysvinit / sysvinit_2.86.bb

diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index c8ce5ba..e24ecf9 100644 (file)
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r34"
+PR = "r43"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -19,14 +19,14 @@ USE_VT ?= "1"
 SYSVINIT_ENABLED_GETTYS ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
-          file://install.patch;patch=1 \
+           file://install.patch;patch=1 \
            file://need \
            file://provide \
            file://inittab \
            file://rcS-default \
            file://rc \
            file://rcS \
-          file://bootlogd.init"
+           file://bootlogd.init"
 
 S = "${WORKDIR}/sysvinit-${PV}"
 B = "${S}/src"
@@ -36,10 +36,10 @@ inherit update-alternatives
 ALTERNATIVE_NAME = "init"
 ALTERNATIVE_LINK = "${base_sbindir}/init"
 ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit"
-ALTERNATIVE_PRIORITY = "50"
+ALTERNATIVE_PRIORITY = "60"
 
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
-FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
+FILES_${PN} += "${base_sbindir} ${base_bindir}"
 FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit"
 FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
 
@@ -51,13 +51,14 @@ EXTRA_OEMAKE += "'INSTALL=install' \
                 'usrbindir=${bindir}' \
                 'usrsbindir=${sbindir}' \
                 'includedir=${includedir}' \
-                'mandir=${mandir}'"
+                'mandir=${mandir}' \
+                DISTRO=''"
 
 do_install () {
        oe_runmake 'ROOT=${D}' install
-       install -d ${D}${sysconfdir} \
-                  ${D}${sysconfdir}/default \
-                  ${D}${sysconfdir}/init.d
+       install -d ${D}${sysconfdir}
+       install -d ${D}${sysconfdir}/default
+       install -d ${D}${sysconfdir}/init.d
        install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
        if [ ! -z "${SERIAL_CONSOLE}" ]; then
                echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
@@ -97,33 +98,48 @@ EOF
        mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
        mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
        mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+       mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}      
        mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
        mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
        mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
 }
 
+do_install_append_opendreambox () {
+       cat <<EOF >>${D}/etc/inittab
+# enigma
+gui:2:respawn:/usr/bin/enigma.sh
+# enigma2
+e2:3:respawn:/usr/bin/enigma2.sh
+EOF
+}
+
 pkg_postinst_${PN} () {
-       update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
-       update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
-       update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
-       update-alternatives --install ${bindir}/last last last.${PN} 200
-       update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
-       update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+#!/bin/sh
+update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
+update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
+update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
+update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200
+update-alternatives --install ${bindir}/last last last.${PN} 200
+update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
+update-alternatives --install ${bindir}/wall wall wall.${PN} 200
 }
 
 pkg_prerm_${PN} () {
-       update-alternatives --remove halt halt.${PN}
-       update-alternatives --remove reboot reboot.${PN}
-       update-alternatives --remove shutdown shutdown.${PN}
-       update-alternatives --remove last last.${PN}
-       update-alternatives --remove mesg mesg.${PN}
-       update-alternatives --remove wall wall.${PN}
+#!/bin/sh
+update-alternatives --remove halt halt.${PN}
+update-alternatives --remove reboot reboot.${PN}
+update-alternatives --remove shutdown shutdown.${PN}
+update-alternatives --remove last last.${PN}
+update-alternatives --remove mesg mesg.${PN}
+update-alternatives --remove wall wall.${PN}
 }
 
 pkg_postinst_sysvinit-pidof () {
-       update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+#!/bin/sh
+update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
 }
 
 pkg_prerm_sysvinit-pidof () {
-       update-alternatives --remove pidof pidof.${PN}
+#!/bin/sh
+update-alternatives --remove pidof pidof.${PN}
 }