diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /sysvinit | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'sysvinit')
| -rw-r--r-- | sysvinit/sysvinit_2.85.oe | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe index 9bc93f0463..2cf6068573 100644 --- a/sysvinit/sysvinit_2.85.oe +++ b/sysvinit/sysvinit_2.85.oe @@ -10,7 +10,13 @@ FILES_${PN} = "/sbin ${bindir} ${sysconfdir}" FILES_sysv-rc = "${sbindir}" SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \ - cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/update-rc.d" + cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/update-rc.d \ + file://need \ + file://provide \ + file://inittab \ + file://rcS-default \ + file://rc \ + file://rcS" S = "${WORKDIR}/sysvinit-${PV}/src" CFLAGS_prepend = "-D_GNU_SOURCE " @@ -26,8 +32,8 @@ do_install () { runlevel shutdown ${D}/sbin/ install -m 755 init ${D}/sbin/sysvinit install -m 755 mesg last ${D}${bindir} - install -m 0755 ${FILESDIR}/need ${D}/sbin/need.sysvinit - install -m 0755 ${FILESDIR}/provide ${D}/sbin/provide.sysvinit + install -m 0755 ${WORKDIR}/need ${D}/sbin/need.sysvinit + install -m 0755 ${WORKDIR}/provide ${D}/sbin/provide.sysvinit ln -sf halt ${D}/sbin/reboot ln -sf halt ${D}/sbin/poweroff ln -sf init ${D}/sbin/telinit @@ -37,17 +43,13 @@ do_install () { # echo "/etc/default/rcS" >> ${D}/CONTROL/conffiles # install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/ # install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/ - if [ -e ${FILESDIR}/inittab_${MACHINE} ]; then - install -m 0644 ${FILESDIR}/inittab_${MACHINE} ${D}/etc/inittab - else - install -m 0644 ${FILESDIR}/inittab ${D}/etc/inittab - fi + oe_machinstall -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab if [ ! -z "${SERIAL_CONSOLE}" ]; then echo "S:2345:respawn:/sbin/getty ${SERIAL_CONSOLE}" >> ${D}/etc/inittab fi - install -m 0644 ${FILESDIR}/rcS-default ${D}/etc/default/rcS - install -m 0755 ${FILESDIR}/rc ${D}/etc/init.d - install -m 0755 ${FILESDIR}/rcS ${D}/etc/init.d + 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_stage () { |