From d5c534af38e2b44fb28d7870c378f25c104103f5 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 28 Feb 2008 17:59:42 +0000 Subject: [PATCH] Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, no matter what. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1343 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++ targets/support/bootloader-setup.sh | 43 +-------- targets/support/create-iso.sh | 132 +++++----------------------- 3 files changed, 33 insertions(+), 147 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3af54be8..b5bb0a52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 28 Feb 2008; Chris Gianelloni + 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 targets/support/bootloader-setup.sh: Let's change our splash checking to a global check so it only needs to be diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 04d67c0d..cb055ac3 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -48,44 +48,7 @@ case ${clst_hostarch} in echo "--bootloader=boot/iplboot" >> ${icfg} echo "--ramdisk=boot/${first}.igz" >> ${icfg} ;; - ppc) - # 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) + ppc*|powerpc*) # NO SOFTLEVEL SUPPORT YET icfg=$1/boot/yaboot.conf kmsg=$1/boot/boot.msg @@ -98,7 +61,7 @@ case ${clst_hostarch} in # 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 @@ case ${clst_hostarch} in 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} diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 7ac208d7..4464de9c 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -49,11 +49,8 @@ then mips) clst_iso_volume_id="Gentoo Linux - MIPS" ;; - ppc) - clst_iso_volume_id="Gentoo Linux - PPC" - ;; - ppc64) - clst_iso_volume_id="Gentoo Linux - PPC64" + ppc*|powerpc*) + clst_iso_volume_id="Gentoo Linux - PowerPC" ;; s390) clst_iso_volume_id="Gentoo Linux - S390" @@ -65,7 +62,7 @@ then 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 @@ then 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 @@ case ${clst_hostarch} in 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 @@ case ${clst_hostarch} in # 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!" ;; - 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" - ;; + *) die "SGI LiveCD(s) only support the 'squashfs' fstype!" ;; esac ;; - ppc64) + ppc*|powerpc*) if [ -f ${clst_target_path}/ppc/bootinfo.txt ] then echo "bootinfo.txt found .. updating it" @@ -250,38 +195,9 @@ case ${clst_hostarch} in ${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 -- 2.26.2