wlan-ng: use 0.2.8 svnr1859 as default, needed by 2.6.24 kernel

* clean up of obsolete recipes
approved by Koen and xjqian

50 files changed, 61 insertions, 717 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index f7584d693b..96c5d97b38 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1954,8 +1954,8 @@ PREFERRED_VERSION_wiggle-native ?= "0.6"
 PREFERRED_VERSION_win4 ?= "1.0.1"
 PREFERRED_VERSION_windowswmproto ?= "1.0.3"
 PREFERRED_VERSION_wireshark ?= "0.99.4"
-PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
-PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
+PREFERRED_VERSION_wlan-ng-modules ?= "0.2.8"
+PREFERRED_VERSION_wlan-ng-utils ?= "0.2.8"
 PREFERRED_VERSION_wmctrl ?= "1.07"
 PREFERRED_VERSION_wpa-gui ?= "0.4.8"
 PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 453f7d3c1f..05724209d6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -127,6 +127,8 @@ SRCREV_pn-webkit-gtk ?= "28656"
 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 ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-networkmanager ?= "2887"
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in
deleted file mode 100644
index 5b9b7c780c..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch
deleted file mode 100644
index 4f59f0fa5d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat
-+++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h
-@@ -351,14 +351,14 @@
- 
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
- #ifdef _LINUX_LIST_H
--
-+/*
- static inline void list_move_tail(struct list_head *list,
-           struct list_head *head)
- {
-         __list_del(list->prev, list->next);
-         list_add_tail(list, head);
- }
--
-+*/
- static inline void __list_splice(struct list_head *list,
-                                 struct list_head *head)
- {
-@@ -372,13 +372,13 @@
-       last->next = at;
-       at->prev = last;
- }
--
-+/*
- static inline void list_move(struct list_head *list, struct list_head *head)
- {
-       __list_del(list->prev, list->next);
-       list_add(list, head);
- }
--
-+*/
- static inline void list_splice_init(struct list_head *list,
-             struct list_head *head)
- {
-@@ -388,7 +388,6 @@
-        }
- }
- 
--
- #endif  // LIST_H
- #endif
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch
deleted file mode 100644
index a119460a1d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/Makefile
-@@ -44,10 +44,8 @@
- 
- include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
--	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
--	nwepgen wlancfg
-+DIRS=p80211 prism2 shared mkmeta
-+ALL_DIRS=mkmeta p80211 prism2 shared
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile
-@@ -44,7 +44,7 @@
- 
- include ../../config.mk
- 
--DIRS=driver ridlist download
-+DIRS=driver ridlist
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
deleted file mode 100644
index 27baca26fb..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=3
-WLAN_EXTRAVERSION=
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=n
-PRISM2_PCMCIA=n
-PRISM2_PCI=n
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch
deleted file mode 100644
index 93d0c01bdd..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c
-===================================================================
---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2_cs.c	2005-09-30 18:19:26.000000000 +0200
-+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c	2006-02-06 20:23:23.902133136 +0100
-@@ -22,12 +22,16 @@
- 						 * says.
- 						 */
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8))
- static int numlist = 4;
- module_param_array(irq_list, int, numlist, 0444);
- #else
- module_param_array(irq_list, int, NULL, 0444);
- #endif
-+#else
-+MODULE_PARM( irq_list, "1-4i" );
-+#endif
- module_param( irq_mask, int, 0644);
- #endif
- 
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch
deleted file mode 100644
index 77b33e6573..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: Configure
-===================================================================
---- linux-wlan-ng-devel.orig/Configure	(revision 1772)
-+++ linux-wlan-ng-devel/Configure	(working copy)
-@@ -269,6 +269,12 @@
-         write_bool KERN_25
- fi
- 
-+# flag to indicate new kbuild for modules in 2-6-17 
-+if [ $VERSION_CODE -gt `version 2 6 16` ] ; then
-+    KERN_26=y
-+    write_bool KERN_26
-+fi
-+
- if [ "$SRC_RELEASE" != "$CUR_RELEASE" ] ; then
- 	$ECHO "WARNING: the current running kernel is actually version $CUR_RELEASE."
- fi
-Index: src/p80211/Makefile
-===================================================================
---- linux-wlan-ng-devel.orig/src/p80211/Makefile	(revision 1772)
-+++ linux-wlan-ng-devel/src/p80211/Makefile	(working copy)
-@@ -72,15 +72,18 @@
- 
- PWD := $(shell pwd)
- default:
--
-+ifeq ($(KERN_26),y)
-+	$(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC)
-+	cp Modules.symvers ../prism2/driver
-+else 
- ifeq ($(KERN_25), y)
- 	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/.. $(PWD)' WLAN_SRC=$(WLAN_SRC) modules
- else
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) modules
- endif # KERN_25
--
-+endif # KERN_26
- clean:
--	rm -f *.o *.ko .*.cmd *.mod.c  *.flags .*.flags
-+	rm -f *.o *.ko .*.cmd *.mod.c  *.flags .*.flags Modules.symvers
- 
- install:
- 	mkdir -p $(TARGET_MODDIR)
-Index: src/prism2/driver/Makefile
-===================================================================
---- linux-wlan-ng-devel.orig/src/prism2/driver/Makefile	(revision 1772)
-+++ linux-wlan-ng-devel/src/prism2/driver/Makefile	(working copy)
-@@ -83,19 +83,26 @@
- PWD := $(shell pwd)
- 
- default:
-+#if new kbuild in 2.6.17 or later
-+ifeq ($(KERN_26), y)
-+	$(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC)
-+
-+else
- ifeq ($(KERN_25), y)
- 	$(MAKE) -C $(LINUX_SRC) M='$(PWD)/../.. $(PWD)' WLAN_SRC=$(WLAN_SRC) \
- 		modules
-+
- else # kbuild 2.4
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) \
- 		modules
- 
- endif # kbuild switch
-+endif # KERN_26
- 
- endif  #KERNELRELEASE
- 
- clean:
--	rm -f *.o *.ko .*.cmd *.mod.c  *.flags .*.flags
-+	rm -f *.o *.ko .*.cmd *.mod.c  *.flags .*.flags Modules.symvers
- 
- install:
- ifeq ($(KERN_25), y)
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch
deleted file mode 100644
index a119460a1d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/Makefile
-@@ -44,10 +44,8 @@
- 
- include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
--	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
--	nwepgen wlancfg
-+DIRS=p80211 prism2 shared mkmeta
-+ALL_DIRS=mkmeta p80211 prism2 shared
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile
-@@ -44,7 +44,7 @@
- 
- include ../../config.mk
- 
--DIRS=driver ridlist download
-+DIRS=driver ridlist
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch
deleted file mode 100644
index 65e34a326b..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c
-===================================================================
---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2sta.c	2005-10-07 23:32:44.000000000 +0200
-+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c	2006-02-21 09:02:21.338239744 +0100
-@@ -2427,11 +2427,7 @@
- 		       hfa384x2host_16(hw->qual.ANL_currFC));
- 
- 	/* Reschedule timer */
--	//if (!hw->timer_running) {
--		hw->commsqual_timer.expires = jiffies + HZ;
--		add_timer(&hw->commsqual_timer);
--		hw->timer_running = 1;
--	//}
-+	mod_timer(&hw->commsqual_timer, jiffies + HZ);
- 
-  done:
- 	DBFEXIT;
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch
deleted file mode 100644
index abb3b137da..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: trunk/src/Makefile
-===================================================================
---- trunk.orig/src/Makefile	2006-08-23 12:50:56.000000000 +0200
-+++ trunk/src/Makefile	2006-08-23 12:52:45.000000000 +0200
-@@ -44,7 +44,7 @@
- 
- -include ../config.mk
- 
--DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
-+DIRS=mkmeta shared p80211 prism2
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
-Index: trunk/src/prism2/Makefile
-===================================================================
---- trunk.orig/src/prism2/Makefile	2006-08-23 12:50:55.000000000 +0200
-+++ trunk/src/prism2/Makefile	2006-08-23 12:52:09.000000000 +0200
-@@ -44,7 +44,7 @@
- 
- -include ../../config.mk
- 
--DIRS=driver ridlist download
-+DIRS=driver ridlist
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
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+svn20071030/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty
+++ /dev/null
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+svn20071030/only-the-modules.patch
deleted file mode 100644
index abb3b137da..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: trunk/src/Makefile
-===================================================================
---- trunk.orig/src/Makefile	2006-08-23 12:50:56.000000000 +0200
-+++ trunk/src/Makefile	2006-08-23 12:52:45.000000000 +0200
-@@ -44,7 +44,7 @@
- 
- -include ../config.mk
- 
--DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
-+DIRS=mkmeta shared p80211 prism2
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
-Index: trunk/src/prism2/Makefile
-===================================================================
---- trunk.orig/src/prism2/Makefile	2006-08-23 12:50:55.000000000 +0200
-+++ trunk/src/prism2/Makefile	2006-08-23 12:52:09.000000000 +0200
-@@ -44,7 +44,7 @@
- 
- -include ../../config.mk
- 
--DIRS=driver ridlist download
-+DIRS=driver ridlist
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.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+svnr1859/config.in
index a2bc086629..a2bc086629 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch
index abb3b137da..abb3b137da 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 4cf0733e7a..6dbadceca8 100644
--- 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"
 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
