Hello community,

here is the log from the commit of package kiwi for openSUSE:Factory checked in 
at 2012-03-20 11:28:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
 and      /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kiwi", Maintainer is "m...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes        2012-03-09 
21:22:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes   2012-03-20 
11:30:01.000000000 +0100
@@ -1,0 +2,66 @@
+Fri Mar 16 14:27:06 CET 2012 - m...@suse.de
+
+- v5.02.19 released
+  
+-------------------------------------------------------------------
+Fri Mar 16 13:59:52 CET 2012 - m...@suse.de
+  
+- fixed order of files in an ova tar archive per spec
+  in http://www.vmware.com/pdf/ovf_spec_draft.pdf (bnc #752581)
+  
+-------------------------------------------------------------------
+Fri Mar 16 13:55:01 CET 2012 - m...@suse.de
+  
+- fixed malformed ovf file. the Envelope properties
+  xmlns:rasd and xmlns:vssd are split in two lines with
+  an extra quote (") (bnc #752580)
+  
+-------------------------------------------------------------------
+Thu Mar 15 15:23:15 CET 2012 - m...@suse.de
+  
+- make split building more robust. the read-only partition size
+  will be a bit bigger than the actual read-only filesystem image
+  to be sure it fits into the partition. Due to the alignment this
+  was required and costs a few bytes
+  
+-------------------------------------------------------------------
+Thu Mar 15 11:02:28 CET 2012 - m...@suse.de
+  
+- make sure kernelCheck() initializes list of kernels if empty (bnc #752259)
+  
+-------------------------------------------------------------------
+Wed Mar 14 11:17:59 CET 2012 - m...@suse.de
+  
+- don't remove libbz2 from isoboot boot images for SLE11
+  
+-------------------------------------------------------------------
+Wed Mar 14 10:30:27 CET 2012 - m...@suse.de
+  
+- fixed removePackages() function
+  * make sure rpmLibs() is called prior to rpm. if all packages
+    are installed by bootstrap only this is required
+  * make sure to check for empty $final variable
+    
+-------------------------------------------------------------------
+Wed Mar 14 09:54:57 CET 2012 - m...@suse.de
+    
+- added ovf format example to examples/suse-12.1/suse-vm-guest
+  
+-------------------------------------------------------------------
+Wed Mar 14 09:40:39 CET 2012 - m...@suse.de
+  
+- better warning message about required machine section data
+  
+-------------------------------------------------------------------
+Tue Mar 13 09:02:57 CET 2012 - rjsch...@suse.de
+  
+- run the unit tests in verbose mode during package build
+  
+-------------------------------------------------------------------
+Mon Mar 12 15:41:40 CET 2012 - rjsch...@suse.de
+  
+- fix Validator test
+  Revert f551128061 and d76e57194c, comparison in question checks for
+  equality of objects, thus numerical comparison is appropriate
+  
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.ViDHyI/_old  2012-03-20 11:30:06.000000000 +0100
+++ /var/tmp/diff_new_pack.ViDHyI/_new  2012-03-20 11:30:06.000000000 +0100
@@ -22,7 +22,7 @@
 Summary:        OpenSuSE - KIWI Image System
 License:        GPL-2.0
 Group:          System/Management
-Version:        5.02.18
+Version:        5.02.19
 Release:        0
 # requirements to build packages
 BuildRequires:  gcc-c++
@@ -363,11 +363,11 @@
 %build
 # empty because of rpmlint warning rpm-buildroot-usage
 
-#%if %{suse_version} > 1140
-#
-#%check
-#make test
-#%endif
+%if %{suse_version} > 1140
+
+%check
+make KIWIVERBTEST=1 test
+%endif
 
 %install
 # build

++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1

++++++ kiwi-repo.tar.bz2 ++++++

++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision  2012-03-09 14:57:02.000000000 +0100
+++ new/kiwi/.revision  2012-03-16 14:27:44.000000000 +0100
@@ -1 +1 @@
-0ed9c17c2b116ea83c6e790467e755f06f2a100c
+c96be4b3076b74e1d47b902aced3d44aec271672
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile
--- old/kiwi/Makefile   2012-03-09 14:57:02.000000000 +0100
+++ new/kiwi/Makefile   2012-03-16 14:27:43.000000000 +0100
@@ -43,6 +43,10 @@
 PACKDOCVZ   = ${doc_prefix}/kiwi
 MANVZ       = ${man_prefix}/man1
 
+ifdef KIWIVERBTEST
+TESTVERBOSE = --verbose
+endif
+
 all: modules/KIWISchema.rng
        #============================================
        # build tools
@@ -170,7 +174,7 @@
        for i in `find -name "*.t" | cut -d/ -f4`;do \
                touch tests/.timestamps/$$i's';\
        done
-       cd tests/unit && /usr/bin/prove -f .
+       cd tests/unit && /usr/bin/prove ${TESTVERBOSE} -f .
        rm -f .revision
 
 %.t:
@@ -182,7 +186,7 @@
                mkdir tests/.timestamps; \
        fi
        touch tests/.timestamps/$@s
-       cd tests/unit && /usr/bin/prove -f $@
+       cd tests/unit && /usr/bin/prove ${TESTVERBOSE} -f $@
 
 clean:
        (cd system/boot && find -type f | grep -v .svn | xargs chmod u+w)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm
--- old/kiwi/modules/KIWIBoot.pm        2012-03-09 14:57:02.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm        2012-03-16 14:27:57.000000000 +0100
@@ -464,7 +464,7 @@
        # round compressed image size
        #------------------------------------------
        if ($syszip) {
-               $syszip = $syszip / 1048576;
+               $syszip = $syszip / 1e6;
                $syszip = sprintf ("%.0f", $syszip);
        }
        #==========================================
@@ -1791,7 +1791,7 @@
        #------------------------------------------
        if (($imgtype eq "split") && (-f $splitfile)) {
                my $splitsize = $main::global -> isize ($splitfile);
-               my $splitMB = ($splitsize * 1.2) / 1048576;
+               my $splitMB = int (($splitsize * 1.2) / 1048576);
                $kiwi -> info (
                        "Adding $splitMB MB space for split read-write portion"
                );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm 
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm     2012-03-09 14:57:07.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm     2012-03-16 14:27:57.000000000 +0100
@@ -42,7 +42,7 @@
        # Globals (generic)
        #------------------------------------------
        my %data;
-       $data{Version}         = "5.02.18";
+       $data{Version}         = "5.02.19";
        $data{Publisher}       = "SUSE LINUX Products GmbH";
        $data{Preparer}        = "KIWI - http://kiwi.berlios.de";;
        $data{ConfigName}      = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm 
new/kiwi/modules/KIWIImageFormat.pm
--- old/kiwi/modules/KIWIImageFormat.pm 2012-03-09 14:57:02.000000000 +0100
+++ new/kiwi/modules/KIWIImageFormat.pm 2012-03-16 14:27:57.000000000 +0100
@@ -747,7 +747,11 @@
        #------------------------------------------
        if ((! %xenconfig) || (! $xenconfig{xen_diskdevice})) {
                $kiwi -> skipped ();
-               $kiwi -> warning ("Not enough or missing Xen machine config 
data");
+               if (! %xenconfig) {
+                       $kiwi -> warning ("No machine section for this image 
type found");
+               } else {
+                       $kiwi -> warning ("No disk device setup found in 
machine section");
+               }
                $kiwi -> skipped ();
                return $file;
        }
@@ -856,7 +860,11 @@
        my %vmwconfig = %{$vmwref};
        if ((! %vmwconfig) || (! $vmwconfig{vmware_disktype})) {
                $kiwi -> skipped ();
-               $kiwi -> warning ("Not enough or Missing VMware machine config 
data");
+               if (! %vmwconfig) {
+                       $kiwi -> warning ("No machine section for this image 
type found");
+               } else {
+                       $kiwi -> warning ("No disk device setup found in 
machine section");
+               }
                $kiwi -> skipped ();
                return $file;
        }
@@ -1011,7 +1019,11 @@
        my %ovfconfig = %{$ovfref};
        if ((! %ovfconfig) || (! $ovfconfig{ovf_type})) {
                $kiwi -> skipped ();
-               $kiwi -> warning ("Not enough or Missing OFV config data");
+               if (! %ovfconfig) {
+                       $kiwi -> warning ("No machine section for this image 
type found");
+               } else {
+                       $kiwi -> warning ("No disk device setup found in 
machine section");
+               }
                $kiwi -> skipped ();
                return $ovf;
        }
@@ -1056,11 +1068,11 @@
                'xmlns="http://schemas.dmtf.org/ovf/envelope/1";'."\n".
                'xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common";'."\n".
                'xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1";'."\n".
-               'xmlns:rasd="http://schemas.dmtf.org/";'."\n".
-               
'wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"'."\n".
+               'xmlns:rasd="http://schemas.dmtf.org/'.
+                       
'wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"'."\n".
                'xmlns:vmw="http://www.vmware.com/schema/ovf";'."\n".
-               'xmlns:vssd="http://schemas.dmtf.org/";'."\n".
-               'wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"'."\n".
+               'xmlns:vssd="http://schemas.dmtf.org/'.
+                       
'wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"'."\n".
                'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>'."\n";
        #==========================================
        # image description
@@ -1150,7 +1162,12 @@
                my $destdir  = dirname $this->{image};
                my $ovaimage = basename $ovfdir;
                $ovaimage =~ s/\.ovf$/\.ova/;
-               my $status = qxx ("tar -h -C $ovfdir -cf $destdir/$ovaimage . 
2>&1");
+               my $ovabasis = $ovaimage;
+               $ovabasis =~ s/\.ova$//;
+               my $files = "$ovabasis.ovf $ovabasis.mf $ovabasis.vmdk";
+               my $status = qxx (
+                       "tar -h -C $ovfdir -cf $destdir/$ovaimage $files 2>&1"
+               );
                my $result = $? >> 8;
                if ($result != 0) {
                        $kiwi -> failed ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh 
new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh     2012-03-09 14:57:02.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh     2012-03-16 14:27:44.000000000 +0100
@@ -2722,6 +2722,9 @@
                #======================================
                # find installed kernel / initrd
                #--------------------------------------
+               if [ -z "$KERNEL_LIST" ] ; then
+                       kernelList $prefix
+               fi
                IFS="," ; for i in $KERNEL_LIST;do
                        if test -z "$i";then
                                continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm 
new/kiwi/modules/KIWIManager.pm
--- old/kiwi/modules/KIWIManager.pm     2012-03-09 14:57:07.000000000 +0100
+++ new/kiwi/modules/KIWIManager.pm     2012-03-16 14:27:44.000000000 +0100
@@ -1391,6 +1391,7 @@
                # Create screen call file
                #------------------------------------------
                $kiwi -> info ("Removing packages...");
+               $this -> rpmLibs();
                my @removeOpts = (
                        "--nodeps --allmatches --noscripts"
                );
@@ -1404,9 +1405,13 @@
                print $fd "@kchroot mount -t proc proc /proc"."\n";
                print $fd "final=\$(@kchroot rpm -q @removePackages ";
                print $fd " | grep -v 'is not installed')"."\n";
+               print $fd "if [ ! -z \"\$final\" ];then"."\n";
                print $fd "@kchroot rpm -e @removeOpts \$final &\n";
                print $fd "SPID=\$!;wait \$SPID\n";
                print $fd "ECODE=\$?\n";
+               print $fd "else"."\n";
+               print $fd "ECODE=0"."\n";
+               print $fd "fi"."\n";
                print $fd "echo \$ECODE > $screenCall.exit\n";
                print $fd "@kchroot umount /proc"."\n";
                #print $fd "@kchroot /bin/bash\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm 
new/kiwi/modules/KIWIXMLValidator.pm
--- old/kiwi/modules/KIWIXMLValidator.pm        2012-03-09 14:57:07.000000000 
+0100
+++ new/kiwi/modules/KIWIXMLValidator.pm        2012-03-16 14:27:44.000000000 
+0100
@@ -497,7 +497,7 @@
                return 1;
        }
        for my $pkgs (@pkgsNodes) {
-               if ("$pkgs" ne "$defPackSection") {
+               if ($pkgs != $defPackSection) {
                        my $patternType = $pkgs -> getAttribute( 'patternType' 
);
                        if ($patternType && $patternType ne $defPatternTypeVal) 
{
                                my $kiwi = $this->{kiwi};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 
new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml    2012-03-09 
14:57:02.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml    2012-03-16 
14:27:44.000000000 +0100
@@ -162,7 +162,6 @@
                <package name="iptables"/>
                <package name="irqbalance"/>
                <package name="keyutils-libs"/>
-               <package name="libbz2-1"/>
                <package name="libexpat1"/>
                <package name="libjpeg"/>
                <package name="liblcms"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 
new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml    2012-03-09 
14:57:02.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml    2012-03-16 
14:27:44.000000000 +0100
@@ -163,7 +163,6 @@
                <package name="iptables"/>
                <package name="irqbalance"/>
                <package name="keyutils-libs"/>
-               <package name="libbz2-1"/>
                <package name="libexpat1"/>
                <package name="libjpeg"/>
                <package name="liblcms"/>

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to