another try, doable results are wanted in ovc & vmx case.
authorLars Vogdt <lrupp@suse.de>
Fri, 8 May 2009 11:56:51 +0000 (11:56 +0000)
committerLars Vogdt <lrupp@suse.de>
Fri, 8 May 2009 11:56:51 +0000 (11:56 +0000)
build

diff --git a/build b/build
index 292f3fd..015577d 100755 (executable)
--- a/build
+++ b/build
@@ -1500,11 +1500,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                     vmx)
                         pushd $BUILD_ROOT/$TOPDIR/KIWI-vmx > /dev/null
                         echo "compressing images... "
-                       if [ -e $imagename.$imagearch-$imageversion.ovf ] ; then
-                          tar cvzfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-ovf.tar.gz \
-                            $imagename.$imagearch-$imageversion.ovf \
-                            $imagename.$imagearch-$imageversion-disk*.vmdk
-                       elif [ -e $imagename.$imagearch-$imageversion.xenconfig ] ; then
+                       if [ -e $imagename.$imagearch-$imageversion.xenconfig ] ; then
                           tar cvzfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-xenvmx.tar.gz \
                             $imagename.$imagearch-$imageversion.raw \
                             $imagename.$imagearch-$imageversion.xenconfig                      
@@ -1512,6 +1508,11 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                           tar cvzfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.gz \
                             $imagename.$imagearch-$imageversion.vmx \
                             $imagename.$imagearch-$imageversion.vmdk
+                         if [ -e $imagename.$imagearch-$imageversion.ovf ] ; then
+                            tar cvzfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-ovf.tar.gz \
+                              $imagename.$imagearch-$imageversion.ovf \
+                              $imagename.$imagearch-$imageversion-disk*.vmdk
+                         fi
                        fi
                        popd > /dev/null
                         ;;