Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/24 01:01:55+01:00 rpsys.net!RP
orinoco-modules: PCI patch no longer needed. Someone should have wondered why it was including pci in the first place...

2005/05/24 00:58:55+01:00 rpsys.net!RP
Merge

2005/05/24 00:54:36+01:00 rpsys.net!RP
orinoco-modules: 0.15rc1 works with arm + 2.6 kernels - make default. Remove 0.13e-2.6 as unneeded now. Add makefile fixes.

BKrev: 4292780dqGSf2H5puUh7JzeW8eFvwA

6 files changed, 2 insertions, 26 deletions

diff --git a/packages/orinoco/orinoco-modules-0.15rc2/disable-pci.patch b/packages/orinoco/orinoco-modules-0.15rc1/makefile_fix.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/orinoco/orinoco-modules-0.15rc2/disable-pci.patch
+++ b/packages/orinoco/orinoco-modules-0.15rc1/makefile_fix.patch
diff --git a/packages/orinoco/orinoco-modules-0.15rc2/makefile_fix.patch b/packages/orinoco/orinoco-modules-0.15rc2/makefile_fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/orinoco/orinoco-modules-0.15rc2/makefile_fix.patch
diff --git a/packages/orinoco/orinoco-modules_0.13e-26.bb b/packages/orinoco/orinoco-modules_0.13e-26.bb
deleted file mode 100644
index b2d882253e..0000000000
--- a/packages/orinoco/orinoco-modules_0.13e-26.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-include orinoco-modules_0.13e.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orinoco-modules-0.13e"
-
-SRC_URI = "http://www.tzi.de/~plasmahh/orinoco-0.13e-SN-6.tar.bz2 \
-           file://add-spectrum-support.patch;patch=1 \
-           file://use-cs-error.patch;patch=1 \
-           file://remove-slot-name.patch;patch=1 \
-           file://spectrum.conf \
-           file://orinoco_cs.conf"
-S = "${WORKDIR}/orinoco-0.13e-SN-6"
-
-PR = "r3"
-
-# use only w/ kernel 2.6
-DEFAULT_PREFERENCE_arm = "-1"
-MAKE = "make -e"
-
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 86c5c9c4eb..44bae20228 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -6,9 +6,6 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r3"
 
-# later versions don't seem to work on arm
-DEFAULT_PREFERENCE_arm = "1"
-
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
            file://crosscompile.patch;patch=1 \
            file://monitor-${PV}.patch;patch=1 \
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 6887293dc9..01c2f287ad 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -6,11 +6,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 PR = "r4"
 
-# seems to cause problems on 2.4 arm kernels
-# known to work on 2.6.12-rc4-mm3
-DEFAULT_PREFERENCE_arm = "-1"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
+           file://makefile_fix.patch;patch=1 \
            file://list-move.patch;patch=1 \
            file://spectrum-firmware.patch;patch=1 \
            file://spectrum.conf \
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index 251927aaec..ba2fe61c23 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -11,9 +11,9 @@ PR = "r5"
 DEFAULT_PREFERENCE_arm = "-1"
 
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
+           file://makefile_fix.patch;patch=1 \
            file://list-move.patch;patch=1 \
            file://spectrum-firmware.patch;patch=1 \
-           file://disable-pci.patch;patch=1 \
            file://spectrum.conf \
            file://spectrum_fw.h \
 	   file://orinoco_cs.conf"