From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 16 Mar 2008 03:18:43 +0000 (+0000)
Subject: wlan-ng: close oebug 4044, oebug 4052
X-Git-Tag: Release-2010-05/1~7434
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce16eecead9c212e62bcfe561a2be35228e72f2;p=openembedded.git

wlan-ng: close oebug 4044, oebug 4052
* oebug 4044: add RPROVIDES = wlan-ng-modules, prevent dependency on old 0.2.1-pre26
* oebug 4052: 0.2.8 svn bump to 20080315 to be compatible with 2.6.24 kernel
* clean up 0.2.1-pre26
---

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 4cf0733e7a..20d7389512 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/modules"
 DEPENDS = "virtual/kernel"
 RRECOMMENDS = "wlan-ng-utils"
-RPROVIDES += "wlan-ng-modules-usb"
+RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules"
 LICENSE = "GPL"
 
 SRC_URI = "file://no-compat.patch;patch=1 \
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 d9597febe4..cb6edc97dc 100644
--- 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,20 +1,11 @@
-DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/modules"
-DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-LICENSE = "GPL"
-PR = "r2"
+require wlan-ng-modules.inc
+
+PR = "r3"
 
 SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \
 	file://no-compat.patch;patch=1 \
 	file://only-the-modules.patch;patch=1 \
 	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-inherit module
-
-PARALLEL_MAKE = ""
 
 do_configure() {
 	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
@@ -39,17 +30,3 @@ do_configure() {
 	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
 	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
 }
-
-do_compile() {
-	oe_runmake -C src all
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-
-        # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
-        rm -f ${KERNEL_SOURCE}/../config.mk
-        rm -f ${KERNEL_SOURCE}/../../config.mk
-}
-
-FILES_${PN} = "/lib"
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
similarity index 87%
rename from packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb
rename to packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
index 8e885b5ad2..f1fadadd09 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
@@ -1,6 +1,6 @@
 require wlan-ng-modules.inc
 
-SRCDATE = "20071030"
+SRCDATE = "20080315"
 PV = "0.2.8+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "