diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-03-04 00:07:45 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-03-04 00:07:45 +0000 |
| commit | 8a642de9807c236fa36db3eeae4e48a3439be831 (patch) | |
| tree | 6a14192444eec541beb93ad457ce440af35e1c89 | |
| parent | b70651a7120f62b0b53887149c7d6d910eed6684 (diff) | |
| download | anaconda-8a642de9807c236fa36db3eeae4e48a3439be831.tar.gz anaconda-8a642de9807c236fa36db3eeae4e48a3439be831.tar.xz anaconda-8a642de9807c236fa36db3eeae4e48a3439be831.zip | |
more vmlinux -> vmlinuz munging, only make the netboot image if we can, make sure dirs are created
| -rw-r--r-- | bootdisk/ppc/yaboot.conf.mac | 2 | ||||
| -rw-r--r-- | bootdisk/ppc/yaboot.conf.pseries | 2 | ||||
| -rw-r--r-- | scripts/mk-images.ppc | 21 |
3 files changed, 13 insertions, 12 deletions
diff --git a/bootdisk/ppc/yaboot.conf.mac b/bootdisk/ppc/yaboot.conf.mac index b2ebc749b..d97912595 100644 --- a/bootdisk/ppc/yaboot.conf.mac +++ b/bootdisk/ppc/yaboot.conf.mac @@ -2,7 +2,7 @@ init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n" timeout=6000 enablecdboot -image=cd:,/ppc/mac/vmlinux +image=cd:,/ppc/mac/vmlinuz label=mac initrd=cd:,/ppc/mac/ramdisk.image.gz append="maxcpus=1 ramdisk_size=8192" diff --git a/bootdisk/ppc/yaboot.conf.pseries b/bootdisk/ppc/yaboot.conf.pseries index 4ac99a75a..6d483cb8b 100644 --- a/bootdisk/ppc/yaboot.conf.pseries +++ b/bootdisk/ppc/yaboot.conf.pseries @@ -2,7 +2,7 @@ init-message = "\nWelcome!\nHit <TAB> for boot options.\n\n" timeout=6000 default=linux -image=ppc/chrp/vmlinux +image=ppc/chrp/vmlinuz label=linux initrd=ppc/chrp/ramdisk.image.gz append="maxcpus=1" diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 54cf46bb7..5a6e8ec27 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -30,18 +30,20 @@ makeBootImages() { --loaderbin loader \ --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES $USBMODULES =scsi =net" - mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp - cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/chrp/vmlinux + mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp $TOPDESTPATH/images/pseries + cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/chrp/vmlinuz cp $BOOTDISKDIR/yaboot.conf.pseries $TOPDESTPATH/etc/yaboot.conf cp $BOOTDISKDIR/bootinfo.txt $TOPDESTPATH/ppc/bootinfo.txt cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp $IMGPATH/usr/lib/yaboot/addnote $TOPDESTPATH/ppc/chrp/yaboot - pushd $TOPDESTPATH/ppc/chrp - cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/chrp/zImage.lds - $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/images/pseries/netboot.img $TOPDESTPATH/ppc/chrp/ramdisk.image.gz - rm -f $TOPDESTPATH/ppc/chrp/zImage.lds - popd + if [ -x $IMGPATH/usr/bin/mkzimage ]; then + pushd $TOPDESTPATH/ppc/chrp + cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/chrp/zImage.lds + $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/images/pseries/netboot.img $TOPDESTPATH/ppc/chrp/ramdisk.image.gz + rm -f $TOPDESTPATH/ppc/chrp/zImage.lds + popd + fi # we also want to make a boot.iso here mkdir -p $TOPDESTPATH/isopath/ppc/chrp $TOPDESTPATH/isopath/etc @@ -80,7 +82,7 @@ EOF rm -f $TOPDESTPATH/ppc/iSeries/vmlinux.sm elif [ "$KERNELARCH" = "ppc" ]; then FAKEARCH="ppc" - mkdir -p $TOPDESTPATH/ppc/mac + mkdir -p $TOPDESTPATH/ppc/mac $TOPDESTPATH/images/mac echo "Building ppc initrd" makeinitrd --initrdto $TOPDESTPATH/ppc/mac/ramdisk.image.gz \ @@ -89,7 +91,7 @@ EOF --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES =scsi =net" mkdir -p $TOPDESTPATH/ppc/mac - cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/mac/vmlinux + cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/mac/vmlinuz cp $BOOTDISKDIR/yaboot.conf.mac $TOPDESTPATH/ppc/mac/yaboot.conf cp $BOOTDISKDIR/ofboot.b $TOPDESTPATH/ppc/mac/ofboot.b cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/mac/ @@ -99,7 +101,6 @@ EOF cp $TOPDESTPATH/ppc/mac/* $TOPDESTPATH/isopath/ppc/mac/ # Create the boot.iso - mkdir -p $TOPDESTPATH/images/mac/ mkisofs -o $TOPDESTPATH/images/mac/boot.iso -part -hfs -T -r -l -J -A "$PRODUCT $VERSION" -sysid PPC -V "PBOOT" -volset "$VERSION" -volset-size 2 -volset-seqno 1 -hfs-volid "$VERSION" -hfs-bless "$TOPDESTPATH/isopath/ppc/mac" -map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic -no-desktop -allow-multidot $TOPDESTPATH/isopath rm -rf $TOPDESTPATH/isopath/ else |