From: Raúl Porcel <armin76@gentoo.org>
Date: Sat, 4 Sep 2010 17:16:01 +0000 (+0000)
Subject: Apply patch from Guy Martin <gmsoft@gentoo.org> to fix installcd for hppa, gentoo... 
X-Git-Tag: CATALYST_2_0_6_916~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5215cae44b6bfd0bf7c544becd24442c2c6a7b45;p=catalyst.git

Apply patch from Guy Martin <gmsoft@gentoo.org> to fix installcd for hppa, gentoo bug #317423
---

diff --git a/ChangeLog b/ChangeLog
index f8ff9753..96ba2d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for catalyst
-# Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
+# Copyright 1999-2010 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
 
+  04 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  targets/support/bootloader-setup.sh, targets/support/create-iso.sh,
+  targets/support/pre-kmerge.sh:
+  Apply patch from Guy Martin <gmsoft@gentoo.org> to fix installcd for hppa,
+  gentoo bug #317423
+
   29 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/chroot-functions.sh:
   Only run depclean for stage3/system
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 66f03542..6fcb0354 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -43,9 +43,16 @@ case ${clst_hostarch} in
 		icfg=$1/boot/palo.conf
 		kmsg=$1/boot/kernels.msg
 		hmsg=$1/boot/help.msg
-		echo "--commandline=0/${first} initrd=${first}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts}" >> ${icfg}
+		# Make sure we strip the extension to the kernel to allow palo to choose
+		boot_kernel_common_name=${first/%32/}
+		boot_kernel_common_name=${boot_kernel_common_name/%64/}
+		echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
 		echo "--bootloader=boot/iplboot" >> ${icfg}
 		echo "--ramdisk=boot/${first}.igz" >> ${icfg}
+		for x in ${clst_boot_kernel}
+		do
+			echo "--recoverykernel=boot/${x}" >> ${icfg}
+		done
 	;;
 	ppc*|powerpc*)
 		# NO SOFTLEVEL SUPPORT YET
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 5a6323ca..c525a398 100644
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -92,7 +92,9 @@ case ${clst_hostarch} in
 		echo ">> Running mkisofs to create iso image...."
 		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
 		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
+		pushd ${clst_target_path}
 		palo -f boot/palo.conf -C ${1}
+		popd
 	;;
 	ia64)
 		if [ ! -e ${clst_target_path}/gentoo.efimg ]
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index c2ea2dd5..dd51ae9a 100644
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -2,5 +2,32 @@
 
 source /tmp/chroot-functions.sh
 
+case ${clst_hostarch} in
+	hppa)
+		got_32=0
+		got_64=0
+		for i in ${clst_boot_kernel}
+		do
+			if [ "${i: -2}" == "32" ]
+			then
+				if [ $got_32 -eq 1 ]
+				then
+					die "Only one 32 bit kernel can be configured"
+				fi
+				got_32=1
+			elif [ "${i: -2}" == "64" ]
+			then
+				if [ $got_64 -eq 1 ]
+				then
+					die "Only one 64 bit kernel can be configured"
+				fi
+				got_64=1
+			else
+				die "Kernel names must end by either 32 or 64"
+			fi
+		done
+	;;
+esac
+
 run_merge --oneshot genkernel
 install -d /tmp/kerncache