wlan-ng-modules: fix RDEPENDS

* rm RRECOMMENDS, as everything RDEPENDS on wlan-ng-utils
* rm man pages and configure scripts, these are shipped by wlan-ng-utils
* rm bogus RPROVIDES

diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 20d738951242afb9f95e50d63f3e4294fbb08547..6dbadceca819ecf4591db5aef3e0ecb346de15fc 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11M
 HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules"
 LICENSE = "GPL"
 
 SRC_URI = "file://no-compat.patch;patch=1 \
@@ -55,15 +53,22 @@ do_install() {
         # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
         rm -f ${KERNEL_SOURCE}/../config.mk
         rm -f ${KERNEL_SOURCE}/../../config.mk 
+
+       # man page and configure scripts are shipped by wlan-ng-utils
+       rm -rf ${D}/usr/local/man
+       rm -rf ${D}/etc
 }
 
-PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211"
-FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-cs  = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
-FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
+PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci"
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-cs  = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}"
+FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \
                             /lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}"
-RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils"
-RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-cs  = "wlan-ng-modules-p80211"
-RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211"
+
+RDEPENDS_${PN}-p80211 = "wlan-ng-utils"
+RDEPENDS_${PN}     = "${PN}-p80211"
+RDEPENDS_${PN}-usb = "${PN}-p80211"
+RDEPENDS_${PN}-cs  = "${PN}-p80211"
+RDEPENDS_${PN}-pci = "${PN}-p80211"

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
index cb6edc97dcd29d65a0f57db900fecc1eb1712d1c..f2ead8d8b3aae807a64679e190a442717f01bdf3 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
        file://no-compat.patch;patch=1 \

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
index 2157a29fa2bf7720e5210f2574db4c488bacbc82..6dc9be552d318f403d0f83fa1b05f6e9e9552349 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
@@ -1,9 +1,8 @@
 require wlan-ng-modules.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
            file://prism2sta_commsqual_defer.patch;patch=1 \
            file://modules-symvers.patch;patch=1 \
            file://usb-owner.patch;patch=1 "
 S = "${WORKDIR}/linux-wlan-ng-${PV}"
-

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
index ade99ac50d090b151925103c440aff0dfc0bf760..9639389501876747467ad5c4cb3b02fddcbe7fd1 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
@@ -1,5 +1,7 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20060823"
 PV = "0.2.4+svn${SRCDATE}"
 

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
index dd320276f5d0aee28beb873e1024308bc8feb868..f322848d591dda44bc22206fdc31a611e4f0ed75 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
@@ -1,8 +1,9 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20061109"
 PV = "0.2.5+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
 S = "${WORKDIR}/trunk"
-

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
index bacd662680fe621add24bee1821e7d08bebde9de..a0113e9ae4c82e3cf3e9f10d1df557f59476a617 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
            file://2.6.22-fixes.patch;patch=1"

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
index f1fadadd09ae246f5d5fc3e8f74c0166b11ec994..4a5df48ba991943a0af0286b499c670db5556ae9 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
@@ -1,9 +1,10 @@
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20080315"
 PV = "0.2.8+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
                
 S = "${WORKDIR}/trunk"
-

diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index a1826a36f36c0f4c0830465b4e34bbbf20581495..1368729826aecb0ebd7d180d206c373ca548a619 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,5 +1,5 @@
 require wlan-ng-modules.inc
-PR = "r0"
+PR = "r1"
 PV = "0.2.4+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "