Attachment 152193 Details for Bug 235612 – replacement otheros.bld patch

[patch] replacement otheros.bld patch

anaconda-11.2.0.46-ps3.patch (text/plain), 5.72 KB, created by David Woodhouse on 2007-04-11 02:20:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-11 02:20:14 UTC

Size: 5.72 KB

patch

obsolete

>--- ./scripts/mk-images.ps3	2007-04-10 11:40:57.000000000 -0400
>+++ ./scripts/mk-images	2007-04-10 22:04:12.000000000 -0400
>@@ -61,6 +61,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
>     TREEDIR=$3
>     INSTIMGTEMPLATE=$TREEDIR/image-template
>     IMGPATH=$TREEDIR/instimage
>+    PBOOTPATH=$TREEDIR/petitroot
>     KERNELBASE=$TMPDIR/updboot.kernel.$$
>     MODDEPS=$KERNELBASE/moddeps
>     MODALIAS=$KERNELBASE/modules.alias
>--- ./scripts/mk-images.ppc.ps3	2007-02-20 18:07:21.000000000 -0500
>+++ ./scripts/mk-images.ppc	2007-04-10 22:02:52.000000000 -0400
>@@ -94,10 +94,23 @@ __EOT__
> }
> 
> doPostImages() {
>+    # Create PlayStation 3 'otheros.bld' image. First the petitboot initrd...
>+    if [ -d $PBOOTPATH -a -x $PBOOTPATH/usr/sbin/petitboot ]; then
>+	( cd $PBOOTPATH ; find . | cpio -o --quiet -H newc | gzip -9 ) > $TOPDESTPATH/images/initrd-petitroot.img
>+	if [ -x $IMGPATH/usr/sbin/wrapper ]; then
>+	    mkdir -p $TOPDESTPATH/PS3/otheros
>+	    pushd $TOPDESTPATH/PS3/otheros
>+	    $IMGPATH/usr/sbin/wrapper -D $IMGPATH/usr/share/ppc64-utils/wrapper -p ps3 -i $TOPDESTPATH/images/initrd-petitroot.img $TOPDESTPATH/ppc/ppc64/vmlinuz
>+	    rm zImage*
>+	    popd
>+	    
>+	fi
>+    fi
>+
>     # Create boot.iso here instead of above, so we can include it all
>     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
> 
>@@ -124,7 +137,7 @@ doPostImages() {
> 
>     # Copy it all into the isopath for the boot CD
>     mkdir -p $TOPDESTPATH/isopath
>-    cp -r $TOPDESTPATH/{ppc,etc} $TOPDESTPATH/isopath
>+    cp -r $TOPDESTPATH/{ppc,etc,PS3} $TOPDESTPATH/isopath
> 
>     # We want the ppc32 prep image in the boot.iso too.
>     if [ -d $TOPDESTPATH/images/netboot ]; then
>--- ./scripts/upd-instroot.ps3	2007-04-10 11:25:01.000000000 -0400
>+++ ./scripts/upd-instroot	2007-04-10 22:03:35.000000000 -0400
>@@ -100,10 +100,12 @@ fi
> 
> DEST=$TREEDIR/image-template
> DESTGR=$TREEDIR/instimage
>+DESTPB=$TREEDIR/petitroot
> 
>-rm -rf $DEST $DESTGR
>+rm -rf $DEST $DESTGR $DESTPB
> mkdir -p $DEST
> mkdir -p $DESTGR
>+mkdir -p $DESTPB
> 
> PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
> 	 libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt
>@@ -238,6 +240,13 @@ XORG="$XORGLIBS $XORGDRIVERS $XORGFONTS 
> PACKAGES="$PACKAGES $XORGDRIVERS"
> PACKAGESGR="$PACKAGESGR $XORG"
> 
>+# Packages needed for petitboot image
>+PACKAGESPB="glibc glibc-common busybox-petitboot libselinux petitboot udev libjpeg kexec-tools libsepol zlib libvolume_id"
>+
>+if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
>+    PACKAGESPB="$PACKAGESPB ppc64-utils"
>+fi
>+
> 
> #
> # KEEPFILE is all files to keep from the packages in PACKAGES
>@@ -717,6 +726,7 @@ usr/sbin/ddcprobe
> usr/sbin/fbset
> usr/sbin/prelink
> usr/sbin/smartctl
>+usr/sbin/wrapper
> usr/share/anaconda/*
> usr/share/firstboot/firstboot_module_window*
> usr/share/icons/default/*
>@@ -919,15 +929,47 @@ usr/share/grub/*
> EOF
> fi
> 
>+KEEPFILEPB=${TMPDIR:-/tmp}/keepfilepb.$$
>+cat > $KEEPFILEPB <<EOF
>+lib/ld*.so*
>+$LIBDIR/ld*.so*
>+$LIBDIR/libc[-.]*
>+$LIBDIR/libselinux*
>+$LIBDIR/libsepol*
>+$LIBDIR/libdl*
>+$LIBDIR/libz.so.*
>+$LIBDIR/libvolume_id.so.*
>+lib/udev/*
>+etc/udev/*udev*
>+sbin/udevsettle
>+sbin/udevtrigger
>+sbin/udevd
>+sbin/kexec
>+sbin/other-os-flash-util
>+usr/bin/ps3videomode
>+sbin/boot-game-os
>+sbin/find-other-os-flash
>+usr/sbin/petitboot*
>+usr/sbin/udev-helper
>+usr/sbin/getctty
>+usr/$LIBDIR/libtwin.so.*
>+usr/share/petitboot/artwork/*
>+sbin/busybox.petitboot
>+usr/$LIBDIR/libjpeg.so.*
>+EOF
>+
> echo "Assembling package list..."
> RPMS=$(prunePackageList $PACKAGEDIR "$PACKAGES")
> [ -n "$DEBUG" ] && echo "RPMS are $RPMS"
> RPMSGR=$(prunePackageList $PACKAGEDIR "$PACKAGESGR $PACKAGESRESCUE")
> [ -n "$DEBUG" ] && echo "RPMSGR are $RPMSGR"
>+RPMSPB=$(prunePackageList $PACKAGEDIR "$PACKAGESPB")
>+[ -n "$DEBUG" ] && echo "RPMSPB are $RPMSPB"
> 
> rm -rf $DEST; mkdir -p $DEST/usr/sbin
> rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib $DESTGR/boot
> ln -s /tmp $DESTGR/var/lib/xkb 
>+rm -rf $DESTPB; mkdir -p $DESTPB/sys $DESTPB/var/tmp/petitboot $DESTPB/dev $DESTPB/proc
> 
> #
> # concat KEEPFILEGR and KEEPFILERESCUE lists
>@@ -937,7 +979,7 @@ cat $KEEPFILERESCUE >> $KEEPFILEGR
> #
> # filter paths in keepfile lists for use by cpio
> #
>-for file in $KEEPFILE $KEEPFILEGR; do
>+for file in $KEEPFILE $KEEPFILEGR $KEEPFILEPB; do
>    cat $file | awk '{print $1 "\n./" $1}' > $file-
>    mv -f $file- $file
> done
>@@ -950,6 +992,22 @@ expandPackageSet "$RPMS" $DEST $KEEPFILE
> echo "Expanding graphical packages..."
> expandPackageSet "$RPMSGR" $DESTGR $KEEPFILEGR
> 
>+echo "Expanding petitboot packages..."
>+expandPackageSet "$RPMSPB" $DESTPB $KEEPFILEPB
>+
>+echo "Creating petitboot image..."
>+for a in \[ cat true false sh mount modprobe ls rm mkdir setkeycodes umount ip fdisk dmesg cp mknod echo ; do
>+    ln -sf busybox.petitboot $DESTPB/sbin/$a
>+done
>+ln -sf sbin $DESTPB/bin
>+ln -sf usr/sbin/petitboot-init $DESTPB/init
>+cat > $DESTPB/etc/filesystems <<EOF
>+hfs
>+vfat
>+ext2
>+ext3
>+EOF
>+
> echo "retrieving timezones"
> TZDIR=${TMPDIR:-/tmp}/glibc-timezone-$$
> mkdir -p $TZDIR/usr/share/zoneinfo
>@@ -1132,7 +1190,7 @@ if [ -n "$NEEDGR" ]; then
>     /usr/sbin/chroot $DESTGR /usr/bin/gtk-update-icon-cache -q -f /usr/share/icons/Bluecurve
> fi
> 
>-rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE
>+rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE $KEEPFILEPB
> 
> for p in $DEST $DESTGR; do
> 	echo "Scrubbing trees..." "$p"
>@@ -1198,7 +1256,7 @@ for p in $DEST $DESTGR; do
> 
> 	rm -rf $p/boot $p/home $p/root $p/tmp
> 
>-	find $p -name "*.a" | xargs rm -rf
>+	find $p -name "*.a" | grep -v "usr/share/ppc64-utils" | xargs rm -rf
> 	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

Actions: View | Diff

Attachments on bug 235612: 151924 | 152087 | 152149 | 152193