Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/slug/openembedded

2005/01/14 06:05:21-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/13 15:05:24-06:00 ti.com!kergoth
Import '[PATCH] more trailing spaces and missing quotes' from Marc Singer.

2005/01/13 15:02:51-06:00 ti.com!kergoth
Add a /etc/network/interfaces file for coLinux.

2005/01/13 13:24:50-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/01/13 13:24:42-06:00 ti.com!kergoth
Fix btxml and devmem2 to stop working around the do_unpack bug I just fixed.

2005/01/13 18:33:04+00:00 cambridgebroadband.com!rjt
Merge oe-devel@oe-devel.bkbits.net:openembedded
into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/01/13 13:14:19-06:00 ti.com!kergoth
Add lemon, an LALR(1) parser generator.

2005/01/13 13:09:04-06:00 ti.com!kergoth
BUGFIX in do_unpack: only create a relative directory structure in WORKDIR when unpacking using cp if the type is file:// (FILESPATH handling).

2005/01/13 12:30:36-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/01/13 18:29:26+00:00 cambridgebroadband.com!rjt
update PR on openzaurus-pxa

2005/01/13 12:27:56-06:00 ti.com!kergoth
Update klibc to 0.190, the latest stable version.

2005/01/13 18:11:50+00:00 cambridgebroadband.com!rjt
make select work on the apm device for tosa,corgi,poodle and related archictectures

