Generate .treeinfo files in the mk-images* scripts.

4 files changed, 58 insertions, 0 deletions

diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 0705e3f6b..d8d877361 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -142,6 +142,14 @@ vmlinuz - the kernel used for the installer
 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 @@ EOF
 	--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 --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 7d338baee..c085cc098 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -14,6 +14,12 @@ makeBootImages() {
         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 @@ makeBootImages() {
 		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 @@ makeBootImages() {
 	$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 @@ makeBootImages() {
         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 @@ makeBootImages() {
 		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 --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index eedfc585b..f9052be5a 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -14,4 +14,13 @@ makeBootImages() {
 
 	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 --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 6c2935fe2..03484509e 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -128,6 +128,14 @@ vmlinuz - the kernel used for the installer
 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 @@ EOF
 	--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
 }