From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/21 17:35:27-06:00 ti.com!kergoth Kill the ipkg paths patch, since its busted. 2005/02/21 17:33:13-06:00 ti.com!kergoth Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting. 2005/02/21 17:13:19-06:00 ti.com!kergoth Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit. 2005/02/21 17:09:46-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/02/21 17:09:03-06:00 ti.com!kergoth Run a sed script against our packages to fix some hardcoded target path references. As always when I do things like this, if packages you maintain were touched by this, please do a sanity check to ensure the sed script didn't run wild. 2005/02/21 15:49:47-06:00 ti.com!kergoth Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO. BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg --- packages/modutils/modutils-initscripts.bb | 18 ++++++++++++++++++ packages/modutils/modutils_2.4.27.bb | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'packages/modutils') diff --git a/packages/modutils/modutils-initscripts.bb b/packages/modutils/modutils-initscripts.bb index e69de29bb2..eb22255a27 100644 --- a/packages/modutils/modutils-initscripts.bb +++ b/packages/modutils/modutils-initscripts.bb @@ -0,0 +1,18 @@ +SECTION = "base" +DESCRIPTION = "modutils configuration files" +LICENSE = "PD" +SRC_URI = "file://modutils.sh" +PR = "r1" + +INITSCRIPT_NAME = "modutils.sh" +INITSCRIPT_PARAMS = "start 20 S ." + +inherit update-rc.d + +do_compile () { +} + +do_install () { + install -d ${D}/${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/modutils.sh ${D}/${sysconfdir}/init.d/ +} diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb index 17fbb2f44d..f878e6869b 100644 --- a/packages/modutils/modutils_2.4.27.bb +++ b/packages/modutils/modutils_2.4.27.bb @@ -23,9 +23,9 @@ export BUILDCFLAGS = "${BUILD_CFLAGS}" do_install () { oe_runmake 'DESTDIR=${D}' install install -d ${D}/${sysconfdir} - rm ${D}/sbin/lsmod - install -d ${D}/bin/ - ln -s ../sbin/insmod ${D}/bin/lsmod + rm ${D}/${base_sbindir}/lsmod + install -d ${D}/${base_bindir}/ + ln -s ../sbin/insmod ${D}/${base_bindir}/lsmod for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do mv ${D}/$f ${D}/$f.24 done } -- cgit v1.2.3