wlan-ng: tag 0.2.8 srcrev 1859. use as default for 2.6.24 kernel

* update only-the-utils.patch for wlan-ng-utils_svn

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 65765eb..d47a422 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -185,6 +185,8 @@ SRCREV_pn-webkit-gtk ?= "32839"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
+SRCREV_pn-wlan-ng-modules ?= "1859"
+SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
 SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/.mtn2git_empty
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/config.in
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch
similarity index 100%
rename from packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315/only-the-modules.patch
rename to packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
similarity index 67%
rename from packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
rename to packages/wlan-ng/wlan-ng-modules_svn.bb
index 4a5df48..c455181 100644 (file)
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,9 +1,8 @@
 require wlan-ng-modules.inc
 
-PR = "r1"
+PR = "r0"
 
-SRCDATE = "20080315"
-PV = "0.2.8+svn${SRCDATE}"
+PV = "0.2.8+svnr${SRCREV}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
                

diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in
similarity index 100%
rename from packages/wlan-ng/wlan-ng-utils-0.2.8/config.in
rename to packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in

diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch
new file mode 100644 (file)
index 0000000..b6156da
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch
@@ -0,0 +1,22 @@
+--- trunk/src/Makefile.old     2008-06-05 14:52:31.000000000 -0500
++++ trunk/src/Makefile 2008-06-05 14:53:02.000000000 -0500
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+--- trunk/src/prism2/Makefile.old      2008-06-05 14:52:47.000000000 -0500
++++ trunk/src/prism2/Makefile  2008-06-05 14:53:10.000000000 -0500
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=ridlist download
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`

diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc
index bade47c..72976ce 100644 (file)
--- a/packages/wlan-ng/wlan-ng-utils.inc
+++ b/packages/wlan-ng/wlan-ng-utils.inc
@@ -3,10 +3,8 @@ HOMEPAGE = "http://www.linux-wlan.org"
 SECTION = "kernel/userland"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
 
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-       file://only-the-utils.patch;patch=1 \
+SRC_URI = "file://only-the-utils.patch;patch=1 \
        file://wlan-ng.modutils \
        file://wlan.agent \
        file://usbctl \

diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
index 141ae42..9946a4b 100644 (file)
--- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -1,7 +1,10 @@
 require wlan-ng-utils.inc
 
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+        file://scripts-makefile-hostcc.patch;patch=1 \
        file://pcmciasrc.patch;patch=1 \
        file://hostldflags.patch;patch=1"
 
-PR = "r2"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+PR = "r3"

diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
index 0b6f33e..15d5e70 100644 (file)
--- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
@@ -1,7 +1,10 @@
 require wlan-ng-utils.inc
 
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+        file://scripts-makefile-hostcc.patch;patch=1 \
        file://pcmciasrc.patch;patch=1 \
        file://hostldflags.patch;patch=1"
 
-PR = "r1"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+PR = "r2"

diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
new file mode 100644 (file)
index 0000000..096ac22
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -0,0 +1,12 @@
+require wlan-ng-utils.inc
+
+PR = "r0"
+
+PV = "0.2.8+svnr${SRCREV}"
+
+SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
+        file://scripts-makefile-hostcc.patch;patch=1 \
+       file://pcmciasrc.patch;patch=1 \
+       file://hostldflags.patch;patch=1"
+
+S = "${WORKDIR}/trunk"