Clifford Wolf:

package/base/linux/linux.conf

@@ -32,21 +32,26 @@ forcefpic=0
 prefix=usr
 set_confopt
 
-case "$xpkg-" in
-	*-source-*)
+case "$xpkg" in
+	linux2[46])
+		;;
+	linux2[46]-source)
 		unset splitdesc_dev
-		pkg_linux_mode=source ;;
-	*-src-*)
-		abort "If you want to build a source package, use '${xpkg//src/source}'.";;
-	*-headers-cross-*)
+		pkg_linux_mode=source
+		;;
+	linux2[46]-headers-cross-*)
 		pkg_linux_mode=headers
 		pkg_linux_cross="${xpkg#*-cross-}"
-		echo_status "Preparing to build a cross-binutils package for $pkg_binutils_cross."
+		echo_status "Preparing to build a cross-kernel-headers package for $pkg_linux_cross."
 		prefix="$prefix/${pkg_linux_cross}-unknown-linux-gnu"
 		set_confopt
 		;;
-	*-headers-*)
-		pkg_linux_mode=headers ;;
+	linux2[46]-headers)
+		pkg_linux_mode=headers
+		;;
+	*)
+		abort "Unsupported linux kernel package name: $xpkg"
+		;;
 esac
 
 echo_status "Preparing to build a linux kernel $pkg_linux_mode package."
@@ -527,13 +532,13 @@ main_lx() {
 main_lx_headers() {
 	lx_source
 
-	versionhotfix 2.6.24.4
+	versionhotfix 2.6.25
 	find include/ -type f | xargs -r sed -i "/include/ s,<asm/,<asm-$lx_src_cpu/,g"
 
 	$MAKE mrproper
 	$MAKE INSTALL_HDR_PATH=dest headers_check
 
-	versionhotfix 2.6.24.4
+	versionhotfix 2.6.25
 	rm -f dest/include/asm
 	ln -sv asm-$lx_src_cpu dest/include/asm
 
@@ -543,9 +548,12 @@ main_lx_headers() {
 		( cd dest/include && patch -p1 --no-backup-if-mismatch < $x; )
 	done
 
-	mkdir -p $CLFS/$prefix/include
 	rm -rf dest/include/scsi
-	cp -rv dest/include/* $CLFS/$prefix/include
+	mkdir -p $CLFS/$prefix/include
+	for x in $(ls dest/include/); do
+		rm -rf $CLFS/$prefix/include/$x
+		cp -av dest/include/$x $CLFS/$prefix/include
+	done
 }
 
 autoextract=0

package/base/linux/linux.desc

@@ -50,8 +50,8 @@
 #endif
 
 #if xpkg == linux26.*
-[V] 2.6.24.4
-[D] 1458141259 linux-2.6.24.4.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
+[V] 2.6.25
+[D] 2632055287 linux-2.6.25.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
 #endif
 
 [CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done

package/base/linux/linux26/12-conf-hacks.patch

@@ -33,6 +33,15 @@ diff -dur linux-2.6.17-orig/scripts/kconfig/conf.c linux-2.6.17/scripts/kconfig/
  		case ask_all:
  			fflush(stdout);
  			fgets(line, 128, stdin);
+@@ -504,7 +515,7 @@
+ 	bindtextdomain(PACKAGE, LOCALEDIR);
+ 	textdomain(PACKAGE);
+ 
+-	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
++	while ((opt = getopt(ac, av, "osdD:nmMyrh")) != -1) {
+ 		switch (opt) {
+ 		case 'o':
+ 			input_mode = ask_new;
 @@ -523,6 +534,9 @@
  		case 'm':
  			input_mode = set_mod;

package/base/linux/linux26/80-ext23-suiddir.patch

@@ -134,12 +134,3 @@
  config JBD
  # CONFIG_JBD could be its own option (even modular), but until there are
  # other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
-@@ -1289,8 +1347,6 @@
- 	  It's currently broken, so for now:
- 	  answer N.
- 
--
--
- config SYSV_FS
- 	tristate "System V/Xenix/V7/Coherent file system support"
- 	help

package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch

@@ -1,34 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/linux/linux26/arch-sparc-asm_byteorder-ansi-c.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./include/asm-sparc/byteorder.h.orig	2004-11-21 14:52:27.000000000 +0100
-+++ ./include/asm-sparc/byteorder.h	2004-12-02 22:37:37.459072968 +0100
-@@ -4,10 +4,8 @@
- 
- #include <asm/types.h>
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
--#  define __BYTEORDER_HAS_U64__
--#  define __SWAB_64_THRU_32__
--#endif
-+#define __BYTEORDER_HAS_U64__
-+#define __SWAB_64_THRU_32__
- 
- #include <linux/byteorder/big_endian.h>
- 

package/base/linux/linux26/arch-sparc64-use-KCC.patch

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/linux/linux26/arch-sparc64-use-KCC.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./arch/sparc64/Makefile.orig	2004-09-18 07:51:04.000000000 +0200
-+++ ./arch/sparc64/Makefile	2004-09-18 07:51:32.000000000 +0200
-@@ -12,7 +12,7 @@
- 
- AFLAGS_vmlinux.lds.o += -Usparc
- 
--CC		:= $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo $(CC); else echo sparc64-linux-gcc; fi )
-+CC		:= $(KCC)
- 
- NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; )
- NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)