wlan-ng-modules_0.2.3: fix to compile with 2.6.17

- add patch to compile against 2.6.17 kernel
- disable plx, pcmcia and pci driver because of subsystem api changes

4 files changed, 81 insertions, 4 deletions

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
index c78bef10b6..27baca26fb 100644
--- a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
@@ -15,7 +15,7 @@ WLAN_DEBUG=n
 CROSS_COMPILE_ENABLED=n
 CROSS_COMPILE=
 HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
+PRISM2_PLX=n
+PRISM2_PCMCIA=n
+PRISM2_PCI=n
 PRISM2_USB=y
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
new file mode 100644
index 0000000000..77b33e6573
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch
@@ -0,0 +1,75 @@
+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.inc b/packages/wlan-ng/wlan-ng-modules.inc
index 53910d47b9..623275c921 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -64,6 +64,7 @@ FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${
 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} \
 			     /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"
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 accf682a38..d8e8826fa6 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb
@@ -1,8 +1,9 @@
 include wlan-ng-modules.inc
-PR = "r2"
+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}"