public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] catalyst r1343 - in trunk: . targets/support
@ 2008-02-28 17:59 99% Chris Gianelloni (wolf31o2)
  0 siblings, 0 replies; 1+ results
From: Chris Gianelloni (wolf31o2) @ 2008-02-28 17:59 UTC (permalink / raw
  To: gentoo-commits

Author: wolf31o2
Date: 2008-02-28 17:59:42 +0000 (Thu, 28 Feb 2008)
New Revision: 1343

Modified:
   trunk/ChangeLog
   trunk/targets/support/bootloader-setup.sh
   trunk/targets/support/create-iso.sh
Log:
Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, no matter what.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-28 17:33:29 UTC (rev 1342)
+++ trunk/ChangeLog	2008-02-28 17:59:42 UTC (rev 1343)
@@ -2,6 +2,11 @@
 # $Id: $
 
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/bootloader-setup.sh, targets/support/create-iso.sh:
+  Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match,
+  no matter what.
+
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:
   Let's change our splash checking to a global check so it only needs to be
   done once. This makes much more sense than having all of those if ... else

Modified: trunk/targets/support/bootloader-setup.sh
===================================================================
--- trunk/targets/support/bootloader-setup.sh	2008-02-28 17:33:29 UTC (rev 1342)
+++ trunk/targets/support/bootloader-setup.sh	2008-02-28 17:59:42 UTC (rev 1343)
@@ -48,57 +48,20 @@
 		echo "--bootloader=boot/iplboot" >> ${icfg}
 		echo "--ramdisk=boot/${first}.igz" >> ${icfg}
 	;;
-	ppc)
+	ppc*|powerpc*)
 		# NO SOFTLEVEL SUPPORT YET
 		icfg=$1/boot/yaboot.conf
 		kmsg=$1/boot/boot.msg
 
-		echo "default ${first}" > ${icfg}
-		echo "timeout 300" >> ${icfg}
 		echo "device=cd:" >> ${icfg}
 		echo "root=/dev/ram" >> ${icfg}
 		echo "fgcolor=white" >> ${icfg}
 		echo "bgcolor=black" >> ${icfg}
 		echo "message=/boot/boot.msg" >> ${icfg}
-
-		# Here is where I fix up the boot.msg file.
-		sed -e 's/ARCH/PowerPC/' \
-			-e 's/HARDWARE/32-bit Apple and Pegasos hardware/' \
-			-i $kmsg
-
-		# Here we wipe out the /ppc directory, if it exists.
-		rm -rf $1/ppc
-
-		for x in ${clst_boot_kernel}
-		do	
-			eval custom_kopts=\$${x}_kernelopts
-			echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
-			echo "image=/boot/${x}" >> ${icfg}
-
-			if [ -e "$1/boot/${x}.igz" ]
-			then
-				echo "initrd=/boot/${x}.igz" >> ${icfg}
-			fi
-
-			echo "label=${x}" >> ${icfg}
-			echo "read-write" >> ${icfg}
-			echo "append=\"${default_append_line}\"" >> ${icfg}
-		done
-	;;
-	ppc64)
-		# NO SOFTLEVEL SUPPORT YET
-		icfg=$1/boot/yaboot.conf
-		kmsg=$1/boot/boot.msg
-
-		echo "device=cd:" >> ${icfg}
-		echo "root=/dev/ram" >> ${icfg}
-		echo "fgcolor=white" >> ${icfg}
-		echo "bgcolor=black" >> ${icfg}
-		echo "message=/boot/boot.msg" >> ${icfg}
 		
 		# Here is where I fix up the boot.msg file.
 		sed -e 's/ARCH/PowerPC/' \
-			-e 's/HARDWARE/64-bit Apple and IBM hardware/' \
+			-e 's/HARDWARE/Apple and IBM hardware/' \
 			-i $kmsg
 
 		# Setup the IBM yaboot.conf	
@@ -163,6 +126,8 @@
 					echo "append=\"${default_append_line}\"" >> ${etc_icfg}
 				fi
 			else
+				# Here we wipe out the /ppc directory, if it exists.
+				rm -rf $1/ppc
 				if [ -n "${clst_kernel_console}" ]
 				then
 					echo >> ${icfg}

Modified: trunk/targets/support/create-iso.sh
===================================================================
--- trunk/targets/support/create-iso.sh	2008-02-28 17:33:29 UTC (rev 1342)
+++ trunk/targets/support/create-iso.sh	2008-02-28 17:59:42 UTC (rev 1343)
@@ -49,12 +49,9 @@
 				mips)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
-				ppc)
-					clst_iso_volume_id="Gentoo Linux - PPC"
+				ppc*|powerpc*)
+					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				ppc64)
-					clst_iso_volume_id="Gentoo Linux - PPC64"
-				;;
 				s390)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
@@ -65,7 +62,7 @@
 					clst_iso_volume_id="Gentoo Linux - SPARC"
 				;;
 				x86)
-					clst_iso_volume_id="Gentoo Linux - X86"
+					clst_iso_volume_id="Gentoo Linux - x86"
 				;;
 				*)
 					clst_iso_volume_id="Catalyst LiveCD"
@@ -74,46 +71,27 @@
 	esac
 fi
 
