From 688eb57df4e3122f39459325a54cb3d897bc143b Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Fri, 30 Jun 2006 08:18:40 +0000 Subject: 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 --- packages/wlan-ng/wlan-ng-modules-0.2.3/config.in | 6 +- .../wlan-ng-modules-0.2.3/modules-symvers.patch | 75 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch (limited to 'packages/wlan-ng/wlan-ng-modules-0.2.3') 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) -- cgit v1.2.3