[oe-commits] org.oe.dev wlan-ng-modules: fix RDEPENDS

xjqian commit oe at amethyst.openembedded.net
Sat Mar 22 17:17:56 UTC 2008 

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: d86a41c8e09fae03a4d16bece11e63cf6d6073ab
ViewMTN: http://monotone.openembedded.org/revision/info/d86a41c8e09fae03a4d16bece11e63cf6d6073ab
Files:
1
packages/wlan-ng/wlan-ng-modules.inc
packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-modules_0.2.3.bb
packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
packages/wlan-ng/wlan-ng-modules_svn.bb
Diffs:

#
# mt diff -r6ef08fd4ee082d4a8a05bb4ee04c66d368a0a679 -rd86a41c8e09fae03a4d16bece11e63cf6d6073ab
#
#
#
# patch "packages/wlan-ng/wlan-ng-modules.inc"
#  from [9474ac9b757e9c7ae8e85ce133a8f7d2357d7522]
#    to [fb6cba86430c37eeb3877b759dac9935a5ff0eb8]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb"
#  from [465a33a423488e0bf6beac835e67d6823a787369]
#    to [7a883cffa53023f5ce0cadd8d96e555f934f0da3]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.3.bb"
#  from [7b4d62bc3180f8524205a4d38ec06b5d007ed73c]
#    to [ad1322ac7fcf94816ad0bc364d0c859cdbc4b7e7]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
#  from [a69633a4d6942c8928d51b240144b359c7876a26]
#    to [bbeac95cb8e4b3b3dd3dd4ced4813e5e88af17eb]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb"
#  from [fbfb8b8f6ce971b39598d7b7439a29d1a80bd006]
#    to [c1aa7ed1162e3e676da84da6b82811a56b538a67]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
#  from [eaf518590d6acebdd35fcd19d1ce91cc2c6fc805]
#    to [b948b5f25ed94937cfaca544748e05efe4362dc3]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb"
#  from [410e1ad3bd2225723374c9c98fb848c20bef61d8]
#    to [3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28]
# 
# patch "packages/wlan-ng/wlan-ng-modules_svn.bb"
#  from [81e83b49cc5c22b8e3737339843390121d244a92]
#    to [0ab0d1dca59c2075aece2abd3462b78f6d6ce384]
#
============================================================
--- packages/wlan-ng/wlan-ng-modules.inc	9474ac9b757e9c7ae8e85ce133a8f7d2357d7522
+++ packages/wlan-ng/wlan-ng-modules.inc	fb6cba86430c37eeb3877b759dac9935a5ff0eb8
@@ -2,8 +2,6 @@ DEPENDS = "virtual/kernel"
 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_${PN}-p80211 = "wlan-ng-utils"
+RDEPENDS_${PN}     = "${PN}-p80211"
+RDEPENDS_${PN}-usb = "${PN}-p80211"
+RDEPENDS_${PN}-cs  = "${PN}-p80211"
+RDEPENDS_${PN}-pci = "${PN}-p80211"
-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"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb	465a33a423488e0bf6beac835e67d6823a787369
+++ packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb	7a883cffa53023f5ce0cadd8d96e555f934f0da3
@@ -1,6 +1,6 @@ require wlan-ng-modules.inc
 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 \
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.3.bb	7b4d62bc3180f8524205a4d38ec06b5d007ed73c
+++ packages/wlan-ng/wlan-ng-modules_0.2.3.bb	ad1322ac7fcf94816ad0bc364d0c859cdbc4b7e7
@@ -1,9 +1,8 @@ require wlan-ng-modules.inc
 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}"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb	a69633a4d6942c8928d51b240144b359c7876a26
+++ packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb	bbeac95cb8e4b3b3dd3dd4ced4813e5e88af17eb
@@ -1,5 +1,7 @@ require wlan-ng-modules.inc
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRCDATE = "20060823"
 PV = "0.2.4+svn${SRCDATE}"
 
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb	fbfb8b8f6ce971b39598d7b7439a29d1a80bd006
+++ packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb	c1aa7ed1162e3e676da84da6b82811a56b538a67
@@ -1,8 +1,9 @@ require wlan-ng-modules.inc
 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"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.7.bb	eaf518590d6acebdd35fcd19d1ce91cc2c6fc805
+++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb	b948b5f25ed94937cfaca544748e05efe4362dc3
@@ -1,6 +1,6 @@ require wlan-ng-modules.inc
 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"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb	410e1ad3bd2225723374c9c98fb848c20bef61d8
+++ packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb	3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28
@@ -1,9 +1,10 @@ require wlan-ng-modules.inc
 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"
-
============================================================
--- packages/wlan-ng/wlan-ng-modules_svn.bb	81e83b49cc5c22b8e3737339843390121d244a92
+++ packages/wlan-ng/wlan-ng-modules_svn.bb	0ab0d1dca59c2075aece2abd3462b78f6d6ce384
@@ -1,5 +1,5 @@ require wlan-ng-modules.inc
 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 "

More information about the Openembedded-commits mailing list