+if [ "${clst_fstype}" == "zisofs" ]
+then
+	mkisofs_opts="-J -z -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+else
+	mkisofs_opts="-J -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+fi
+
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
-		case ${clst_fstype} in
-			zisofs)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \
-					${1} ${clst_target_path}"
-				mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \
-					${clst_target_path}  || die "Cannot make ISO image"
-			;;
-			*)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \
-					${clst_target_path}"
-				mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \
-					${clst_target_path} || die "Cannot make ISO image"
-			;;
-		esac
+		echo ">> Running mkisofs to create iso image...."
+		echo ">> mkisofs -R -l ${mkisofs_opts}"
+		mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
 		isomarkboot ${1} /boot/bootlx
 	;;
 	arm)
 	;;
 	hppa)
-		case ${clst_fstype} in
-			zisofs)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -R -l -z -V \"${clst_iso_volume_id}\" -o \
-					${1} ${clst_target_path}"
-				mkisofs -J -R -l -z -V "${clst_iso_volume_id}" -o ${1} \
-					${clst_target_path}  || die "Cannot make ISO image"
-			;;
-			*)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} \
-					${clst_target_path}"
-				mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} \
-					${clst_target_path}  || die "Cannot make ISO image"
-			;;
-		esac
+		echo ">> Running mkisofs to create iso image...."
+		echo ">> mkisofs -R -l ${mkisofs_opts}"
+		mkisofs -R -l ${mkisofs_opts} || die "Cannot make ISO image"
 		palo -f boot/palo.conf -C ${1}
 	;;
 	ia64)
@@ -144,12 +122,9 @@
 		echo '>> Removing /boot...'
 		rm -rf ${clst_target_path}/boot
 
-		echo '>> Generating ISO...'
-		echo "mkisofs -J -R -l -V \"${clst_iso_volume_id}\" -o ${1} -b \
-			gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" 
-		mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c \
-			boot.cat -no-emul-boot \
-			${clst_target_path} || die "Cannot make ISO image" 
+		echo ">> Running mkisofs to create iso image...."
+		echo ">> mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts}"
+		mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot ${mkisofs_opts} || die "Cannot make ISO image"
 	;;
 	mips)
 		case ${clst_fstype} in
@@ -205,40 +180,10 @@
 				# o=	output image (burnable to CD; readable by fdisk)
 				/usr/bin/sgibootcd c=${cfg} o=${clst_iso}
 			;;
-			*) die "SGI LiveCDs only support the 'normal' fstype!"	;;
+			*) die "SGI LiveCD(s) only support the 'squashfs' fstype!"	;;
 		esac
 	;;
-	ppc)
-		case ${clst_fstype} in
-			zisofs)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe \
-					-map ${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
-					${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
-					${1} ${clst_target_path}"
-				mkisofs -J -r -l -z -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid "${clst_iso_volume_id}" -hfs-bless \
-					${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
-					${1} ${clst_target_path} || die "Cannot make ISO image"
-			;;
-			*)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
-					${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \
-					${1} ${clst_target_path}"
-				mkisofs -J -r -l -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid "${clst_iso_volume_id}" -hfs-bless \
-					${clst_target_path}boot -V "${clst_iso_volume_id}" -o \
-					${1} ${clst_target_path} || die "Cannot make ISO image"
-			;;
-		esac
-	;;
-	ppc64)
+	ppc*|powerpc*)
 		if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
 		then
 			echo "bootinfo.txt found .. updating it"
@@ -250,38 +195,9 @@
 			${clst_target_path}/ppc/bootinfo.txt
 		fi
 
-		case ${clst_fstype} in
-			zisofs)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" -V \"${clst_iso_volume_id}\" -o  ${1} ${clst_target_path}"
-				mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid "${clst_iso_volume_id}" -hfs-bless \
-					${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" \
-					-hide-hfs "distfiles" -hide-hfs "snapshots" \
-					-V "${clst_iso_volume_id}" -o \
-					${1} ${clst_target_path} || die "Cannot make ISO image"
-			;;
-			*)
-				echo "Running mkisofs to create iso image...."
-				echo "mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \
-					${clst_target_path}boot -V \"${clst_iso_volume_id}\" \
-					-hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" \
-					-hide-hfs \"image.loop\" -hide-hfs \"image.squashfs\" -hide-hfs \"image.jffs\" \
-					-hide-hfs \"image.cramfs\" \
-					-o ${1} ${clst_target_path}"
-				mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \
-					${clst_target_path}boot/map.hfs -part -no-desktop \
-					-hfs-volid "${clst_iso_volume_id}" -hfs-bless \
-					${clst_target_path}boot -V "${clst_iso_volume_id}" \
-					-hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" \
-					-hide-hfs "image.loop" -hide-hfs "image.squashfs" -hide-hfs "image.jffs" \
-					-hide-hfs "image.cramfs" \
-					-o ${1} ${clst_target_path} || die "Cannot make ISO image"
-			;;
-		esac
+		echo ">> Running mkisofs to create iso image...."
+		echo ">> mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" ${mkisofs_opts}"
+		mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" ${mkisofs_opts} || die "Cannot make ISO image"
 	;;
 	sparc*)
 		# Old silo (<=1.2.6) requires a specially built mkisofs

-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-02-28 17:59 99% [gentoo-commits] catalyst r1343 - in trunk: . targets/support Chris Gianelloni (wolf31o2)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox