diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-04 16:58:44 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-12-04 16:59:31 -0500 |
| commit | fede6a5d068c5261ac26b2c3d26f8d15daa500e6 (patch) | |
| tree | 9c2fdcc8685ca4df96c6740e696206e4b0569ba4 | |
| parent | 02a9016bf5ea3c202f5fcad2da53699f05e27c6f (diff) | |
| download | anaconda-fede6a5d068c5261ac26b2c3d26f8d15daa500e6.tar.gz anaconda-fede6a5d068c5261ac26b2c3d26f8d15daa500e6.tar.xz anaconda-fede6a5d068c5261ac26b2c3d26f8d15daa500e6.zip | |
Update mk-images.ppc for new zImage wrapper (#409691)
| -rw-r--r-- | scripts/mk-images.ppc | 49 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 9 |
2 files changed, 32 insertions, 26 deletions
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 99afd7e38..8c50dc55f 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -8,7 +8,7 @@ makeBootImages() { makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ --initrdsize 8192 \ --loaderbin loader \ - --modules "$INITRDMODS spufs" + --modules "$INITRDMODS spufs viocd gpio_mdio" cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz sed -e "s/%BITS%/64/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \ @@ -29,33 +29,26 @@ __EOT__ rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds popd echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib/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.image.gz \ + -D $IMGPATH/usr/lib/kernel-wrapper \ + $TOPDESTPATH/ppc/ppc64/vmlinuz + rmdir $TOPDESTPATH/images/netboot || : + echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo + fi + if [ -x $IMGPATH/usr/sbin/addRamDisk ]; then + mkdir -p $TOPDESTPATH/images/iSeries + $IMGPATH/usr/sbin/addRamDisk $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ + $TOPDESTPATH/ppc/ppc64/vmlinuz \ + $TOPDESTPATH/images/iSeries/boot.img + rmdir $TOPDESTPATH/images/iSeries || : fi - echo >> $TOPDESTPATH/.treeinfo - - - elif [ "$KERNELARCH" = "ppc64iseries" ]; then - mkdir -p $TOPDESTPATH/ppc/iSeries - mkdir -p $TOPDESTPATH/images/iSeries - - echo "Building iSeries initrd" - makeinitrd --initrdto $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz \ - --initrdsize 8192 \ - --loaderbin loader \ - --modules "$INITRDMODS viocd" - - cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/iSeries/vmlinux - cp $KERNELROOT/boot/System.map-* $TOPDESTPATH/ppc/iSeries/System.map - $IMGPATH/usr/sbin/addSystemMap $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux $TOPDESTPATH/ppc/iSeries/vmlinux.sm - $IMGPATH/usr/sbin/addRamDisk $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux.sm $TOPDESTPATH/images/iSeries/boot.img - rm -f $TOPDESTPATH/ppc/iSeries/vmlinux.sm + echo >> $TOPDESTPATH/.treeinfo - cat << __EOT__ >> $TOPDESTPATH/.treeinfo -[images-$KERNELARCH] -kernel = ppc/iSeries/vmlinux -initrd = ppc/iSeries/ramdisk.image.gz -__EOT__ elif [ "$KERNELARCH" = "ppc" ]; then FAKEARCH="ppc" mkdir -p $TOPDESTPATH/ppc/ppc32 @@ -85,6 +78,14 @@ __EOT__ rm -f $TOPDESTPATH/ppc/ppc32/zImage.lds popd echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib/kernel-wrapper/wrapper.a ]; then + $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc32.img \ + -i $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \ + -D $IMGPATH/usr/lib/kernel-wrapper \ + $TOPDESTPATH/ppc/ppc32/vmlinuz + rmdir $TOPDESTPATH/images/netboot || : + popd + echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo fi echo >> $TOPDESTPATH/.treeinfo diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 34117da80..61c391d82 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -632,8 +632,6 @@ etc/fonts etc/prelink.conf etc/rpm/macros.prelink $LIBDIR/bdevid -sbin/addRamDisk -sbin/addSystemMap sbin/debugfs sbin/e2fsck sbin/e2label @@ -701,8 +699,11 @@ usr/$LIBDIR/python?.?/site-packages/gtk*/gtk usr/$LIBDIR/python?.?/site-packages/gtk* usr/$LIBDIR/rpm/rpmpopt usr/lib/syslinux +usr/lib/kernel-wrapper boot/efika.forth usr/lib/yaboot +usr/sbin/addRamDisk +usr/sbin/wrapper usr/sbin/chroot usr/sbin/ddcprobe usr/sbin/fbset @@ -1172,7 +1173,11 @@ for p in $DEST $DESTGR; do rm -rf $p/boot $p/home $p/root $p/tmp + # I wish I knew how to drive find. + mv $p/usr/lib/kernel-wrapper/wrapper.a $p/usr/lib/kernel-wrapper/wrapper.nota find $p -name "*.a" | xargs rm -rf + mv $p/usr/lib/kernel-wrapper/wrapper.nota $p/usr/lib/kernel-wrapper/wrapper.a + find $p -name "lib*.la" |grep -v "usr/$LIBDIR/gtk-2.0" | xargs rm -rf for f in newt popt rpm rpmio; do rm -f $p/usr/$LIBDIR/lib$f.so |