From: Ruediger Oertel <ro@Fatou.suse.de>
Date: Wed, 10 Feb 2010 15:45:30 +0000 (+0100)
Subject: cleanup build_kiwi.sh (step 2 from ro)
X-Git-Tag: obs_2.0~89^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c47e12e9b899374e502a1de45f6c2097e0c942f;p=platform%2Fupstream%2Fbuild.git

cleanup build_kiwi.sh (step 2 from ro)
---

diff --git a/build_kiwi.sh b/build_kiwi.sh
index 30666a6..fd0a90b 100644
--- a/build_kiwi.sh
+++ b/build_kiwi.sh
@@ -117,87 +117,110 @@ run_kiwi()
 	  if test -n "$RELEASE"; then
 	    buildnum="-Build$RELEASE"
 	fi
+	imageout="$imagename.$imagearch-$imageversion"
 	for imgtype in $imagetype ; do
 	    case "$imgtype" in
 		oem)
-		    echo "compressing oem images... "
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI-oem && tar cvjfS /$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2 \
-			--exclude=$imagename.$imagearch-$imageversion.iso \
-			--exclude=$imagename.$imagearch-$imageversion.raw \
-			*" || cleanup_and_exit 1
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI/ && sha256sum $imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2 \
-			> \"$imagename.$imagearch-$imageversion$buildnum-raw.tar.bz2.sha256\"" || cleanup_and_exit 1
-		    if [ -e $imagename.$imagearch-$imageversion.iso ]; then
-		      echo "take iso file and create sha256..."
-		      mv $imagename.$imagearch-$imageversion.iso \
-			 $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum.iso || cleanup_and_exit 1
-		      chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI&& sha256sum $imagename.$imagearch-$imageversion$buildnum.iso \
-			     > \"$imagename.$imagearch-$imageversion$buildnum.iso.sha256\"" || cleanup_and_exit 1
-		    fi
-		    if [ -e $imagename.$imagearch-$imageversion.raw ]; then
-		      mv $imagename.$imagearch-$imageversion.raw \
-			 $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum.raw || cleanup_and_exit 1
-		      echo "bzip2 raw file..."
-		      chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI && bzip2 $imagename.$imagearch-$imageversion$buildnum.raw && \
-		      echo 'Create sha256 file...' && \
-		      sha256sum $imagename.$imagearch-$imageversion$buildnum.raw.bz2 \
-			     > \"$imagename.$imagearch-$imageversion$buildnum.raw.bz2.sha256\"" || cleanup_and_exit 1
-		    fi
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+echo "compressing oem images... "
+cd /$TOPDIR/KIWI-oem
+tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-raw.tar.bz2" \
+	--exclude="$imageout.iso" --exclude="$imageout.raw" *
+
+cd /$TOPDIR/KIWI
+sha256sum "$imageout$buildnum-raw.tar.bz2" > "$imageout$buildnum-raw.tar.bz2.sha256"
+
+if [ -e "$imageout.iso" ]; then
+	echo "take iso file and create sha256..."
+	mv "$imageout.iso" "/$TOPDIR/KIWI/$imageout$buildnum.iso"
+	sha256sum "$imageout$buildnum.iso" > "$imageout$buildnum.iso.sha256"
+fi
+
+if [ -e "$imageout.raw" ]; then
+	mv "$imageout.raw" "/$TOPDIR/KIWI/$imageout$buildnum.raw"
+	echo "bzip2 raw file..."
+	bzip2 "$imageout$buildnum.raw" && \
+	echo 'Create sha256 file...' && \
+	sha256sum "$imageout$buildnum.raw.bz2" > "$imageout$buildnum.raw.bz2.sha256"
+fi
+EOF
+		    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+		    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 		vmx)
-		    pushd $BUILD_ROOT/$TOPDIR/KIWI-vmx > /dev/null
-		    echo "compressing vmx images... "
-		    # This option has a number of format parameters
-		    FILES=""
-		    for i in $imagename.$imagearch-$imageversion.vmx $imagename.$imagearch-$imageversion.vmdk $imagename.$imagearch-$imageversion.ovf \
-		    	 $imagename.$imagearch-$imageversion-disk*.vmdk $imagename.$imagearch-$imageversion.xenconfig; do
-		    	ls $i >& /dev/null && FILES="$FILES $i"
-		    done
-		    # kiwi is not removing the .rar file, if a different output format is defined. Do not include it by default.
-		    [ -z "$FILES" ] && FILES="$imagename.$imagearch-$imageversion.raw"
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI/ && tar cvjfS $imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \
-		    	$FILES" || cleanup_and_exit 1
-		    echo "Create sha256 file..."
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI/ && sha256sum $imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \
-			     > \"$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2.sha256\"" || cleanup_and_exit 1
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+echo "compressing vmx images... "
+cd /$TOPDIR/KIWI-vmx
+# This option has a number of format parameters
+FILES=""
+for i in "$imageout.vmx" "$imageout.vmdk" "$imageout.ovf" "$imageout-disk*.vmdk" "$imageout.xenconfig" ; do
+	ls \$i >& /dev/null && FILES="\$FILES \$i"
+done
+# kiwi is not removing the .rar file, if a different output format is defined. Do not include it by default.
+[ -z "\$FILES" ] && FILES="$imageout.raw"
+
+cd /$TOPDIR/KIWI
+tar cvjfS "$imageout$buildnum-vmx.tar.bz2" \$FILES
+echo "Create sha256 file..."
+sha256sum "$imageout$buildnum-vmx.tar.bz2" > "$imageout$buildnum-vmx.tar.bz2.sha256"
+EOF
+                    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+                    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 		xen)
-		    echo "compressing xen images... "
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI-xen && tar cvjfS /$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
-		    echo "Create sha256 file..."
-		    chroot $BUILD_ROOT su -c "cd $TOPDIR/KIWI/ && sha256sum $imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2 \
-			     > "$imagename.$imagearch-$imageversion$buildnum-xen.tar.bz2.sha256" || cleanup_and_exit 1
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+echo "compressing xen images... "
+cd /$TOPDIR/KIWI-xen
+tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-xen.tar.bz2" \
+	`grep ^kernel $imageout.xenconfig | cut -d'"'  -f2` \
+	`grep ^ramdisk $imageout.xenconfig | cut -d'"'  -f2` \
+	"$imageout.xenconfig" \
+	"$imageout"
+echo "Create sha256 file..."
+cd $TOPDIR/KIWI
+sha256sum "$imageout$buildnum-xen.tar.bz2" > "$imageout$buildnum-xen.tar.bz2.sha256"
+EOF
+                    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+                    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 		pxe)
-		    echo "compressing pxe images... "
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI-pxe && tar cvjfS /$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2 \
-				$imagename.$imagearch-$imageversion* \
-				initrd-*" || cleanup_and_exit 1
-		    echo "Create sha256 file..."
-		    chroot $BUILD_ROOT su -c "cd $TOPDIR/KIWI/ && sha256sum $imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2 \
-			     > \"$imagename.$imagearch-$imageversion$buildnum-pxe.tar.bz2.sha256\"" || cleanup_and_exit 1
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+echo "compressing pxe images... "
+cd /$TOPDIR/KIWI-pxe
+tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-pxe.tar.bz2" "$imageout"* initrd-*"
+echo "Create sha256 file..."
+cd $TOPDIR/KIWI
+sha256sum "$imageout$buildnum-pxe.tar.bz2" > "$imageout$buildnum-pxe.tar.bz2.sha256"
+EOF
+                    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+                    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 		iso)
-		    pushd $BUILD_ROOT/$TOPDIR/KIWI-iso > /dev/null
-		    echo "creating sha256 sum for iso images... "
-		    for i in *.iso; do
-			mv $BUILD_ROOT/$TOPDIR/KIWI-iso/$i $BUILD_ROOT/$TOPDIR/KIWI/${i%.iso}$buildnum.iso || cleanup_and_exit 1
-			chroot $BUILD_ROOT su -c "cd $TOPDIR/KIWI/ && sha256sum ${i%.iso}$buildnum.iso > ${i%.iso}$buildnum.iso.sha256" || cleanup_and_exit 1
-		    done
-		    popd > /dev/null
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+cd /$TOPDIR/KIWI-iso
+for i in *.iso; do
+	mv "\$i" "/$TOPDIR/KIWI/\${i%.iso}$buildnum.iso"
+done
+echo "creating sha256 sum for iso images... "
+cd $TOPDIR/KIWI
+for i in *.iso; do
+	sha256sum "\$i" > "\$i.sha256"
+done
+EOF
+                    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+                    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 		*)
-		    echo "compressing unkown images... "
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI-$imgtype && tar cvjfS /$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2 \
-			*" || cleanup_and_exit 1
-		    echo "Create sha256 file..."
-		    chroot $BUILD_ROOT su -c "cd /$TOPDIR/KIWI && sha256sum $imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2 \
-			> $imagename.$imagearch-$imageversion$buildnum-$imgtype.tar.bz2.sha256" || cleanup_and_exit 1
+		    cat > $BUILD_ROOT/kiwi_post.sh << EOF
+echo "compressing unkown images... "
+cd /$TOPDIR/KIWI-$imgtype
+tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-$imgtype.tar.bz2" *
+echo "Create sha256 file..."
+cd /$TOPDIR/KIWI
+sha256sum "$imageout$buildnum-$imgtype.tar.bz2" > "$imageout$buildnum-$imgtype.tar.bz2.sha256"
+EOF
+                    chroot $BUILD_ROOT su -c "sh -e -x /kiwi_post.sh" || cleanup_and_exit 1
+                    rm -f $BUILD_ROOT/kiwi_post.sh
 		    ;;
 	    esac
 	done