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

4 files changed, 24 insertions, 24 deletions

diff --git a/packages/bluez-utils/bluez-utils-common_2.10.inc b/packages/bluez-utils/bluez-utils-common_2.10.inc
index 70de8def74..f1774a236b 100644
--- a/packages/bluez-utils/bluez-utils-common_2.10.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.10.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index 4f4b8bf911..48f05d029c 100644
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
index 9b4f80902d..361903bab0 100644
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.13.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index ed4f61e9c4..fae2efd3fa 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/sbin ${D}/bin/
-	mv ${D}${sbindir}/* ${D}/sbin/
-	mv ${D}${bindir}/* ${D}/bin/
+	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
+	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
+	mv ${D}${bindir}/* ${D}/${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
-	chmod 755 ${D}/etc/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
+	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d