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

2 files changed, 39 insertions, 4 deletions

diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
index e69de29bb2..5ef5bfff97 100644
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ b/packages/wireless-tools/wireless-tools_26.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
+HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = "virtual/kernel"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r6"
+
+SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
+	   file://man.patch;patch=1 \
+	   file://wireless-tools.if-pre-up"
+S = "${WORKDIR}/wireless_tools.${PV}"
+
+inherit module-base
+
+do_configure() {
+	rm -f wireless.h
+}
+
+do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y
+}
+
+do_install() {
+	oe_runmake PREFIX=${D} install
+	install -d ${D}/${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
+}
+
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+               ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+               /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
+	       /etc/network"
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index 7142a3de56..b3caa5040f 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/wireless_tools.${PV}"
 
 CFLAGS =+ "-I${S}"
 EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}/sbin' \
+		'INSTALL_DIR=${D}/${base_sbindir}' \
 		'INSTALL_LIB=${D}/${libdir}' \
 		'INSTALL_INC=${D}/${includedir}' \
 		'INSTALL_MAN=${D}/${mandir}'"
@@ -32,13 +32,13 @@ do_stage () {
 
 do_install() {
 	oe_runmake PREFIX=${D} install install-static
-	install -d ${D}/etc/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/etc/network/if-pre-up.d/wireless-tools
+	install -d ${D}/${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
 }
 
 PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
 FILES_libiw = "${libdir}/*.so.*"
 FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
 FILES_libiw-doc = "${mandir}/man7"
-FILES_${PN} = "${bindir} ${sbindir} /sbin /bin ${sysconfdir}/network"
+FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
 FILES_${PN}-doc = "${mandir}/man8"