From 0bdec1c864474211b00d558a8a88d20b3ba6df55 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Sun, 17 Jan 2010 09:47:10 +0100
Subject: [PATCH] fix missing places, where no .md5 file got generated for kiwi
 images

---
 build_kiwi.sh | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/build_kiwi.sh b/build_kiwi.sh
index 82ca68c..d2ba624 100644
--- a/build_kiwi.sh
+++ b/build_kiwi.sh
@@ -123,9 +123,11 @@ run_kiwi()
 			    pushd $BUILD_ROOT/$TOPDIR/KIWI-oem > /dev/null
 		    echo "compressing images... "
 		    tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2 \
-		      --exclude=$imagename.$imagearch-$imageversion.iso \
-		      --exclude=$imagename.$imagearch-$imageversion.raw \
-		      * || cleanup_and_exit 1
+			--exclude=$imagename.$imagearch-$imageversion.iso \
+			--exclude=$imagename.$imagearch-$imageversion.raw \
+			* || cleanup_and_exit 1
+		    md5sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2 \
+			> "$BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2.md5" || cleanup_and_exit 1
 		    if [ -e $imagename.$imagearch-$imageversion.iso ]; then
 		      echo "Copy iso file and create md5..."
 		      mv $imagename.$imagearch-$imageversion.iso \
@@ -158,42 +160,50 @@ run_kiwi()
 		    done
 		    tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \
 		    	$FILES || cleanup_and_exit 1
+		    md5sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \
+			     > "$BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2.md5" || cleanup_and_exit 1
 		    popd > /dev/null
 		    ;;
 		xen)
 		    pushd $BUILD_ROOT/$TOPDIR/KIWI-xen > /dev/null
 		    echo "compressing images... "
 		    tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2 \
-		      `grep ^kernel $imagename.$imagearch-$imageversion.xenconfig | cut -d'"'  -f2` \
-		      `grep ^ramdisk $imagename.$imagearch-$imageversion.xenconfig | cut -d'"'  -f2` \
-		      $imagename.$imagearch-$imageversion.xenconfig \
-		      $imagename.$imagearch-$imageversion || cleanup_and_exit 1
-			    popd > /dev/null
+			`grep ^kernel $imagename.$imagearch-$imageversion.xenconfig | cut -d'"'  -f2` \
+			`grep ^ramdisk $imagename.$imagearch-$imageversion.xenconfig | cut -d'"'  -f2` \
+			$imagename.$imagearch-$imageversion.xenconfig \
+			$imagename.$imagearch-$imageversion || cleanup_and_exit 1
+		    popd > /dev/null
+		    md5sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2 \
+			     > "$BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2.md5" || cleanup_and_exit 1
 		    ;;
 		pxe)
 		    pushd $BUILD_ROOT/$TOPDIR/KIWI-pxe > /dev/null
 		    echo "compressing images... "
 		    tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2 \
-		      $imagename.$imagearch-$imageversion* \
-		      initrd-* || cleanup_and_exit 1
-			    popd > /dev/null
+				$imagename.$imagearch-$imageversion* \
+				initrd-* || cleanup_and_exit 1
+		    popd > /dev/null
+		    md5sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2 \
+			     > "$BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2.md5" || cleanup_and_exit 1
 		    ;;
 		iso)
 		    pushd $BUILD_ROOT/$TOPDIR/KIWI-iso > /dev/null
 		    echo "creating md5 sum for iso images... "
-			for i in *.iso; do
-		      pushd $BUILD_ROOT/$TOPDIR/KIWI/ > /dev/null
-			    mv $BUILD_ROOT/$TOPDIR/KIWI-iso/$i ${i%.iso}$buildnum.iso || cleanup_and_exit 1
-			    md5sum ${i%.iso}$buildnum.iso > ${i%.iso}$buildnum.iso.md5 || cleanup_and_exit 1
-			      popd > /dev/null
+		    for i in *.iso; do
+			pushd $BUILD_ROOT/$TOPDIR/KIWI/ > /dev/null
+			mv $BUILD_ROOT/$TOPDIR/KIWI-iso/$i ${i%.iso}$buildnum.iso || cleanup_and_exit 1
+			md5sum ${i%.iso}$buildnum.iso > ${i%.iso}$buildnum.iso.md5 || cleanup_and_exit 1
+			popd > /dev/null
 		    done
-			    popd > /dev/null
+		    popd > /dev/null
 		    ;;
 		*)
 		    pushd $BUILD_ROOT/$TOPDIR/KIWI-$imgtype > /dev/null
 		    echo "compressing unkown images... "
 		    tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2 \
-		      * || cleanup_and_exit 1
+			* || cleanup_and_exit 1
+		    md5sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2 \
+			> $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2.md5 || cleanup_and_exit 1
 			    popd > /dev/null
 		    ;;
 	    esac
-- 
2.7.4