From eabb23e9999c051aeea9092aec17649f478b7e9e Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Sun, 10 Oct 2004 11:44:01 +0000
Subject: [PATCH] fake: 	linux.conf, bootdisk/sparc, silo setup: 	call
 the 32 bit kernel vmlinux32, the 	64 bit kernel vmlinux64

	etc-silo.conf: use 32/64 bit kernel naming
	scheme, also

	remove wrong patch from silo

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



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4519 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux/linux.conf              | 21 ++++++++-----
 package/sparc/silo/etc-silo.conf           |  7 ++++-
 package/sparc/silo/register-pseudoop.patch | 34 ----------------------
 package/sparc/silo/silo.setup              |  4 ---
 target/bootdisk/sparc/silo.conf            |  2 +-
 5 files changed, 21 insertions(+), 47 deletions(-)
 delete mode 100644 package/sparc/silo/register-pseudoop.patch

diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 178207dd7..f86c52b23 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -359,12 +359,12 @@ main_lx_header() {
 	else
 		# we can only generate this files when we have a cross compiler
 		# which is stage 1 and above ...
-		if [ $stagelevel -gt  0 -a $treever != 26 ] ; then
+		if [ $stagelevel -gt 0 -a $treever != 26 ] ; then
 			# build two generated headers first ...
 			make ARCH=sparc CROSS_COMPILE=$archprefix KCC=$KCC \
 			  arch/sparc/kernel/Makefile check_asm
 			[ $lx_cpu = sparc64 ] && \
-				make ARCH=sparc64 CROSS_COMPILE=$archprefix KCC=$KCC \
+				make ARCH=sparc64 CROSS_COMPILE=$archprefix KCC=sparc64-unknown-linux-gnu-gcc \
 				  arch/sparc64/kernel/Makefile check_asm
 		fi
 
@@ -431,14 +431,21 @@ main_lx() {
 		done
 		;;
 	    sparc)
-		if [[ $treever != 24* ]] && [ "$ROCKCFG_SPARC_BITS" = 32 ]] ; then
-			eval $MAKE image
-		else
+		if [ "$treever" = 24 ] ; then
 			eval $MAKE vmlinux
+		else
+			eval $MAKE image
 		fi
-		cp -vf vmlinux $root/boot/vmlinux_$ver-rock
+
+		cp -vf vmlinux $root/boot/vmlinux32_${lx_kernelrelease}
 		[ "$default" ] && \
-		  cp -vf vmlinux $root/boot/vmlinux
+				gzip -9 < vmlinux > $root/boot/vmlinux32.gz
+		;;
+	    sparc64)
+		eval $MAKE vmlinux
+		cp -vf vmlinux $root/boot/vmlinux64_${lx_kernelrelease}
+		[ "$default" ] && \
+			gzip -9 < vmlinux > $root/boot/vmlinux64.gz
 		;;
 	    um)
 		eval $MAKE linux
diff --git a/package/sparc/silo/etc-silo.conf b/package/sparc/silo/etc-silo.conf
index 9f842d418..c6bd24839 100644
--- a/package/sparc/silo/etc-silo.conf
+++ b/package/sparc/silo/etc-silo.conf
@@ -8,7 +8,12 @@ read-only
 default=rock
 
 # should be failsafe...
-image=/boot/vmlinux
+image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
+	label = rock
+	root  = "/dev/discs/disc0/part1"
+	read-only
+
+image[sun4u]=/boot/vmlinux64.gz
 	label = rock
 	root  = "/dev/discs/disc0/part1"
 	read-only
diff --git a/package/sparc/silo/register-pseudoop.patch b/package/sparc/silo/register-pseudoop.patch
deleted file mode 100644
index 20f37e3ac..000000000
--- a/package/sparc/silo/register-pseudoop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./common/udivdi3.S.orig	2004-06-28 21:23:18.727522472 +0200
-+++ ./common/udivdi3.S	2004-06-28 21:24:00.399187416 +0200
-@@ -17,6 +17,8 @@
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
- 
-+	.register %g2,#scratch
-+
- 	.text
- 	.align 4
- 	.globl __udivdi3
---- ./second/muldi3.S.orig	2004-06-28 21:29:22.416233384 +0200
-+++ ./second/muldi3.S	2004-06-28 21:29:44.663851232 +0200
-@@ -17,6 +17,8 @@
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
- 
-+	.register %g2,#scratch
-+
- 	.text
- 	.align 4
- 	.globl __muldi3
---- ./common/divdi3.S.orig	2004-06-28 21:21:26.144637672 +0200
-+++ ./common/divdi3.S	2004-06-28 21:21:52.257667888 +0200
-@@ -17,6 +17,9 @@
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
- 
-+	.register %g3,#scratch
-+	.register %g2,#scratch
-+ 
- 	.data
- 	.align 8
- 	.globl	__clz_tab
diff --git a/package/sparc/silo/silo.setup b/package/sparc/silo/silo.setup
index 166f4cb3d..0af3ef42a 100644
--- a/package/sparc/silo/silo.setup
+++ b/package/sparc/silo/silo.setup
@@ -32,10 +32,6 @@ case "$in" in
 	{ echo -e '# silo.conf - autogenerated by rocklinux'
 	  echo -e 'boot=/dev/discs/disc0/disc\ndelay=100\ndefault=rock\n'
 
-	  echo -e '# failsafe method, for the time until both kernels work\n'
-	  echo -e 'image=/boot/vmlinux32.gz\n\tlabel=rock'
-	  echo -e '\troot="'$rootdev'"\n\tread-only'
-
 	  echo -e '# autoselection sparc v.8 kernel (Sparc, MicroSparc,SuperSparc, HyperSparc)\n'
 	  echo -e 'image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz\n\tlabel=rock32'
 	  echo -e '\troot="'$rootdev'"\n\tread-only'
diff --git a/target/bootdisk/sparc/silo.conf b/target/bootdisk/sparc/silo.conf
index c855a517e..a629e4e4b 100644
--- a/target/bootdisk/sparc/silo.conf
+++ b/target/bootdisk/sparc/silo.conf
@@ -17,6 +17,6 @@ image="cat /boot/help1.txt"
 image[sun4u]=/boot/vmlinux64.gz
 	label=install
 	alias=linux
-image[sun4c,sun4d,sun4m]=/boot/vmlinux.gz
+image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
 	label=install
 	alias=linux