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/murasaki/murasaki_0.8.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/murasaki/murasaki_0.8.8.bb') diff --git a/packages/murasaki/murasaki_0.8.8.bb b/packages/murasaki/murasaki_0.8.8.bb index 36edad880b..505a7947e8 100644 --- a/packages/murasaki/murasaki_0.8.8.bb +++ b/packages/murasaki/murasaki_0.8.8.bb @@ -9,9 +9,9 @@ SRC_URI = "http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-${PV}.tar EXTRA_OEMAKE = 'OPT="-DPATH_MAX" DEBUG= INC="-I ../inc ${CFLAGS}"' do_install () { - install -d ${D}/sbin ${D}/etc/${PN} \ + install -d ${D}/${base_sbindir} ${D}/${sysconfdir}/${PN} \ ${D}/${sysconfdir}/init.d - oe_runmake install 'BIN_DIR=${D}/sbin' 'CONF_DIR=${D}/etc/${PN}' \ + oe_runmake install 'BIN_DIR=${D}/${base_sbindir}' 'CONF_DIR=${D}/${sysconfdir}/${PN}' \ 'RC_DIR=${D}/${sysconfdir}/rc.d' \ 'RC_INIT_DIR=${D}/${sysconfdir}/init.d' \ 'INST_SCRIPT_DIR=${D}/${sysconfdir}/murasaki' \ -- cgit 1.2.3-korg