Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-09-11 09:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-08-28 08:24:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-09-11 09:00:57.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Aug 27 11:11:07 CEST 2015 - [email protected] + +- v7.03.15 released + +------------------------------------------------------------------- +Thu Aug 27 11:06:07 CEST 2015 - [email protected] + +- Added type attribute wwid_wait_timeout + + multipath devices from a SAN system take some time to appear on + the host. In order to have all presented wwn's available on the + host it's required to wait some time because we can't poll for + the appearance of a specific device the wait period is now + customizable. The default wait period is 3 seconds + +------------------------------------------------------------------- +Tue Aug 25 12:03:37 CEST 2015 - [email protected] + +- Revert "Remove genisoimage and cdrkit-cdrtools-compat dependency" + +------------------------------------------------------------------- @@ -33,0 +55,17 @@ +Thu Aug 13 15:31:04 CEST 2015 - [email protected] + +- Don't fix the catalog when it's already correct + + In contrast to genisoimage, mkisofs generates a proper boot catalog + entry. Thus it is not necessary to fix it. + +------------------------------------------------------------------- +Wed Aug 12 11:58:07 CEST 2015 - [email protected] + +- Remove genisoimage and cdrkit-cdrtools-compat dependency + + * cdrkit-cdrtools-compat provides a symlink from mkisofs to genisoimage + * It should be safe to use mkisofs as drop-in replacement for genisoimage + * Removing these dependencies is one step towards removing wodim + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.vHdVNy/_old 2015-09-11 09:01:00.000000000 +0200 +++ /var/tmp/diff_new_pack.vHdVNy/_new 2015-09-11 09:01:00.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.14 +Version: 7.03.15 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ 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 2014-12-15 14:32:44.000000000 +0100 +++ new/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -1f478cf99e795a2e5b81ea5585f5e39b25c499d4 +fb9d29f006908e3cd062dd3a1308b6e18ad7bdec 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 2015-08-24 11:16:44.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-08-27 11:11:02.000000000 +0200 @@ -1933,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.14"; + $data{Version} = "7.03.15"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIProfileFile.pm new/kiwi/modules/KIWIProfileFile.pm --- old/kiwi/modules/KIWIProfileFile.pm 2015-07-27 11:10:03.000000000 +0200 +++ new/kiwi/modules/KIWIProfileFile.pm 2015-08-27 10:55:30.000000000 +0200 @@ -379,6 +379,8 @@ $type -> getCompressed(); $data{kiwi_boot_timeout} = $type -> getBootTimeout(); + $data{kiwi_wwid_wait_timeout} = + $type -> getWWIDWaitTimeout(); $data{kiwi_hybrid} = $type -> getHybrid(); $data{kiwi_hybridpersistent} = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2015-07-24 14:12:45.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2015-08-27 10:53:16.000000000 +0200 @@ -1860,6 +1860,11 @@ ## Specifies the volume ID (volume name or label) to be written ## into the master block. There is space for 32 characters. attribute volid { text } + k.type.wwid_wait_timeout.attribute = + ## Specifies the wait period in seconds after launching + ## the multipath daemon to wait until all presented devices + ## are available on the host. Default timeout is 3 seconds + attribute wwid_wait_timeout { xsd:nonNegativeInteger } k.type.attlist = k.type.boot.attribute? & k.type.bootfilesystem.attribute? & @@ -1905,6 +1910,7 @@ k.type.vga.attribute? & k.type.vhdfixedtag.attribute? & k.type.volid.attribute? & + k.type.wwid_wait_timeout.attribute? & k.type.zfsoptions.attribute? k.type = ## The Image Type of the Logical Extend diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2015-07-24 14:57:55.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2015-08-27 10:53:19.000000000 +0200 @@ -2542,6 +2542,14 @@ into the master block. There is space for 32 characters.</a:documentation> </attribute> </define> + <define name="k.type.wwid_wait_timeout.attribute"> + <attribute name="wwid_wait_timeout"> + <a:documentation>Specifies the wait period in seconds after launching +the multipath daemon to wait until all presented devices +are available on the host. Default timeout is 3 seconds</a:documentation> + <data type="nonNegativeInteger"/> + </attribute> + </define> <define name="k.type.attlist"> <interleave> <optional> @@ -2675,6 +2683,9 @@ <ref name="k.type.volid.attribute"/> </optional> <optional> + <ref name="k.type.wwid_wait_timeout.attribute"/> + </optional> + <optional> <ref name="k.type.zfsoptions.attribute"/> </optional> </interleave> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2015-07-30 17:29:26.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2015-08-27 10:53:24.000000000 +0200 @@ -3947,6 +3947,7 @@ 'vga', 'vhdfixedtag', 'volid', + 'wwid_wait_timeout', 'zfsoptions', 'zipl_targettype' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLTypeData.pm new/kiwi/modules/KIWIXMLTypeData.pm --- old/kiwi/modules/KIWIXMLTypeData.pm 2015-07-23 16:27:34.000000000 +0200 +++ new/kiwi/modules/KIWIXMLTypeData.pm 2015-08-27 10:53:47.000000000 +0200 @@ -99,6 +99,7 @@ # vga = '' # vhdfixedtag = '' # volid = '' + # wwid_wait_timeout = '' # zipl_targettype = '' # } # --- @@ -169,6 +170,7 @@ vga vhdfixedtag volid + wwid_wait_timeout zipl_targettype ); $this->{supportedKeywords} = \%keywords; @@ -233,6 +235,7 @@ $this->{vga} = $init->{vga}; $this->{vhdfixedtag} = $init->{vhdfixedtag}; $this->{volid} = $init->{volid}; + $this->{wwid_wait_timeout} = $init->{wwid_wait_timeout}; $this->{target_blocksize} = $init->{target_blocksize}; $this->{zfsoptions} = $init->{zfsoptions}; # Set default values @@ -377,6 +380,14 @@ } #========================================== +# getWWIDWaitTimeout +#------------------------------------------ +sub getWWIDWaitTimeout { + my $this = shift; + return $this->{wwid_wait_timeout}; +} + +#========================================== # getCheckPrebuilt #------------------------------------------ sub getCheckPrebuilt { @@ -938,6 +949,10 @@ if ($bTime) { $element -> setAttribute('boottimeout', $bTime); } + my $wwidwait = $this -> getWWIDWaitTimeout(); + if ($wwidwait) { + $element -> setAttribute('wwid_wait_timeout', $wwidwait); + } my $cPreb = $this -> getCheckPrebuilt(); if ($cPreb) { $element -> setAttribute('checkprebuilt', $cPreb); @@ -1290,6 +1305,27 @@ return $this; } +#========================================== +# setWWIDWaitTimeout +#------------------------------------------ +sub setWWIDWaitTimeout { + # ... + # Set the configuration for the wwid wait timeout + # --- + my $this = shift; + my $time = shift; + if (! $time) { + my $kiwi = $this->{kiwi}; + my $msg = 'setWWIDWaitTimeout: no timeout value given, retaining ' + . 'current data.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + $this->{wwid_wait_timeout} = $time; + return $this; +} + #========================================== # setCheckPrebuilt #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump new/kiwi/system/boot/armv7l/oemboot/suse-dump --- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2015-07-28 12:07:26.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2015-08-27 10:58:27.000000000 +0200 @@ -976,6 +976,7 @@ local device_disks_new local disk local wwn + local wwid_timeout=3 #====================================== # check the tools #-------------------------------------- @@ -1015,7 +1016,10 @@ # sleep for a while #-------------------------------------- # make sure /etc/multipath/wwids are written - sleep 3 + if [ ! -z "$kiwi_wwid_wait_timeout" ];then + wwid_timeout=$kiwi_wwid_wait_timeout + fi + sleep $wwid_timeout #====================================== # strip list of disk devices #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-dump new/kiwi/system/boot/ix86/oemboot/rhel-dump --- old/kiwi/system/boot/ix86/oemboot/rhel-dump 2015-07-28 11:40:47.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2015-08-27 10:57:57.000000000 +0200 @@ -976,6 +976,7 @@ local device_disks_new local disk local wwn + local wwid_timeout=3 #====================================== # check the tools #-------------------------------------- @@ -1015,7 +1016,10 @@ # sleep for a while #-------------------------------------- # make sure /etc/multipath/wwids are written - sleep 3 + if [ ! -z "$kiwi_wwid_wait_timeout" ];then + wwid_timeout=$kiwi_wwid_wait_timeout + fi + sleep $wwid_timeout #====================================== # strip list of disk devices #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2015-07-28 10:48:59.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2015-08-27 10:57:06.000000000 +0200 @@ -976,6 +976,7 @@ local device_disks_new local disk local wwn + local wwid_timeout=3 #====================================== # check the tools #-------------------------------------- @@ -1015,7 +1016,10 @@ # sleep for a while #-------------------------------------- # make sure /etc/multipath/wwids are written - sleep 3 + if [ ! -z "$kiwi_wwid_wait_timeout" ];then + wwid_timeout=$kiwi_wwid_wait_timeout + fi + sleep $wwid_timeout #====================================== # strip list of disk devices #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2015-07-28 12:07:20.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2015-08-27 10:58:22.000000000 +0200 @@ -976,6 +976,7 @@ local device_disks_new local disk local wwn + local wwid_timeout=3 #====================================== # check the tools #-------------------------------------- @@ -1015,7 +1016,10 @@ # sleep for a while #-------------------------------------- # make sure /etc/multipath/wwids are written - sleep 3 + if [ ! -z "$kiwi_wwid_wait_timeout" ];then + wwid_timeout=$kiwi_wwid_wait_timeout + fi + sleep $wwid_timeout #====================================== # strip list of disk devices #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2015-07-28 12:07:15.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2015-08-27 10:58:17.000000000 +0200 @@ -976,6 +976,7 @@ local device_disks_new local disk local wwn + local wwid_timeout=3 #====================================== # check the tools #-------------------------------------- @@ -1015,7 +1016,10 @@ # sleep for a while #-------------------------------------- # make sure /etc/multipath/wwids are written - sleep 3 + if [ ! -z "$kiwi_wwid_wait_timeout" ];then + wwid_timeout=$kiwi_wwid_wait_timeout + fi + sleep $wwid_timeout #====================================== # strip list of disk devices #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXMLTypeData.pm new/kiwi/tests/unit/lib/Test/kiwiXMLTypeData.pm --- old/kiwi/tests/unit/lib/Test/kiwiXMLTypeData.pm 2015-07-23 16:19:46.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXMLTypeData.pm 2015-08-27 11:05:10.000000000 +0200 @@ -1039,6 +1039,27 @@ } #========================================== +# test_getWWIDWaitTimeout +#------------------------------------------ +sub test_getWWIDWaitTimeout { + # ... + # Test the getWWIDWaitTimeout method + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $typeDataObj = $this -> __getTypeObj(); + my $time = $typeDataObj -> getWWIDWaitTimeout(); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + $this -> assert_str_equals('42', $time); + return; +} + +#========================================== # test_getCheckPrebuilt #------------------------------------------ sub test_getCheckPrebuilt { @@ -1941,6 +1962,7 @@ . 'bootpartition="true" ' . 'bootprofile="std" ' . 'boottimeout="5" ' + . 'wwid_wait_timeout="42" ' . 'checkprebuilt="true" ' . 'compressed="true" ' . 'container="mycont" ' @@ -2548,6 +2570,35 @@ } #========================================== +# test_setWWIDWaitTimeout +#------------------------------------------ +sub test_setWWIDWaitTimeout { + # ... + # Test the setWWIDWaitTimeout method + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $typeDataObj = $this -> __getTypeObj(); + $typeDataObj = $typeDataObj -> setWWIDWaitTimeout('2'); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + $this -> assert_not_null($typeDataObj); + my $time = $typeDataObj -> getWWIDWaitTimeout(); + $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + $this -> assert_str_equals('2', $time); + return; +} + +#========================================== # test_setBootTimeoutNoArg #------------------------------------------ sub test_setBootTimeoutNoArg { @@ -5389,6 +5440,7 @@ bootpartsize => '512', bootprofile => 'std', boottimeout => '5', + wwid_wait_timeout => '42', checkprebuilt => 'true', compressed => 'true', container => 'mycont',
