Stefan Fiedler:

package/base/linux/linux.conf

@@ -27,26 +27,30 @@ pkg_linux_cross=""
 # do not replicate docs
 createdocs=0
 
+forcefpic=0
+
+prefix=usr
+set_confopt
+
 case "$xpkg-" in
 	*-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=headers
+		pkg_linux_cross="${xpkg#*-cross-}"
+		echo_status "Preparing to build a cross-binutils package for $pkg_binutils_cross."
+		prefix="$prefix/${pkg_linux_cross}-unknown-linux-gnu"
+		set_confopt
+		;;
 	*-headers-*)
 		pkg_linux_mode=headers ;;
 esac
 
 echo_status "Preparing to build a linux kernel $pkg_linux_mode package."
 
-case "$xpkg" in
-	*-cross-*)
-		pkg_linux_cross="${xpkg#**-cross-}"
-		abort "Building linux kernel cross packages isn't supported yet."
-		;;
-esac
-
-
 treever=${xpkg/linux/}
 treever=${treever/-*/}
 
@@ -343,12 +347,12 @@ main_lx_src() {
 		cp -v .config_modules ../linux$treever-patches/config_modules.txt
 	fi
 
-	# can fail in stage 0-1 ...
-	if [ $stagelevel -gt 1 ] && [[ $treever = 24* ]] ; then
+	# can fail in stage 0-2 ...
+	if [ $stagelevel -ge 3 ] && [[ $treever = 24* ]] ; then
 		echo "Creating dependencies (e.g. for versioned symbols) ..."
 		eval $MAKE dep-files
 	fi
-	if [ $stagelevel -gt 1 ] && [[ $treever = 26* ]] ; then
+	if [ $stagelevel -ge 3 ] && [[ $treever = 26* ]] ; then
 		echo "Creating scripts/* because external modules need it ..."
 		eval $MAKE scripts/
 	fi
@@ -471,7 +475,7 @@ main_lx() {
 		echo "Building the modules ..."
 		eval $MAKE modules
 		echo "Installing the modules ..."
-		if [ $stagelevel -le 1 ] ; then
+		if [ $stagelevel -le 2 ] ; then
 			eval $MAKE modules_install \
 				INSTALL_MOD_PATH=$root DEPMOD=/bin/true
 		else
@@ -504,21 +508,20 @@ main_lx() {
 
 main_lx_headers() {
 	lx_source
-	lx_config
 
-	echo "Installing Linux headers in $root ..."
-	mkdir -p $builddir/hdr_path
-	eval $MAKE headers_install INSTALL_HDR_PATH=$builddir/hdr_path
+	$MAKE mrproper
+	$MAKE headers_check
+	$MAKE INSTALL_HDR_PATH=dest headers_install
+
 	for x in $confdir/linux26-hdrs/*.patch; do
 		[ -f $x ] || continue
 		echo "Applying linux userspace headers patch $x.."
-		( cd $builddir/hdr_path/include && patch -p1 < $x; )
+		( cd dest/include && patch -p1 < $x; )
 	done
-	rm -vf $builddir/hdr_path/include/scsi/{sg,scsi,scsi_ioctl}.h
-	cp -av $builddir/hdr_path/include/* $root/usr/include/
 
-	# avoid shared files conflict with glibc
-	var_append flist''del '|' "usr/include/scsi"
+	mkdir -p $CLFS/$prefix/include
+	rm -rf dest/include/scsi
+	cp -rv dest/include/* $CLFS/$prefix/include
 }
 
 autoextract=0

package/base/linux/linux.desc

@@ -42,7 +42,7 @@
 [L] GPL
 [S] Stable
 
-[P] X -?---5---9 100.300
+[P] X --?--5---9 222.100
 
 #if xpkg == linux24.*
 [V] 2.4.34.4

package/base/linux/postconfig.in

@@ -0,0 +1 @@
+pkgremove linux

package/base/linux/preconfig.in

@@ -1,8 +1,7 @@
 pkgfork linux linux24 unflag CORE
 pkgfork linux linux24-source unflag CORE
-pkgfork linux linux26 stages -X---5---9
-pkgfork linux linux26-source stages -X---5---9
-pkgfork linux linux26-headers stages 01-------9 priority 100.200
-pkgremove linux
+pkgfork linux linux26 stages --X--5---9
+pkgfork linux linux26-source stages --X--5---9
+pkgfork linux linux26-headers stages 0--3-----9 priority 100.100
 
 CFGTEMP_LINUX_HEADERS="$CFGTEMP_LINUX_HEADERS linux26-headers Use_Linux_2.6_as_Linux_headers"