Attachment 152087 Details for Bug 235612 – Build otheros.bld

[patch] Build otheros.bld

anaconda-11.2.0.46-ps3.patch (text/plain), 8.94 KB, created by David Woodhouse on 2007-04-10 05:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-10 05:00:10 UTC

Size: 8.94 KB

patch

obsolete

>? anaconda-generate-petitboot-root.patch
>? fish
>Index: scripts/buildinstall
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/buildinstall,v
>retrieving revision 1.70
>diff -u -p -r1.70 buildinstall
>--- scripts/buildinstall	7 Mar 2007 22:51:22 -0000	1.70
>+++ scripts/buildinstall	10 Apr 2007 04:41:20 -0000
>@@ -140,7 +140,7 @@ MK_STAMP=$BUILDINSTDIR/makestamp.py
> BUILDINSTALL=$BUILDINSTDIR/buildinstall
> 
> echo "Building images..."
>-$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
>+$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage $TREEDIR/petitboot
> 
> if [ -n "$PKGORDER" ]; then
>     echo "Getting package order..."
>@@ -152,9 +152,9 @@ echo "Writing .treeinfo file..."
> $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --packagedir=${PKGDIR#$p/} --outfile=$p/.treeinfo
> 
> echo "Making images..."
>-$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
>+$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $TREEDIR/petitboot $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
> 
> echo "Writing .discinfo file"
> $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo
> 
>-rm -rf $TREEDIR/image-template $TREEDIR/instimage $BUILDINSTDIR
>+rm -rf $TREEDIR/image-template $TREEDIR/instimage $TREEDIR/petitboot $BUILDINSTDIR
>Index: scripts/mk-images
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/mk-images,v
>retrieving revision 1.233
>diff -u -p -r1.233 mk-images
>--- scripts/mk-images	3 Apr 2007 19:21:29 -0000	1.233
>+++ scripts/mk-images	10 Apr 2007 04:41:20 -0000
>@@ -6,7 +6,7 @@ IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i
> TMPDIR=${TMPDIR:-/tmp}
> 
> usage () {
>-	echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
>+	echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <pbootdir> <buildarch> <productname> <version> [<productpath>]"
>     exit 0
> }
> 
>@@ -22,13 +22,13 @@ if [ "$1" == "--nogr" ]; then
>     shift
> fi
> 
>-if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" -o -z "$8" ]; then usage; fi
>+if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" -o -z "$8" -o -z "$9" ]; then usage; fi
> 
>-PRODUCT=$6
>-VERSION=$7
>-PRODUCTPATH=$8
>-if [ -n "$9" ]; then
>-    BUGURL=$9
>+PRODUCT=$7
>+VERSION=$8
>+PRODUCTPATH=$9
>+if [ -n "$10" ]; then
>+    BUGURL=$10
> fi
> 
> TOPDIR=$(echo $0 | sed "s,/[^/]*$,,")
>@@ -63,7 +63,8 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
>     KERNELBASE=$TMPDIR/updboot.kernel.$$
>     MODDEPS=$KERNELBASE/moddeps
>     MODALIAS=$KERNELBASE/modules.alias
>-    BUILDARCH=$5
>+    PBOOTPATH=$5
>+    BUILDARCH=$6
> 
>     KERNELNAME=vmlinuz
> 
>Index: scripts/mk-images.ppc
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/mk-images.ppc,v
>retrieving revision 1.40
>diff -u -p -r1.40 mk-images.ppc
>--- scripts/mk-images.ppc	20 Feb 2007 23:07:21 -0000	1.40
>+++ scripts/mk-images.ppc	10 Apr 2007 04:41:20 -0000
>@@ -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
>Index: scripts/upd-instroot
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/upd-instroot,v
>retrieving revision 1.544
>diff -u -p -r1.544 upd-instroot
>--- scripts/upd-instroot	23 Mar 2007 14:26:10 -0000	1.544
>+++ scripts/upd-instroot	10 Apr 2007 04:41:20 -0000
>@@ -16,7 +16,7 @@ fi
> 
> if [ -z "$1" ]; then
> 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
>-	echo "usage:        $0 <packagedir> [templatedir] [instroot]"
>+	echo "usage:        $0 <packagedir> [templatedir] [instroot] [petitroot]"
> 	exit 1
> fi
> 
>@@ -104,9 +104,16 @@ else
>     DESTGR=$3
> fi
> 
>+if [ -z "$4" ]; then
>+    DESTPB=${TMPDIR:-/tmp}/upd-petitroot
>+else
>+    DESTPB=$4
>+fi
>+
> rm -rf $DEST $DESTGR
> 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
>@@ -241,6 +248,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
>@@ -720,6 +734,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/*
>@@ -922,15 +937,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
>@@ -940,7 +987,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
>@@ -953,6 +1000,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
>@@ -1135,7 +1198,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"
>@@ -1201,7 +1264,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