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/wpa-supplicant/wpa-supplicant_0.3.6.bb | 16 ++++++++-------- packages/wpa-supplicant/wpa-supplicant_cvs.bb | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'packages/wpa-supplicant') diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb index b6bf4036ea..739e3e8d47 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb @@ -20,14 +20,14 @@ do_compile () { } do_install () { - install -d ${D}/usr/sbin - install -m755 wpa_supplicant ${D}/usr/sbin - install -m755 wpa_passphrase ${D}/usr/sbin - install -m755 wpa_cli ${D}/usr/sbin + install -d ${D}${sbindir} + install -m755 wpa_supplicant ${D}${sbindir} + install -m755 wpa_passphrase ${D}${sbindir} + install -m755 wpa_cli ${D}${sbindir} - install -d ${D}/etc - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc + install -d ${D}/${sysconfdir} + install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir} - install -d ${D}/usr/share/doc/wpa_supplicant - install -m644 README ${D}/usr/share/doc/wpa_supplicant + install -d ${D}${docdir}/wpa_supplicant + install -m644 README ${D}${docdir}/wpa_supplicant } diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb index 17c4c6c064..06a3cc6dd5 100644 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb @@ -20,16 +20,16 @@ do_compile () { } do_install () { - install -d ${D}/usr/sbin - install -m755 wpa_supplicant ${D}/usr/sbin - install -m755 wpa_passphrase ${D}/usr/sbin - install -m755 wpa_cli ${D}/usr/sbin + install -d ${D}${sbindir} + install -m755 wpa_supplicant ${D}${sbindir} + install -m755 wpa_passphrase ${D}${sbindir} + install -m755 wpa_cli ${D}${sbindir} - install -d ${D}/etc - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/etc + install -d ${D}/${sysconfdir} + install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir} - install -d ${D}/usr/share/doc/wpa_supplicant - install -m644 README ${D}/usr/share/doc/wpa_supplicant + install -d ${D}${docdir}/wpa_supplicant + install -m644 README ${D}${docdir}/wpa_supplicant } -- cgit 1.2.3-korg