From 1cc3b20815d17dc80799a148edbdd58dbfded439 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Thu, 17 Jan 2008 13:46:20 +0000
Subject: orinoco-modules: unify

---
 packages/orinoco/orinoco-modules_0.13e.bb | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'packages/orinoco/orinoco-modules_0.13e.bb')

diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 9c5cc2f776..f8f8e446a9 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -1,11 +1,8 @@
-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"
-LICENSE = "GPL"
+require orinoco-modules.inc
+
 PR = "r4"
 
-SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
+SRC_URI += "\
            file://crosscompile.patch;patch=1 \
            file://monitor-${PV}.patch;patch=1 \
            file://spectrum.conf \
@@ -14,8 +11,6 @@ SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
            file://orinoco_cs.conf"
 S = "${WORKDIR}/orinoco-${PV}"
 
-inherit module
-
 do_compile_prepend() {
 	cp -f ${WORKDIR}/spectrum* ${S}/
 }
@@ -30,14 +25,5 @@ do_install() {
         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"
-- 
cgit v1.2.3


From 6e65f76c3d5946817e285b93d73d6475c7f0da42 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 18 Jan 2008 18:26:10 +0000
Subject: apmd|hostap|orinoco: move the fix for bug 3664 into a separate
 package * the package is RRECOMMENDS and should be installed automatically,
 but can   be removed if one so desires * reorder some fields according to
 StyleGuide * bump PR

---
 packages/orinoco/orinoco-modules_0.13e.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/orinoco/orinoco-modules_0.13e.bb')

diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index f8f8e446a9..4f8ca98e0b 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -1,6 +1,7 @@
 require orinoco-modules.inc
 
-PR = "r4"
+RDEPENDS_orinoco-modules-cs += "orinoco-modules"
+PR = "r5"
 
 SRC_URI += "\
            file://crosscompile.patch;patch=1 \
@@ -26,4 +27,3 @@ do_install() {
 }
 
 FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
-RDEPENDS_orinoco-modules-cs = "orinoco-modules"
-- 
cgit v1.2.3