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

3 files changed, 50 insertions, 2 deletions

diff --git a/packages/prism54/prism54-firmware_1.0.3.0.bb b/packages/prism54/prism54-firmware_1.0.3.0.bb
index e69de29bb2..ee79560a06 100644
--- a/packages/prism54/prism54-firmware_1.0.3.0.bb
+++ b/packages/prism54/prism54-firmware_1.0.3.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Firmware for the Prism54 driver"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "unknown"
+
+SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
+
+S = "${WORKDIR}/prism54.org"
+
+do_install() {
+	install -d ${D}/${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
+}
+
+FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-firmware_1.0.4.3.bb b/packages/prism54/prism54-firmware_1.0.4.3.bb
index 7603c9a206..65c381fcc0 100644
--- a/packages/prism54/prism54-firmware_1.0.4.3.bb
+++ b/packages/prism54/prism54-firmware_1.0.4.3.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
 S = "${WORKDIR}/prism54.org"
 
 do_install() {
-	install -d ${D}/lib/firmware/
-	install -m 0644 ${PV}.arm ${D}/lib/firmware/isl3890
+	install -d ${D}/${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
 }
 
 FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index e69de29bb2..fc86f536ae 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Linux Driver for the 802.11g Prism GT / Prism Duette / Prism Indigo Chipsets"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+HOMEPAGE = "http://prism54.org"
+LICENSE = "GPL"
+RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware (1.0.3.0) hotplug"
+DEPENDS = "virtual/kernel prism54-firmware"
+
+SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"
+
+S = "${WORKDIR}/prism54-${PV}"
+
+inherit module-base
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} KMISC=${D}/${base_libdir}/modules/${KERNEL_VERSION}/net KVER=${KERNEL_VERSION}"
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake modules
+}
+
+do_install() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake install
+	
+}
+
+FILES_${PN} = "/lib/modules/"