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, 71 insertions, 21 deletions

diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 2e289a7480..f39ba65f76 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -20,13 +20,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 3174ca094f..74a269d6d9 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -24,13 +24,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index 26cb60473e..a81dbdd424 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -27,13 +27,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-        install -d ${D}/etc/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/modutils/
+        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}/${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb
index e69de29bb2..d268f6d646 100644
--- a/packages/orinoco/orinoco-modules_cvs.bb
+++ b/packages/orinoco/orinoco-modules_cvs.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+PROVIDES = "spectrum-modules"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"'
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=ext;rsh=ssh \
+           file://list-move.patch;patch=1 \
+           file://spectrum-firmware.patch;patch=1 \
+           file://spectrum.conf \
+           file://spectrum_fw.h \
+	   file://orinoco_cs.conf"
+S = "${WORKDIR}/orinoco"
+
+inherit module
+
+do_compile_prepend() {
+	install ${WORKDIR}/spectrum_fw.h ${S}/
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}/${sysconfdir}/pcmcia
+	install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
+	install -d ${D}/${sysconfdir}/modutils
+	install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+}
+
+PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
+FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
+				/lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}"
+FILES_orinoco-modules = "/lib/modules/"
+RDEPENDS_orinoco-modules-cs = "orinoco-modules"
+RDEPENDS_orinoco-modules-pci = "orinoco-modules"
+RDEPENDS_orinoco-modules-usb = "orinoco-modules"
+RDEPENDS_orinoco-modules-nortel = "orinoco-modules"