From 1a35a663507900d27978720bca083307e1667188 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 11 Feb 2005 20:52:06 +0000
Subject: Fix some silly bugs: a variable for gcc was used before it was
 defined, remove '.svn' not 'CVS' from the install, add 2.4.29 kernel headers
 as the default.

---
 Makefile                                   |  2 +-
 toolchain/kernel-headers/Config.in         |  6 +++++-
 toolchain/kernel-headers/kernel-headers.mk | 22 +++++++++++++---------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e6eb5cca9..dbe5ee875 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ $(STAGING_DIR):
 $(TARGET_DIR):
 	zcat target/default/skel.tar.gz | tar -C $(BUILD_DIR) -xf -
 	cp -a target/default/target_skeleton/* $(TARGET_DIR)/
-	-find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
+	-find $(TARGET_DIR) -type d -name .svn -exec rm -rf {} \; > /dev/null 2>&1
 
 source: $(TARGETS_SOURCE)
 
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 7cb945d04..68898e597 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -6,7 +6,7 @@ comment "Kernel Header Options"
 
 choice
 	prompt "Kernel Headers"
-	default BR2_KERNEL_HEADERS_2_4_27
+	default BR2_KERNEL_HEADERS_2_4_29
 	help
 	  Select the version of kernel header files you wish to use.
 	  You must select the correct set of header files to match
@@ -18,6 +18,9 @@ choice
 	config BR2_KERNEL_HEADERS_2_4_27
 		bool "Linux 2.4.27 kernel headers"
 
+	config BR2_KERNEL_HEADERS_2_4_29
+		bool "Linux 2.4.29 kernel headers"
+
 	config BR2_KERNEL_HEADERS_2_6_8
 		bool "Linux 2.6.8 kernel headers (with mips fixes)"
 
@@ -30,6 +33,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "2.4.25"    if BR2_KERNEL_HEADERS_2_4_25
 	default "2.4.27"    if BR2_KERNEL_HEADERS_2_4_27
+	default "2.4.29"    if BR2_KERNEL_HEADERS_2_4_29
 	default "2.6.8"	    if BR2_KERNEL_HEADERS_2_6_8
 	default "2.6.9"	    if BR2_KERNEL_HEADERS_2_6_9
 
diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk
index abb6e5389..7ca097355 100644
--- a/toolchain/kernel-headers/kernel-headers.mk
+++ b/toolchain/kernel-headers/kernel-headers.mk
@@ -6,6 +6,9 @@
 # by a 'make clean' so don't put anything sacred in here...
 #
 #############################################################
+DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS)))
+#"
+
 ifneq ($(filter $(TARGETS),kernel-headers),)
 DEFAULT_KERNEL_HEADERS:=$(strip $(DEFAULT_KERNEL_HEADERS))
 
@@ -24,12 +27,21 @@ endif
 ifeq ("$(strip $(DEFAULT_KERNEL_HEADERS))","2.4.27")
 VERSION:=2
 PATCHLEVEL:=4
-SUBLEVEL:=25
+SUBLEVEL:=27
 LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain
 LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.27.tar.bz2
 LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.27
 endif
 
+ifeq ("$(strip $(DEFAULT_KERNEL_HEADERS))","2.4.29")
+VERSION:=2
+PATCHLEVEL:=4
+SUBLEVEL:=29
+LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain
+LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.29.tar.bz2
+LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.29
+endif
+
 ifeq ("$(strip $(DEFAULT_KERNEL_HEADERS))","2.6.7")
 VERSION:=2
 PATCHLEVEL:=6
@@ -143,11 +155,3 @@ kernel-headers-dirclean:
 	rm -rf $(LINUX_HEADERS_DIR)
 
 endif
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS)))
-#"
-
-- 
cgit v1.2.3