From aa784de131a4092f603fad254812e602f86747c9 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 12 May 2008 09:56:45 +0000
Subject: [PATCH] Clifford Wolf: 	Updated linux (2.6.24.2)

[2008021616340529148] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9003 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux/linux.conf                 | 44 +++++++++++++------
 package/base/linux/linux.desc                 |  4 +-
 .../base/linux/linux26/12-conf-hacks.patch    |  8 ++--
 .../linux26/arch-x86-asm-processor-h.patch    | 38 ----------------
 .../linux/linux26/linux-2.6.9-nvidia.patch    | 33 --------------
 5 files changed, 37 insertions(+), 90 deletions(-)
 delete mode 100644 package/base/linux/linux26/arch-x86-asm-processor-h.patch
 delete mode 100644 package/base/linux/linux26/linux-2.6.9-nvidia.patch

diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 5f87b3843..6d4e334af 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -84,6 +84,33 @@ else
 		    -e s/mips.*/mips/ -e s/parisc64/parisc/ )
 fi
 
+case "$lx_cpu" in
+	i386)
+		lx_src_cpu="x86"
+		;;
+	x86_64)
+		lx_src_cpu="x86"
+		;;
+	*)
+		lx_src_cpu="$lx_cpu"
+		;;
+esac
+
+case "$lx_cpu" in
+	i386)
+		lx_defconfig="arch/$lx_src_cpu/configs/i386_defconfig"
+		;;
+	x86_64)
+		lx_defconfig="arch/$lx_src_cpu/configs/x86_64_defconfig"
+		;;
+	powerpc)
+		lx_defconfig="arch/$lx_src_cpu/configs/common_defconfig"
+		;;
+	*)
+		lx_defconfig="arch/$lx_src_cpu/defconfig"
+		;;
+esac
+
 MAKE="$MAKE ARCH=$lx_cpu CROSS_COMPILE=$archprefix KCC=$KCC"
 
 # correct the abolute path for patchfiles supplied in the .desc file
@@ -106,17 +133,8 @@ done
 
 auto_config ()
 {
-	case "$arch" in
-		powerpc)
-			defconfig="configs/common_defconfig"
-			;;
-		*)
-			defconfig="defconfig"
-			;;
-	esac
-
 	for x in $base/architecture/$arch/kernel{$treever,}.conf{.sh,.m4,} \
-		arch/$lx_cpu/$defconfig
+		$lx_defconfig
 	do
 		if [ -f $x ] ; then
 			echo "   using: $x"
@@ -131,8 +149,8 @@ auto_config ()
 		fi
 	done
 
-	echo "  merging (system default): 'arch/$lx_cpu/$defconfig'"
-	grep '^CONF.*=y' arch/$lx_cpu/$defconfig | cut -f1 -d= | \
+	echo "  merging (system default): '$lx_defconfig'"
+	grep '^CONF.*=y' $lx_defconfig | cut -f1 -d= | \
 	while read tag ; do egrep -q "(^| )$tag[= ]" .config || echo "$tag=y"
 	  done >> .config ; cp .config .config.1
 
@@ -382,7 +400,7 @@ main_lx() {
 	case "$lx_cpu" in
 	    i386|x86_64)
 		eval $MAKE bzImage
-		cp -vf arch/$lx_cpu/boot/bzImage $root/boot/vmlinuz_${lx_kernelrelease}
+		cp -vf arch/$lx_src_cpu/boot/bzImage $root/boot/vmlinuz_${lx_kernelrelease}
 		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
 			ln -svf vmlinuz_${lx_kernelrelease} $root/boot/vmlinuz
 		fi
diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index 2b00dfbc5..c36d1fc1f 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -50,8 +50,8 @@
 #endif
 
 #if xpkg == linux26.*
-[V] 2.6.23.1
-[D] 1833105149 linux-2.6.23.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
+[V] 2.6.24.2
+[D] 2288383357 linux-2.6.24.2.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
diff --git a/package/base/linux/linux26/12-conf-hacks.patch b/package/base/linux/linux26/12-conf-hacks.patch
index 6f8eedbe2..4f64bb374 100644
--- a/package/base/linux/linux26/12-conf-hacks.patch
+++ b/package/base/linux/linux26/12-conf-hacks.patch
@@ -62,17 +62,17 @@ diff -dur linux-2.6.17-orig/scripts/kconfig/Makefile linux-2.6.17/scripts/kconfi
 +PHONY += randconfig allyesconfig allnoconfig allmodconfig no2modconfig defconfig
  
  randconfig: $(obj)/conf
- 	$< -r arch/$(ARCH)/Kconfig
+ 	$< -r $(Kconfig)
 @@ -56,6 +56,9 @@
  allmodconfig: $(obj)/conf
- 	$< -m arch/$(ARCH)/Kconfig
+ 	$< -m $(Kconfig)
  
 +no2modconfig: scripts/kconfig/conf
-+	$< -M arch/$(ARCH)/Kconfig
++	$< -M $(Kconfig)
 +
  defconfig: $(obj)/conf
  ifeq ($(KBUILD_DEFCONFIG),)
- 	$< -d arch/$(ARCH)/Kconfig
+ 	$< -d $(Kconfig)
 @@ -77,6 +80,7 @@
  	@echo  '  randconfig	  - New config with random answer to all options'
  	@echo  '  defconfig	  - New config with default answer to all options'
diff --git a/package/base/linux/linux26/arch-x86-asm-processor-h.patch b/package/base/linux/linux26/arch-x86-asm-processor-h.patch
deleted file mode 100644
index 637ceff87..000000000
--- a/package/base/linux/linux26/arch-x86-asm-processor-h.patch
+++ /dev/null
@@ -1,38 +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-x86-asm-processor-h.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-i386/processor.h.vanilla	2005-11-02 17:16:16.000000000 +0100
-+++ ./include/asm-i386/processor.h	2005-11-02 17:17:08.000000000 +0100
-
-@@ -220,6 +220,7 @@
- #define X86_CR4_OSFXSR		0x0200	/* enable fast FPU save and restore */
- #define X86_CR4_OSXMMEXCPT	0x0400	/* enable unmasked SSE exceptions */
- 
-+#ifdef __KERNEL__
- /*
-  * Save the cr4 feature set we're using (ie
-  * Pentium 4MB enable and PPro Global page
-@@ -246,6 +247,7 @@
- 	write_cr4(cr4);
- }
- 
-+#endif /* __KERNEL__ */
- /*
-  *      NSC/Cyrix CPU configuration register indexes
-  */
diff --git a/package/base/linux/linux26/linux-2.6.9-nvidia.patch b/package/base/linux/linux26/linux-2.6.9-nvidia.patch
deleted file mode 100644
index 414ed1e88..000000000
--- a/package/base/linux/linux26/linux-2.6.9-nvidia.patch
+++ /dev/null
@@ -1,33 +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/linux-2.6.9-nvidia.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 ---
-
-export __VMALLOC_RESERVE kernel symbol for Nvidia x86 Linux driver 1.0-6111
-taken from http://kerneltrap.org/node/view/4022
-
---- linux-orig/arch/i386/mm/init.c      2004-09-26 03:43:57.944613000 +1000
-+++ linux-new/arch/i386/mm/init.c       2004-09-28 02:37:21.787922000 +1000
-@@ -41,6 +41,7 @@
- #include <asm/sections.h>
-
- unsigned int __VMALLOC_RESERVE = 128 << 20;
-+EXPORT_SYMBOL(__VMALLOC_RESERVE);
-
- DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
- unsigned long highstart_pfn, highend_pfn;
-