Revert to using 2.4.x kernel headers by default, due to public outcry....

make/kernel-headers.mk

@@ -8,13 +8,25 @@
 #############################################################
 ifneq ($(filter $(TARGETS),kernel-headers),)
 
-LINUX_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
-LINUX_SOURCE:=linux-libc-headers-2.6.5.0.tar.bz2
-LINUX_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.5.0
-LINUX_DIR:=$(TOOL_BUILD_DIR)/linux
+VERSION=2
+PATCHLEVEL=4
+SUBLEVEL=25
+LINUX_SITE:=http://www.uclibc.org/downloads/toolchain
+LINUX_SOURCE:=kernel-headers-2.4.25.tar.bz2
+LINUX_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux
+
+
+# Uncomment this for 2.6.x kernel header files
+#VERSION=2
+#PATCHLEVEL=6
+#SUBLEVEL=5
+#LINUX_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+#LINUX_SOURCE:=linux-libc-headers-2.6.5.0.tar.bz2
+#LINUX_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.5.0
 
-# Used by pcmcia-cs and others
-LINUX_SOURCE_DIR=$(LINUX_DIR)
+
+
+LINUX_DIR:=$(TOOL_BUILD_DIR)/linux
 
 $(DL_DIR)/$(LINUX_SOURCE):
 	$(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
@@ -22,13 +34,17 @@ $(DL_DIR)/$(LINUX_SOURCE):
 $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 	mkdir -p $(TOOL_BUILD_DIR)
 	bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+ifneq ($(LINUX_UNPACK_DIR),$(LINUX_DIR))
 	mv $(LINUX_UNPACK_DIR) $(LINUX_DIR)
+endif
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.unpacked
 	rm -f $(LINUX_DIR)/include/asm
 	@if [ ! -f $(LINUX_DIR)/Makefile ] ; then \
-	    echo -e "VERSION = 2\nPATCHLEVEL = 6\nSUBLEVEL = 5\nEXTRAVERSION =\n" > \
+	    echo -e "VERSION = $(VERSION)\nPATCHLEVEL = $(PATCHLEVEL)\n" > \
+		    $(LINUX_DIR)/Makefile; \
+	    echo -e "SUBLEVEL = $(SUBLEVEL)\nEXTRAVERSION =\n" > \
 		    $(LINUX_DIR)/Makefile; \
 	    echo -e "KERNELRELEASE=\$$(VERSION).\$$(PATCHLEVEL).\$$(SUBLEVEL)\$$(EXTRAVERSION)" >> \
 		    $(LINUX_DIR)/Makefile; \
@@ -51,12 +67,6 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.unpacked
 	    (cd $(LINUX_DIR)/include; ln -fs asm-$(ARCH)$(NOMMU) asm;) \
 	fi
 	touch $(LINUX_DIR)/include/linux/autoconf.h;
-	if [ ! -f $(LINUX_DIR)/include/linux/version.h ] ; then \
-	    echo "#define UTS_RELEASE \"2.6.5\"" > $(LINUX_DIR)/include/linux/version.h; \
-	    echo "#define LINUX_VERSION_CODE 132613" >> $(LINUX_DIR)/include/linux/version.h; \
-	    echo "#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))" >> \
-		    $(LINUX_DIR)/include/linux/version.h; \
-	fi;
 	touch $(LINUX_DIR)/.configured
 
 $(LINUX_KERNEL): $(LINUX_DIR)/.configured