diff options
| author |   nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-25 22:40:09 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-25 22:40:09 +0000 |
| commit | e4398dd9a45218eeb0cfe2b08801545075a78a5a (patch) | |
| tree | 0e1706def502c768d24caf40f4cb8ac2a5e0b875 /packages/sysvinit/sysvinit_2.86.bb | |
| parent | 5ff34a0ef7bfe87352d78c20b9f37b17ba9faf21 (diff) | |
| download | openembedded-e4398dd9a45218eeb0cfe2b08801545075a78a5a.tar.gz | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/25 23:33:20+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded
2005/02/25 23:32:55+01:00 dyndns.org!reenoo
libffi: fix a few hardcoded paths.
2005/02/25 16:28:33-06:00 ti.com!kergoth
Fix sysvinit to obey the base_* target path variables, and kill the old sysvinit 2.85.
2005/02/25 16:26:09-06:00 ti.com!kergoth
linux-input shouldnt be inheriting module-base. There's no need for it, and it was breaking the build.
BKrev: 421fa949UlQ--1-ws2Usilb2uD16vQ
Diffstat (limited to 'packages/sysvinit/sysvinit_2.86.bb')
| -rw-r--r-- | packages/sysvinit/sysvinit_2.86.bb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index e55b3fa0f4..96b6c1a68f 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r11" +PR = "r12" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. @@ -33,20 +33,20 @@ B = "${S}/src" inherit update-alternatives ALTERNATIVE_NAME = "init" -ALTERNATIVE_LINK = "/sbin/init" -ALTERNATIVE_PATH = "/sbin/init.sysvinit" +ALTERNATIVE_LINK = "${base_sbindir}/init" +ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit" ALTERNATIVE_PRIORITY = "50" PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" -FILES_${PN} += "${base_sbindir} /bin" -FILES_sysvinit-pidof = "/bin/pidof" -FILES_sysvinit-sulogin = "/sbin/sulogin" +FILES_${PN} += "${base_sbindir} ${base_bindir}" +FILES_sysvinit-pidof = "${base_bindir}/pidof" +FILES_sysvinit-sulogin = "${base_sbindir}/sulogin" CFLAGS_prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" EXTRA_OEMAKE += "'INSTALL=install' \ - 'bindir=/bin' \ - 'sbindir=/sbin' \ + 'bindir=${base_bindir}' \ + 'sbindir=${base_sbindir}' \ 'usrbindir=${bindir}' \ 'usrsbindir=${sbindir}' \ 'includedir=${includedir}' \ |