Use spaces instead of tabs. Fix the indentations of the if blocks in makeBootImages so that it doesn't induce headaches. --- scripts/mk-images.ppc | 195 ++++++++++++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 95 deletions(-)
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 18cf445..b9e65e9 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -24,31 +24,31 @@ makeBootImages() { FAKEARCH=""
if [ "$KERNELARCH" = "ppc64" ]; then - mkdir -p $TOPDESTPATH/ppc/ppc64 - echo "Building $KERNELARCH initrd" - makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/$RAMDISK \ - --initrdsize 8192 \ - --loaderbin loader \ - --modules "$INITRDMODS spufs viocd gpio_mdio" - - if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024 )); then - echo "***" - echo "*** PPC64 $RAMDISK is larger than 32 MB, aborting" - echo "***" - echo "*** This file is generated by scripts/mk-images.ppc in anaconda, but the most" - echo "*** likely causes of this problem are:" - echo "*** kernel module set on ppc64 grew in size" - echo "*** dependent libraries or programs grew in size" - echo "***" - echo "*** Please contact the anaconda development team for help determining which" - echo "*** component in the distribution is at fault." - echo "***" - exit 1 - fi - - cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz + mkdir -p $TOPDESTPATH/ppc/ppc64 + echo "Building $KERNELARCH initrd" + makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/$RAMDISK \ + --initrdsize 8192 \ + --loaderbin loader \ + --modules "$INITRDMODS spufs viocd gpio_mdio" + + if (( $(stat --format=%s $TOPDESTPATH/ppc/ppc64/$RAMDISK) > 32*1024*1024 )); then + echo "***" + echo "*** PPC64 $RAMDISK is larger than 32 MB, aborting" + echo "***" + echo "*** This file is generated by scripts/mk-images.ppc in anaconda, but the most" + echo "*** likely causes of this problem are:" + echo "*** kernel module set on ppc64 grew in size" + echo "*** dependent libraries or programs grew in size" + echo "***" + echo "*** Please contact the anaconda development team for help determining which" + echo "*** component in the distribution is at fault." + echo "***" + exit 1 + fi + + cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz sed -e "s/%BITS%/64/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \ - $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc64/yaboot.conf + $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc64/yaboot.conf
cat << __EOT__ >> $TOPDESTPATH/.treeinfo [images-$KERNELARCH] @@ -56,36 +56,37 @@ kernel = ppc/ppc64/vmlinuz initrd = ppc/ppc64/$RAMDISK __EOT__
- if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then - mkdir -p $TOPDESTPATH/images/netboot - pushd $TOPDESTPATH/ppc/ppc64 - cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc64/zImage.lds - $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc64/vmlinuz no no $TOPDESTPATH/ppc/ppc64/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc64.img - rmdir $TOPDESTPATH/images/netboot || : - rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds - popd - if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then - echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo - fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then - mkdir -p $TOPDESTPATH/images/netboot - $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc64.img \ - -i $TOPDESTPATH/ppc/ppc64/$RAMDISK \ - -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ - $TOPDESTPATH/ppc/ppc64/vmlinuz - rmdir $TOPDESTPATH/images/netboot || : - if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then - echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo - fi - fi - - echo >> $TOPDESTPATH/.treeinfo + if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then + mkdir -p $TOPDESTPATH/images/netboot + pushd $TOPDESTPATH/ppc/ppc64 + cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc64/zImage.lds + $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc64/vmlinuz no no $TOPDESTPATH/ppc/ppc64/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc64.img + rmdir $TOPDESTPATH/images/netboot || : + rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds + popd + + if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then + echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo + fi + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then + mkdir -p $TOPDESTPATH/images/netboot + $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc64.img \ + -i $TOPDESTPATH/ppc/ppc64/$RAMDISK \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ + $TOPDESTPATH/ppc/ppc64/vmlinuz + rmdir $TOPDESTPATH/images/netboot || : + if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then + echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo + fi + fi + + echo >> $TOPDESTPATH/.treeinfo
elif [ "$KERNELARCH" = "ppc" ]; then - FAKEARCH="ppc" - mkdir -p $TOPDESTPATH/ppc/ppc32 - mkdir -p $TOPDESTPATH/ppc/mac + FAKEARCH="ppc" + mkdir -p $TOPDESTPATH/ppc/ppc32 + mkdir -p $TOPDESTPATH/ppc/mac
echo "Building ppc initrd" makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/$RAMDISK \ @@ -95,36 +96,40 @@ __EOT__
cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc32/vmlinuz sed -e "s/%BITS%/32/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \ - $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc32/yaboot.conf + $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc32/yaboot.conf
cat << __EOT__ >> $TOPDESTPATH/.treeinfo [images-$KERNELARCH] kernel = ppc/ppc32/vmlinuz initrd = ppc/ppc32/$RAMDISK __EOT__ - if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then - mkdir -p $TOPDESTPATH/images/netboot - pushd $TOPDESTPATH/ppc/ppc32 - cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc32/zImage.lds - $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc32/vmlinuz no no $TOPDESTPATH/ppc/ppc32/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc32.img - rmdir $TOPDESTPATH/images/netboot || : - rm -f $TOPDESTPATH/ppc/ppc32/zImage.lds - popd - if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then - echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo - fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then - mkdir -p $TOPDESTPATH/images/netboot - $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc32.img \ - -i $TOPDESTPATH/ppc/ppc32/$RAMDISK \ - -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ - $TOPDESTPATH/ppc/ppc32/vmlinuz - rmdir $TOPDESTPATH/images/netboot || : - if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then - echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo - fi - fi - echo >> $TOPDESTPATH/.treeinfo + + if [ -x $IMGPATH/usr/bin/mkzimage -a -r $IMGPATH/usr/share/ppc64-utils/zImage.stub ]; then + mkdir -p $TOPDESTPATH/images/netboot + pushd $TOPDESTPATH/ppc/ppc32 + cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/ppc32/zImage.lds + $IMGPATH/usr/bin/mkzimage $TOPDESTPATH/ppc/ppc32/vmlinuz no no $TOPDESTPATH/ppc/ppc32/$RAMDISK $IMGPATH/usr/share/ppc64-utils/zImage.stub $TOPDESTPATH/images/netboot/ppc32.img + rmdir $TOPDESTPATH/images/netboot || : + rm -f $TOPDESTPATH/ppc/ppc32/zImage.lds + popd + + if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then + echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo + fi + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then + mkdir -p $TOPDESTPATH/images/netboot + $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc32.img \ + -i $TOPDESTPATH/ppc/ppc32/$RAMDISK \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ + $TOPDESTPATH/ppc/ppc32/vmlinuz + rmdir $TOPDESTPATH/images/netboot || : + + if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then + echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo + fi + fi + + echo >> $TOPDESTPATH/.treeinfo
else echo "Unknown kernel arch: $KERNELARCH" @@ -134,19 +139,19 @@ __EOT__ doPostImages() { mkdir -p $TOPDESTPATH/etc mkdir -p $TOPDESTPATH/ppc/chrp - + # Create ofboot.b and bootinfo.txt files, and yaboot binaries for Mac and CHRP cp $BOOTDISKDIR/bootinfo.txt $TOPDESTPATH/ppc/bootinfo.txt cp $IMGPATH/usr/lib/anaconda-runtime/boot/efika.forth $TOPDESTPATH/ppc/efika.forth
if [ -d $TOPDESTPATH/ppc/mac ]; then - cp $BOOTDISKDIR/ofboot.b $TOPDESTPATH/ppc/mac/ofboot.b - cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/mac/yaboot + cp $BOOTDISKDIR/ofboot.b $TOPDESTPATH/ppc/mac/ofboot.b + cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/mac/yaboot fi
if [ -d $TOPDESTPATH/ppc/chrp ]; then - cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp/yaboot - $IMGPATH/usr/lib/yaboot/addnote $TOPDESTPATH/ppc/chrp/yaboot + cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp/yaboot + $IMGPATH/usr/lib/yaboot/addnote $TOPDESTPATH/ppc/chrp/yaboot fi
# IBM firmware can't handle boot scripts properly, so for biarch installs @@ -154,14 +159,14 @@ doPostImages() { if [ -r $TOPDESTPATH/ppc/ppc32/yaboot.conf -a -r $TOPDESTPATH/ppc/ppc64/yaboot.conf ]; then # Both kernels exist. Copy the biarch yaboot.conf into place. sed -e "s/%BITS%/32/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \ - $BOOTDISKDIR/yaboot.conf.3264 > $TOPDESTPATH/etc/yaboot.conf + $BOOTDISKDIR/yaboot.conf.3264 > $TOPDESTPATH/etc/yaboot.conf else - # Copy the one that exists, assuming one does exist - cp $TOPDESTPATH/ppc/ppc??/yaboot.conf $TOPDESTPATH/etc + # Copy the one that exists, assuming one does exist + cp $TOPDESTPATH/ppc/ppc??/yaboot.conf $TOPDESTPATH/etc fi
if [ -z "$BOOTISO" ]; then - return + return fi
# Copy it all into the isopath for the boot CD @@ -170,27 +175,27 @@ doPostImages() {
# We want the ppc32 prep image in the boot.iso too. if [ -d $TOPDESTPATH/images/netboot ]; then - mkdir -p $TOPDESTPATH/isopath/images - cp -r $TOPDESTPATH/images/netboot $TOPDESTPATH/isopath/images - rm -f $TOPDESTPATH/isopath/images/ppc64.img + mkdir -p $TOPDESTPATH/isopath/images + cp -r $TOPDESTPATH/images/netboot $TOPDESTPATH/isopath/images + rm -f $TOPDESTPATH/isopath/images/ppc64.img fi
if [ -r $TOPDESTPATH/isopath/images/netboot/ppc32.img ]; then - PREPBOOT="-prep-boot images/netboot/ppc32.img" + PREPBOOT="-prep-boot images/netboot/ppc32.img" fi
if [ -d $TOPDESTPATH/isopath/ppc/mac ]; then - MACBOOT="-hfs-volid $VERSION -hfs-bless $TOPDESTPATH/isopath/ppc/mac" + MACBOOT="-hfs-volid $VERSION -hfs-bless $TOPDESTPATH/isopath/ppc/mac" fi
# Create the boot.iso mkisofs -o $TOPDESTPATH/images/$BOOTISO -chrp-boot -U $PREPBOOT \ - -part -hfs -T -r -l -J -A "$PRODUCT $VERSION" -sysid PPC \ - -V "PBOOT" -volset "$VERSION" -volset-size 1 -volset-seqno 1 \ - $MACBOOT \ - -map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \ - -no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath \ - images/install.img=$TOPDESTPATH/images/install.img + -part -hfs -T -r -l -J -A "$PRODUCT $VERSION" -sysid PPC \ + -V "PBOOT" -volset "$VERSION" -volset-size 1 -volset-seqno 1 \ + $MACBOOT \ + -map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \ + -no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath \ + images/install.img=$TOPDESTPATH/images/install.img implantisomd5 $TOPDESTPATH/images/$BOOTISO rm -rf $TOPDESTPATH/isopath }