2005/01/13 09:10:02+01:00 hrw.one.pl!hrw
justreader: fix Settings file location (fix #204)

2005/01/13 00:32:44+00:00 rpsys.net!RP
Fix after merge

2005/01/13 00:26:37+00:00 rpsys.net!RP
Merge

2005/01/13 00:23:32+00:00 rpsys.net!RP
openzaurus-2.6: Switch to 2.6.11-rc1. Remove patches now merged upstream (8 of them). Add patches to fix upstream bug (reported). Improve MMC driver.

2005/01/12 23:02:21+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/12 23:02:08+00:00 nexus.co.uk!pb
fix some postinst/postrm issues in module-init-tools

2005/01/12 23:52:41+01:00 uni-frankfurt.de!mickeyl
make the check and the WARNING also work for kernel 2.6.x

2005/01/12 20:32:37+01:00 uni-frankfurt.de!mickeyl
improve readme for prism3-firmware

2005/01/12 20:03:32+01:00 uni-frankfurt.de!mickeyl
fix qte crashing right after calibration (again). patch courtesy qte-uberhacker Holger 'Zecke' Freyther

2005/01/12 18:42:20+01:00 (none)!br1
added package yamonenv (inside nylon/): read any write yamon environment

2005/01/12 16:40:38+01:00 uni-frankfurt.de!mickeyl
add wireless tools v27

2005/01/12 16:05:25+01:00 uni-frankfurt.de!mickeyl
upgrade bison to 2.0

2005/01/12 16:04:20+01:00 uni-frankfurt.de!mickeyl
use pregenerated yacc files in kgrog. still nonworky though

2005/01/12 12:35:05+01:00 uni-frankfurt.de!mickeyl
pcmcia-cs: don't ship config.opts on arm machines

2005/01/12 11:51:05+01:00 uni-frankfurt.de!mickeyl
CONFIG_FEATURE_IFUPDOWN_MAPPING=y in busybox defconfig. This adds just 3K but is very useful

2005/01/12 10:27:23+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/12 10:26:59+01:00 hrw.one.pl!hrw
changed tremor SRC_URI to fetch from svn via http

2005/01/12 08:26:26+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/12 08:26:12+00:00 rpsys.net!RP
openzaurus-2.6: Update corgi after pushing code upstream

2005/01/12 00:12:52+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/12 00:12:18+01:00 hrw.one.pl!hrw
updated kdepimpi to 1.9.16 (also added their fork of gammu)

2005/01/11 23:46:19+01:00 uni-frankfurt.de!mickeyl
ipkg-utils has been fixed upstream

2005/01/11 23:39:28+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/11 17:09:51-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/01/11 17:09:37-06:00 ti.com!kergoth
Add OpenNTPD, a free NTP implementation from the OpenBSD guys.

2005/01/11 23:39:20+01:00 uni-frankfurt.de!mickeyl
opie: use Transformed:Rot0 instead of LinuxFb for kernel 2.6

2005/01/11 21:36:12+01:00 uni-frankfurt.de!mickeyl
ship libopie2 examples in libopie2_cvs

2005/01/11 21:30:53+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/11 21:30:43+01:00 uni-frankfurt.de!mickeyl
machine.confs: catchup with changes in orinoco package granularity

2005/01/11 20:24:29+00:00 nexus.co.uk!pb
remove spurious DEPENDS

2005/01/11 20:58:09+01:00 uni-frankfurt.de!mickeyl
orinoco-modules: use KERNEL_OBJECT_SUFFIX and increase package granularity

2005/01/11 20:37:02+01:00 uni-frankfurt.de!mickeyl
hostap-modules: use KERNEL_OBJECT_SUFFIX to make it work w/ old and new kernels

2005/01/11 20:21:51+01:00 uni-frankfurt.de!mickeyl
set KERNEL_OBJECT_SUFFIX to .ko on 2.6 kernels and .o for earlier kernels

2005/01/11 16:57:01+00:00 rpsys.net!RP
openzaurus-2.6: update patch order. Add MMC and SD support

2005/01/11 16:59:54+01:00 (none)!br1
/bin/sh update-alternative calls have to be done in prerm not postrm

2005/01/11 10:22:15-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/01/11 10:22:07-06:00 ti.com!kergoth
Add fnmatch test result to some arm*linux* site files.

2005/01/11 12:05:37+01:00 (none)!br1
added "dash" shell

2005/01/10 20:20:01-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/01/10 20:19:53-06:00 ti.com!kergoth
Add OpenCVS from cvs.

2005/01/10 23:26:51+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/10 16:34:16-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/01/10 16:34:07-06:00 ti.com!kergoth
Fix unionfs 1.0.6 make.patch.

2005/01/10 23:26:28+01:00 uni-frankfurt.de!mickeyl
it's irk-targus and irk-belkin, not irk-0.11.0 and irk-0.11.1 :(

2005/01/10 20:54:21+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/10 14:40:45-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/01/10 14:40:33-06:00 ti.com!kergoth
Add didiwiki 0.5.

2005/01/10 20:54:06+01:00 hrw.one.pl!hrw
added KGrok into nonworking (I dont know how to fix it's usage of yacc)

2005/01/10 18:52:01+01:00 (none)!koen
add matchbox-desktop_svn

2005/01/10 18:42:31+01:00 (none)!koen
add matchbox_panel_svn

2005/01/10 18:28:27+01:00 (none)!koen
add matchbox-wm_svn

2005/01/10 18:09:30+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/10 18:09:12+01:00 (none)!koen
add libmatchbox_svn

2005/01/10 17:38:04+01:00 uni-frankfurt.de!mickeyl
add some extra depends for openzaurus-pxa-2.6

2005/01/10 17:30:19+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/10 17:29:57+01:00 (none)!koen
delete unneeded patches for faad2

2005/01/10 17:27:22+01:00 (none)!koen
libgpevtype 0.6 in familiar-0.8.0.conf

2005/01/10 14:08:45+01:00 mn-solutions.de!schurig
removed cruft

2005/01/10 13:09:37+01:00 (none)!koen
don't set PREFERRED_VERSION for gtk+ and bluetooth/dbus in familiar-0.8.1.conf

2005/01/09 20:24:58+00:00 nexus.co.uk!pb
add dependency on xpm

2005/01/09 20:22:42+00:00 nexus.co.uk!pb
add gnocky


2005/01/09 20:21:04+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 20:20:54+00:00 nexus.co.uk!pb
add staging to gnokii

2005/01/09 20:19:35+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/09 20:18:32+00:00 rpsys.net!RP
openzaurus-2.6: Update and use changes to SSP made in 2.6 bk tree (imported by ssp.patch)

2005/01/09 21:12:14+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/09 21:11:58+01:00 uni-frankfurt.de!mickeyl
remove bogus stuff in opie-keytabs

2005/01/09 19:59:57+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 19:59:40+00:00 nexus.co.uk!pb
add gnokii


2005/01/09 18:45:34+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/09 18:45:18+01:00 uni-frankfurt.de!mickeyl
openzaurus 3.5.3.conf: use opie-cvs for now

2005/01/09 17:27:13+00:00 nexus.co.uk!pb
add missing file


2005/01/09 17:21:59+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 17:21:42+00:00 nexus.co.uk!pb
demote pciutils and usbutils from Recommends to Suggests in hotplug

2005/01/09 18:11:18+01:00 handhelds.org!CoreDump
Remove ressource.patch from libqpe-opie_1.1.8 as it has been applied upstream

2005/01/09 17:01:46+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/tmp6/openembedded

2005/01/09 17:01:32+00:00 rpsys.net!RP
openzaurus-2.6: changes to help push patches upstream. Break poodle for now...

2005/01/09 17:00:18+00:00 rpsys.net!RP
openzaurus-2.6: changes to patches to assist with pushing upstream. Break poodle for now :-/

2005/01/09 16:07:24+01:00 dyndns.org!reenoo
rosetta: it's pkg_postinst, not do_postinst

2005/01/09 14:24:35+00:00 nexus.co.uk!pb
update libgpevtype to 0.6


2005/01/09 14:03:18+00:00 nexus.co.uk!pb
update gtk+ to 2.6.1


2005/01/09 14:02:36+00:00 nexus.co.uk!pb
update glib-2.0 to 2.6.1


2005/01/09 14:01:31+00:00 nexus.co.uk!pb
remove some extraneous gtk+ patches


2005/01/09 14:00:43+00:00 nexus.co.uk!pb
second attempt at fixing gpe-bluetooth dbus naming problems

2005/01/09 14:57:37+01:00 dyndns.org!reenoo
sysvinit: use update-alternatives.bbclass. put PACKAGES/FILES related things in a single place.

2005/01/09 00:47:25+00:00 nexus.co.uk!pb
apply patch from Marc Singer to remove spurious trailing space from backslash-continued line

2005/01/09 00:46:13+00:00 nexus.co.uk!pb
apply patch from Marc Singer to remove spurious trailing space from backslash-continued line

2005/01/09 00:42:35+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to add usbf and bnep0 entries to interfaces file
use CONFFILES for netbase under all DISTROs, not just nylon

2005/01/09 00:38:50+00:00 nexus.co.uk!pb
apply patch from Paul Eggleton to fix usbnet hotplug on iPAQ


2005/01/09 00:29:52+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/09 00:29:41+00:00 nexus.co.uk!pb
apply patch from Marc Singer to correct typo in gpe-package

2005/01/08 15:16:29-08:00 (none)!emte
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into t.(none):/home/OE/speedracer/packages

2005/01/08 15:14:54-08:00 (none)!emte
removed kbdd-patched

2005/01/08 16:49:42-05:00 handhelds.org!kergoth
Add unionfs 1.0.6.

2005/01/08 20:14:46+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/08 20:14:26+00:00 nexus.co.uk!pb
remove figment from gpe base set due to libxml2 dependency

2005/01/08 18:46:11+00:00 rpsys.net!RP
openzaurus-2.6: corgi updates: make MAGIC_SYSRQ work + fix reboot bug. w100fb updates for mainline acceptance.

2005/01/08 18:01:30+00:00 nexus.co.uk!pb
apply patch from Bob Davies to remove kismet from meta-sectest-gpe

2005/01/08 18:37:36+01:00 hrw.one.pl!hrw
added description to librsvg

2005/01/08 18:37:12+01:00 hrw.one.pl!hrw
added description to libart-lgpl

2005/01/08 18:36:26+01:00 hrw.one.pl!hrw
added description to esound

2005/01/08 18:13:19+01:00 hrw.one.pl!hrw
fixed description for Busybox

2005/01/08 18:04:49+01:00 hrw.one.pl!hrw
added description to atd

BKrev: 41e7d1ednFJIdPS8nrzP9S2cq5B_1A

4 files changed, 135 insertions, 19 deletions

diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index ab99ff28c6..2e289a7480 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -4,12 +4,13 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
            file://crosscompile.patch;patch=1 \
            file://monitor-${PV}.patch;patch=1 \
-           file://spectrum*"
+           file://spectrum* \
+           file://orinoco_cs.conf"
 S = "${WORKDIR}/orinoco-${PV}"
 
 inherit module
@@ -18,17 +19,24 @@ do_compile_prepend() {
 	cp -f ${WORKDIR}/spectrum* ${S}/
 }
 
-do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+do_install() {   
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
         install -d ${D}/etc/pcmcia
-	install -m 0644 *.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/
-        install -m 0644 spectrum.conf ${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/
-
-	# if PCI is disabled, don't ship the PCI modules
-	if grep -q '#undef \+CONFIG_PCI' ${STAGING_KERNEL_DIR}/include/linux/autoconf.h; then
-		for f in plx pci tmd; do
-			rm -f ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/orinoco_$f.o
-		done
-	fi
+        install -d ${D}/etc/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/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"
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index e69de29bb2..3174ca094f 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -0,0 +1,46 @@
+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"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r3"
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
+           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-${PV}"
+
+inherit module
+
+do_compile_prepend() {
+	install ${WORKDIR}/spectrum_fw.h ${S}/
+}
+
+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/
+}
+
+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"
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index ba814e2e4d..26cb60473e 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 # seems to cause problems on arm
 DEFAULT_PREFERENCE_arm = "-1"
@@ -26,13 +26,24 @@ do_compile_prepend() {
 	install ${WORKDIR}/spectrum_fw.h ${S}/
 }
 
-do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+do_install() {   
+        install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
         install -d ${D}/etc/pcmcia
-	install -m 0644 *.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/
+        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}/etc/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/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"
diff --git a/packages/orinoco/orinoco-modules_20050101.bb b/packages/orinoco/orinoco-modules_20050101.bb
index e69de29bb2..26f6aef33c 100644
--- a/packages/orinoco/orinoco-modules_20050101.bb
+++ b/packages/orinoco/orinoco-modules_20050101.bb
@@ -0,0 +1,51 @@
+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"
+CVSDATE = "${PV}"
+PR = "r1"
+
+# seems to cause problems on arm
+DEFAULT_PREFERENCE_arm = "-1"
+
+# doesnt help :(
+export EXTRACFLAGS = "-mstructure-size-boundary=32"
+
+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}/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/
+}
+
+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"