From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/sysvinit/sysvinit_2.85.bb | 36 ++++++++++++++++++------------------ packages/sysvinit/sysvinit_2.86.bb | 34 +++++++++++++++++----------------- 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'packages/sysvinit') diff --git a/packages/sysvinit/sysvinit_2.85.bb b/packages/sysvinit/sysvinit_2.85.bb index 8bbd4cd5ee..a64f0d2f11 100644 --- a/packages/sysvinit/sysvinit_2.85.bb +++ b/packages/sysvinit/sysvinit_2.85.bb @@ -30,26 +30,26 @@ export LCRYPT = "-lcrypt" do_install () { - install -d ${D}/${bindir} ${D}/${sbindir} \ - ${D}/${base_sbindir} ${D}/${sysconfdir}/default \ - ${D}/${sysconfdir}/init.d + install -d ${D}${bindir} ${D}${sbindir} \ + ${D}${base_sbindir} ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d install -m 755 halt killall5 \ - runlevel shutdown ${D}/${base_sbindir}/ - install -m 755 init ${D}/${base_sbindir}/sysvinit + runlevel shutdown ${D}${base_sbindir}/ + install -m 755 init ${D}${base_sbindir}/sysvinit install -m 755 mesg last ${D}${bindir} - install -m 0755 ${WORKDIR}/need ${D}/${base_sbindir}/need.sysvinit - install -m 0755 ${WORKDIR}/provide ${D}/${base_sbindir}/provide.sysvinit - ln -sf halt ${D}/${base_sbindir}/reboot - ln -sf halt ${D}/${base_sbindir}/poweroff - ln -sf init ${D}/${base_sbindir}/telinit - ln -sf killall5 ${D}/${base_sbindir}/pidof + install -m 0755 ${WORKDIR}/need ${D}${base_sbindir}/need.sysvinit + install -m 0755 ${WORKDIR}/provide ${D}${base_sbindir}/provide.sysvinit + ln -sf halt ${D}${base_sbindir}/reboot + ln -sf halt ${D}${base_sbindir}/poweroff + ln -sf init ${D}${base_sbindir}/telinit + ln -sf killall5 ${D}${base_sbindir}/pidof ln -sf last ${D}${bindir}/lastb - install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab + 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 + echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab fi if [ "${USE_VT}" == "1" ]; then - cat <>${D}/${sysconfdir}/inittab + cat <>${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels. # # The "id" field MUST be the same as the last @@ -64,14 +64,14 @@ do_install () { # 4:23:respawn:${base_sbindir}/getty 38400 tty4 EOF fi - install -m 0644 ${WORKDIR}/rcS-default ${D}/${sysconfdir}/default/rcS - install -m 0755 ${WORKDIR}/rc ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rcS ${D}/${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS + install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d } do_install_append_ramses () { - cat <>${D}/${sysconfdir}/inittab + cat <>${D}${sysconfdir}/inittab # Bluetooth #1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1 # External serial port diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 1d9d4d0af4..e55b3fa0f4 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -54,15 +54,15 @@ EXTRA_OEMAKE += "'INSTALL=install' \ 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 + 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:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}/${sysconfdir}/inittab + echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab fi if [ "${USE_VT}" == "1" ]; then - cat <>${D}/${sysconfdir}/inittab + cat <>${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels. # # The "id" field MUST be the same as the last @@ -77,23 +77,23 @@ do_install () { # 4:23:respawn:${base_sbindir}/getty 38400 tty4 EOF fi - install -m 0644 ${WORKDIR}/rcS-default ${D}/${sysconfdir}/default/rcS - install -m 0755 ${WORKDIR}/rc ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/rcS ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootlogd.init ${D}/${sysconfdir}/init.d/bootlogd - ln -sf bootlogd ${D}/${sysconfdir}/init.d/stop-bootlogd - install -d ${D}/${sysconfdir}/rcS.d - ln -sf ../init.d/bootlogd ${D}/${sysconfdir}/rcS.d/S07bootlogd + install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS + install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd + ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd + install -d ${D}${sysconfdir}/rcS.d + ln -sf ../init.d/bootlogd ${D}${sysconfdir}/rcS.d/S07bootlogd for level in 2 3 4 5; do - install -d ${D}/${sysconfdir}/rc$level.d - ln -s ../init.d/stop-bootlogd ${D}/${sysconfdir}/rc$level.d/S99stop-bootlogd + install -d ${D}${sysconfdir}/rc$level.d + ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd done - mv ${D}/${base_sbindir}/init ${D}/${base_sbindir}/init.sysvinit + mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.sysvinit } do_install_append_ramses () { - cat <>${D}/${sysconfdir}/inittab + cat <>${D}${sysconfdir}/inittab # Bluetooth #1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1 # External serial port -- cgit v1.2.3