deleted file mode 100644
index 60b29999ef..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-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"
-
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/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
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"         >> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "CC=${KERNEL_CC}"			>> config.mk
-	echo "LD=${KERNEL_LD}"			>> config.mk
-
-	# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
-	rm -f ${KERNEL_SOURCE}/../config.mk
-	rm -f ${KERNEL_SOURCE}/../../config.mk
-	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/..
-	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/../..
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	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.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
deleted file mode 100644
index 2157a29fa2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require wlan-ng-modules.inc
-PR = "r3"
-
-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
deleted file mode 100644
index ade99ac50d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require wlan-ng-modules.inc
-
-SRCDATE = "20060823"
-PV = "0.2.4+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.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
deleted file mode 100644
index dd320276f5..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require wlan-ng-modules.inc
-
-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 bacd662680..a0113e9ae4 100644
--- 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+svn20071030.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb
deleted file mode 100644
index 8e885b5ad2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require wlan-ng-modules.inc
-
-SRCDATE = "20071030"
-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 a1826a36f3..c455181c6b 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,10 +1,9 @@
 require wlan-ng-modules.inc
+
 PR = "r0"
-PV = "0.2.4+svn${SRCDATE}"
+
+PV = "0.2.8+svnr${SRCREV}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
+		
 S = "${WORKDIR}/trunk"
