[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] .treeinfo (add support for images)



On Tue, 2007-02-20 at 17:44 -0500, Will Woods wrote:

> Okay - it's been changed to be non-interactive, and instead just emits
> warning messages if you don't set flags.
> 
> Patch is attached.

As a follow-up, here's a patch for the mk-images scripts that makes them
emit .treeinfo sections describing the images they are writing out. I've
tested it on i386 and it works as expected:


[wwoods kraid ~]$
cat /srv/pungi/f7-test2/6.91/Desktop/i386/os/.treeinfo 
[general]
family = Fedora
timestamp = 1172010898.27
variant = Desktop
totaldiscs = 1
version = 6.91
discnum = 1
packagedir = Fedora
arch = i386

[images-i586]
kernel = images/pxeboot/vmlinuz
initrd = images/pxeboot/initrd.img
boot.iso = images/boot.iso
diskboot.img = images/diskboot.img

[images-xen]
kernel = images/xen/vmlinuz
initrd = images/xen/initrd.img


Could you all look it over and see if it seems useful and reasonable?

Thanks!

-w
diff -Naur --exclude=CVS --exclude='*.swp' --exclude='.#*' anaconda/scripts/mk-images.ia64 anaconda-ww/scripts/mk-images.ia64
--- anaconda/scripts/mk-images.ia64	2007-01-30 16:55:56.000000000 -0500
+++ anaconda-ww/scripts/mk-images.ia64	2007-02-20 17:19:06.000000000 -0500
@@ -142,6 +142,14 @@
 initrd.img - an initrd with support for all install methods and
     drivers supported for installation of $PRODUCT
 EOF
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = images/pxeboot/vmlinuz
+initrd = images/pxeboot/initrd.img
+boot.iso = images/boot.iso
+boot.img = images/boot.img
+
+__EOT__
 
   else # set up the boot stuff for the xen guest kernel
     echo "Building $KERNELARCH guest initrd.img"
@@ -152,5 +160,11 @@
 	--modules "$INITRDMODS"
     [ $? = 0 ] || exit 1
     cp $KERNELROOT/boot/efi/EFI/redhat/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = images/xen/vmlinuz
+initrd = images/xen/initrd.img
+
+__EOT__
   fi
 }
diff -Naur --exclude=CVS --exclude='*.swp' --exclude='.#*' anaconda/scripts/mk-images.ppc anaconda-ww/scripts/mk-images.ppc
--- anaconda/scripts/mk-images.ppc	2006-06-14 11:46:16.000000000 -0400
+++ anaconda-ww/scripts/mk-images.ppc	2007-02-20 17:11:15.000000000 -0500
@@ -14,6 +14,12 @@
         sed -e "s/%BITS%/64/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \
 	    $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc64/yaboot.conf
 
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = ppc/ppc64/vmlinuz
+initrd = ppc/ppc64/ramdisk.image.gz
+__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
@@ -22,7 +28,9 @@
 		rmdir $TOPDESTPATH/images/netboot || :
 		rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds
 		popd
+        echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo
 	fi
+    echo >> $TOPDESTPATH/.treeinfo
 
 
     elif [ "$KERNELARCH" = "ppc64iseries" ]; then
@@ -42,6 +50,12 @@
 	$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
 
+    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
@@ -57,6 +71,11 @@
         sed -e "s/%BITS%/32/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \
 	    $BOOTDISKDIR/yaboot.conf.in > $TOPDESTPATH/ppc/ppc32/yaboot.conf
 
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = ppc/ppc32/vmlinuz
+initrd = ppc/ppc32/ramdisk.image.gz
+__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
@@ -65,7 +84,9 @@
 		rmdir $TOPDESTPATH/images/netboot || :
 		rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds
 		popd
+        echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo
 	fi
+    echo >> $TOPDESTPATH/.treeinfo
 
     else
         echo "Unknown kernel arch: $KERNELARCH"
diff -Naur --exclude=CVS --exclude='*.swp' --exclude='.#*' anaconda/scripts/mk-images.s390 anaconda-ww/scripts/mk-images.s390
--- anaconda/scripts/mk-images.s390	2006-09-11 14:22:34.000000000 -0400
+++ anaconda-ww/scripts/mk-images.s390	2007-02-20 17:21:45.000000000 -0500
@@ -14,4 +14,13 @@
 
 	cp -v $BOOTDISKDIR/generic.prm $TOPDESTPATH/images/generic.prm
 	cp -v $BOOTDISKDIR/generic.ins $TOPDESTPATH/generic.ins
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = images/kernel.img
+initrd = images/initrd.img
+initrd.size = images/initrd.size
+generic.prm = images/generic.prm
+generic.ins = generic.ins
+
+__EOT__
 }
diff -Naur --exclude=CVS --exclude='*.swp' --exclude='.#*' anaconda/scripts/mk-images.x86 anaconda-ww/scripts/mk-images.x86
--- anaconda/scripts/mk-images.x86	2007-01-19 14:52:57.000000000 -0500
+++ anaconda-ww/scripts/mk-images.x86	2007-02-16 17:15:38.000000000 -0500
@@ -128,6 +128,14 @@
 initrd.img - an initrd with support for all install methods and
     drivers supported for installation of $PRODUCT
 EOF
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-$KERNELARCH]
+kernel = images/pxeboot/vmlinuz
+initrd = images/pxeboot/initrd.img
+boot.iso = images/boot.iso
+diskboot.img = images/diskboot.img
+
+__EOT__
   else # set up the boot stuff for the xen guest kernel
     echo "Building $KERNELARCH guest initrd.img"
     mkdir -p $TOPDESTPATH/images/xen
@@ -137,5 +145,11 @@
 	--modules "$INITRDMODS"
     [ $? = 0 ] || exit 1
     cp $KERNELROOT/boot/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
+    cat << __EOT__ >> $TOPDESTPATH/.treeinfo
+[images-xen]
+kernel = images/xen/vmlinuz
+initrd = images/xen/initrd.img
+
+__EOT__
   fi
 }

Attachment: signature.asc
Description: This is a digitally signed message part


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]