[PATCH] Support for 2.6.x kernels

Pavel Roskin proski
Mon Jul 14 14:51:25 PDT 2003


Hello!

I cannot compile hostap for Linux 2.6.0-test1:

$ make
*** Can't build for 2.5 with a non-2.5 source!
make: *** [2.5] Error 1

We can remove that check.  I never liked it.  But if it's there, maybe
somebody needs it.  Ideally, it should be corrected to catch user errors
but allow versions to be changed further, possibly to 2.7.x.

Another approach is to rename 2.5 to 2.6 everywhere in the top-level
Makefile.  2.5.x kernels are now obsolete and they will become irrelevant
in a few days.  The patch that replaces 2.5 with 2.6 is attached.

-- 
Regards,
Pavel Roskin
-------------- next part --------------
--- Makefile
+++ Makefile
@@ -63,12 +63,12 @@
 MSRC=driver/modules
 
 # if Rules.make exists in the kernel tree, we assume 2.4 style modules
-# if it doesn't assume 2.5 style
+# if it doesn't assume 2.6 style
 OLDMAKE = $(wildcard $(KERNEL_PATH)/Rules.make)
 
 
 ifeq (,$(OLDMAKE))
-all: 2.5
+all: 2.6
 else
 all: 2.4
 endif
@@ -100,7 +100,7 @@
 
 # Old compilation using this Makefile and not the build system in the kernel
 # tree. This is used when compiling for Linux 2.2.x (or Linux 2.4.x with
-# 'make pccard'). Both Linux 2.5.x and 2.4.x can use kernel tree build system
+# 'make pccard'). Both Linux 2.6.x and 2.4.x can use kernel tree build system
 # with 'make'.
 
 ifdef CONFIG_MODVERSIONS
@@ -142,9 +142,9 @@
 	$(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules modules
 	$(MAKE) install_all_info
 
-2.5:
-	@if ! echo "$(KERNELRELEASE)" | grep -q "^2\.5"; then \
-		echo "*** Can't build for 2.5 with a non-2.5 source!"; \
+2.6:
+	@if ! echo "$(KERNELRELEASE)" | grep -q "^2\.6"; then \
+		echo "*** Can't build for 2.6 with a non-2.6 source!"; \
 		exit 1; \
 	fi
 	$(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules \
@@ -191,7 +191,7 @@
 
 
 ifeq (,$(OLDMAKE))
-install: install_2.5
+install: install_2.6
 else
 install: install_2.4
 endif
@@ -208,7 +208,7 @@
 
 install_2.4: uninstall install_pccard install_pci install_plx
 
-install_2.5: install_conf
+install_2.6: install_conf
 	$(MAKE) install_check
 	@echo "*** Copying modules to: $(MODPATH)/kernel/drivers/net/wireless"
 	mkdir -p $(MODPATH)/kernel/drivers/net/wireless



More information about the Hostap mailing list