From 62277935f94a9019c6ee87fd6dfb21791392c594 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Thu, 20 May 2004 21:31:48 +0000
Subject: [PATCH] Rene Rebe: 	* merged -r2778:HEAD from 2.0-stable branch 
   PowerPC ans SPARC cleanups (ans SPARC 2.6 kernel build fix)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3058 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux24/arch-ppc-mac-nvram.patch | 17 +++++++++++++
 package/base/linux24/linux24.conf             | 24 ++++++-------------
 2 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 package/base/linux24/arch-ppc-mac-nvram.patch

diff --git a/package/base/linux24/arch-ppc-mac-nvram.patch b/package/base/linux24/arch-ppc-mac-nvram.patch
new file mode 100644
index 000000000..250cf73fe
--- /dev/null
+++ b/package/base/linux24/arch-ppc-mac-nvram.patch
@@ -0,0 +1,17 @@
+
+Erhm - on PPlus I do not want the non-compileable in this config
+macintosh/nvram driver ...
+
+  - Rene Rebe <rene@rocklinux.org>
+
+--- linux-2.4.25/drivers/macintosh/Makefile.orig	2002-11-29 00:53:13.000000000 +0100
++++ linux-2.4.25/drivers/macintosh/Makefile	2004-04-19 21:51:26.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ obj-$(CONFIG_PMAC_PBOOK)	+= mediabay.o
+ obj-$(CONFIG_MAC_SERIAL)	+= macserial.o
+-ifneq ($(CONFIG_MAC),y)
++ifeq ($(CONFIG_PMAC),y)
+   obj-$(CONFIG_NVRAM)		+= nvram.o
+ endif
+ obj-$(CONFIG_MAC_HID)		+= mac_hid.o
diff --git a/package/base/linux24/linux24.conf b/package/base/linux24/linux24.conf
index 81530e12a..b87bf3c47 100644
--- a/package/base/linux24/linux24.conf
+++ b/package/base/linux24/linux24.conf
@@ -75,29 +75,19 @@ main_lx() {
 		[ "$default" ] && \
 		  cp -vf vmlinux $root/boot/vmlinux
 		eval $MAKE zImage
-		# copy some specially pre-processed files with version
-		echo "before $IFS"
-		IFS=$' \t\n' # correcly set IFS - it get mangled somewhere ...
-		echo "after $IFS"
-		for x in $(cd arch/ppc/boot/images/ ; ls zImage.*) ; do
-			cp -v arch/ppc/boot/images/$x \
-			  $root/boot/${x/zImage/zImage-$ver}
+		for x in arch/ppc/boot/images/zImage.* ; do
+		  cp -v $x $root/boot/${x/arch\/ppc\/boot\/images\//}-$ver
 		done
 		;;
 	    sparc)
-		eval $MAKE vmlinux
+		if [ $treever != 24* -a "$ROCKCFG_SPARC_BITS" = 32 ] ; then
+			eval $MAKE image
+		else
+			eval $MAKE vmlinux
+		fi
 		cp -vf vmlinux $root/boot/vmlinux_$ver-rock
 		[ "$default" ] && \
 		  cp -vf vmlinux $root/boot/vmlinux
-		# build a sun4 kernel ...
-		#echo "CONFIG_SUN4=y" >> .config
-		#yes '' | eval $MAKE oldconfig > /dev/null
-		#eval $MAKE vmlinux
-		#cp -vf vmlinux $root/boot/vmlinux4_$ver-rock
-		[ "$default" ] && \
-		#  cp -vf vmlinux $root/boot/vmlinux4
-		#echo "# CONFIG_SUN4 is not set" >> .config
-		yes '' | eval $MAKE oldconfig > /dev/null
 		;;
 	    *)
 		eval $MAKE vmlinux