-
-DEFAULT_PREFERENCE = "-1"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}"
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in
deleted file mode 100644
index 5b9b7c780c..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre26
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch
deleted file mode 100644
index 43c9c1320d..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.1-pre26/src/Makefile
-@@ -42,12 +42,10 @@
- #
- # --------------------------------------------------------------------
- 
--include ../config.mk
-+include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
--	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
--	nwepgen wlancfg
-+DIRS=prism2 shared wlanctl wland nwepgen mkmeta wlancfg
-+ALL_DIRS=mkmeta prism2 shared wlanctl wland nwepgen wlancfg
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile
-@@ -42,9 +42,9 @@
- #
- # --------------------------------------------------------------------
- 
--include ../../config.mk
-+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-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
deleted file mode 100644
index 1fadad5560..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=2
-WLAN_EXTRAVERSION=
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=.
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
deleted file mode 100644
index 2a4369b931..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.2/src/Makefile
-@@ -44,9 +44,9 @@
- 
- -include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
-+DIRS=prism2 shared wlanctl wland nwepgen \
- 	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
-+ALL_DIRS=mkmeta prism2 shared wlanctl wland \
- 	nwepgen wlancfg
- 
- ifneq ($(wildcard *.addon),) 
---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.2/src/prism2/Makefile
-@@ -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-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in
deleted file mode 100644
index be01488a92..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=3
-WLAN_EXTRAVERSION=
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=.
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch
deleted file mode 100644
index 2a4369b931..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.2/src/Makefile
-@@ -44,9 +44,9 @@
- 
- -include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
-+DIRS=prism2 shared wlanctl wland nwepgen \
- 	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
-+ALL_DIRS=mkmeta prism2 shared wlanctl wland \
- 	nwepgen wlancfg
- 
- ifneq ($(wildcard *.addon),) 
---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils
-+++ linux-wlan-ng-0.2.2/src/prism2/Makefile
-@@ -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-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
deleted file mode 100644
index be01488a92..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=3
-WLAN_EXTRAVERSION=
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=.
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
deleted file mode 100644
index af1f442a4c..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: trunk/src/Makefile
-===================================================================
---- trunk.orig/src/Makefile	2006-08-21 16:24:58.000000000 +0200
-+++ trunk/src/Makefile	2006-08-23 12:49:08.000000000 +0200
-@@ -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`
-Index: trunk/src/prism2/Makefile
-===================================================================
---- trunk.orig/src/prism2/Makefile	2006-08-21 16:24:57.000000000 +0200
-+++ trunk/src/prism2/Makefile	2006-08-23 12:48:32.000000000 +0200
-@@ -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-modules-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty
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
index 298935770d..298935770d 100644
--- 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
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
index 0000000000..b6156da921
--- /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-0.2.8/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch
deleted file mode 100644
index af1f442a4c..0000000000
--- a/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: trunk/src/Makefile
-===================================================================
---- trunk.orig/src/Makefile	2006-08-21 16:24:58.000000000 +0200
-+++ trunk/src/Makefile	2006-08-23 12:49:08.000000000 +0200
-@@ -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`
-Index: trunk/src/prism2/Makefile
-===================================================================
---- trunk.orig/src/prism2/Makefile	2006-08-21 16:24:57.000000000 +0200
-+++ trunk/src/prism2/Makefile	2006-08-23 12:48:32.000000000 +0200
-@@ -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 fe00e161d3..72976ce292 100644
--- 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 \
@@ -61,8 +59,8 @@ do_install() {
 	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
 	install -d ${D}${mandir}/man1
 	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+	rm -rf ${D}/usr/local/man
 }
 
-FILES_${PN}-doc += "/usr/local/man"
 FILES_${PN}-dbg += "/sbin/.debug"
 FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
deleted file mode 100644
index 9ac5348a98..0000000000
--- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require wlan-ng-utils.inc
-
-PR = "r1"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
deleted file mode 100644
index d4e0a39c70..0000000000
--- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require wlan-ng-utils.inc
-
-PR = "r2"
-
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
deleted file mode 100644
index f71a2ee34a..0000000000
--- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require wlan-ng-utils.inc
-
-SRCDATE = "20060823"
-PV = "0.2.4+svn${SRCDATE}"
-
-SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
-	file://only-the-utils.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/trunk"
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 0b6f33e380..9946a4b670 100644
--- 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 = "r1"
+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
deleted file mode 100644
index e37d548a9f..0000000000
--- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require wlan-ng-utils.inc
-
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1"
-
-PR = "r0"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index fae48545ff..096ac22055 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -1,24 +1,12 @@
 require wlan-ng-utils.inc
 
-PR = "r2"
-PV = "0.2.4+svn${SRCDATE}"
+PR = "r0"
 
-SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
-	file://only-the-utils.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://hostldflags.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/trunk"
-
-FILES_${PN} = "/etc /sbin"
+PV = "0.2.8+svnr${SRCREV}"
 
-DEFAULT_PREFERENCE = "-1"
+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"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}"
+S = "${WORKDIR}/trunk"