Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-10-02 14:13:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-28 19:58:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-10-02 14:13:46.000000000 +0200 @@ -1,0 +2,84 @@ +Thu Oct 2 09:39:19 CEST 2014 - [email protected] + +- v7.01.5 released + +------------------------------------------------------------------- +Wed Oct 1 17:27:42 CEST 2014 - [email protected] + +- Fixed use of zypper package cache + + For unknown reasons zypper removes the pkg-cache-dir when + calling the addrepo command. Because this is unwanted kiwi + temporarly moves the current cache dir and moves it back + after the addrepo call is done + +------------------------------------------------------------------- +Wed Oct 1 16:03:00 CEST 2014 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Wed Oct 1 12:27:54 CEST 2014 - [email protected] + +- DB: update documentation + + first review by the documentation department + +------------------------------------------------------------------- +Tue Sep 30 17:28:48 CEST 2014 - [email protected] + +- v7.01.4 released + +------------------------------------------------------------------- +Tue Sep 30 16:56:20 CEST 2014 - [email protected] + +- Added support for custom boxname for vagrant images (bnc #896205) + + By default the name set to the vagrant .json file is the name + of the image as specified in the kiwi XML description. However, + in the world of https://vagrantcloud.com/, the convention for + "fully-qualified" box names is "ORGANIZATION/BOXNAME" which does + not apply to a standard kiwi image name. With the new boxname + attribute people can now specify the name of the box to be + vagrantcloud conform. e.g + + <vagrantconfig ... boxname="opensuse/minimal-13.1"/> + +------------------------------------------------------------------- +Tue Sep 30 16:17:28 CEST 2014 - [email protected] + +- v7.01.3 released + +------------------------------------------------------------------- +Tue Sep 30 11:38:58 CEST 2014 - [email protected] + +- Add error message to log file if downloadFile failed + +------------------------------------------------------------------- +Tue Sep 30 11:38:18 CEST 2014 - [email protected] + +- Fixed uninstall make target + + Delete /dev/shm/lwp-download created by kiwi + +------------------------------------------------------------------- +Tue Sep 30 10:12:43 CEST 2014 - [email protected] + +- v7.01.2 released + +------------------------------------------------------------------- +Tue Sep 30 10:06:49 CEST 2014 - [email protected] + +- DB: rebuild documentation for version 7 + +------------------------------------------------------------------- +Tue Sep 30 09:59:59 CEST 2014 - [email protected] + +- Branch created for SLE12, master open for development at version 7 + +------------------------------------------------------------------- +Mon Sep 29 22:13:44 CEST 2014 - [email protected] + +- Fixed use of uninitialized value $time + +------------------------------------------------------------------- @@ -185,0 +270,5 @@ + +------------------------------------------------------------------- +Tue Sep 16 01:20:31 CEST 2014 - [email protected] + +- linuxefi only exists in grub2 on x86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.lCOdPX/_old 2014-10-02 14:13:50.000000000 +0200 +++ /var/tmp/diff_new_pack.lCOdPX/_new 2014-10-02 14:13:50.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.165 +Version: 7.01.5 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 39950 lines of diff (skipped) ++++++ 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-09-17 16:25:06.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200 @@ -1 +1 @@ -6a1c9d1ec096f8734d3408625513abf1607a8615 +a7498fcf3652f7de59df10d349b2b501f069d379 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2014-08-29 22:30:35.000000000 +0200 +++ new/kiwi/Makefile 2014-09-30 11:33:37.000000000 +0200 @@ -281,6 +281,7 @@ rm -f /usr/sbin/kiwi rm -f /usr/share/emacs/site-lisp/suse-start-kiwi-mode.el rm -f /etc/bash_completion.d/kiwi.sh + rm -f /dev/shm/lwp-download build: ./.doit -p --local 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 2014-09-26 10:22:22.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-02 09:39:15.000000000 +0200 @@ -1130,6 +1130,7 @@ my $this = shift; my $url = shift; my $dest = shift; + my $kiwi = $this->{kiwi}; my $dirname; my $basename; my $proxy; @@ -1211,6 +1212,7 @@ } my $LWP = FileHandle -> new(); if (! $LWP -> open (">$lwp")) { + $kiwi->loginfo("downloadFile::Failed to create $lwp: $!"); return; } if ($proxy) { @@ -1224,6 +1226,7 @@ my $locator = KIWILocator -> instance(); my $lwpload = $locator -> getExecPath ('lwp-download'); if (! $lwpload) { + $kiwi->loginfo("downloadFile::Can't find lwp-download"); return; } print $LWP $lwpload.' "$1" "$2"'."\n"; @@ -1235,6 +1238,7 @@ # the download # ---- KIWIQX::qxx ("chmod a+x $lwp 2>&1"); + KIWIQX::qxx ("chmod a+w $lwp 2>&1"); $dest = $dirname."/".$basename; my $data = KIWIQX::qxx ("$lwp $url $dest 2>&1"); my $code = $? >> 8; @@ -1831,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.165"; + $data{Version} = "7.01.5"; $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/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2014-09-09 13:19:25.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2014-09-30 16:55:41.000000000 +0200 @@ -533,6 +533,10 @@ foreach my $vgc (@{$vgclist}) { my $box = $this->{image}; my $provider = $vgc -> getProvider(); + my $boxname = $vgc -> getBoxName(); + if (! $boxname) { + $boxname = $xml -> getImageName(); + } $kiwi -> info ("Creating vagrant box for $provider provider\n"); #========================================== # create vagrant image @@ -603,7 +607,7 @@ $providers->[0]->{url} = basename $box; $versions->[0]->{version} = $pref -> getVersion(); $versions->[0]->{providers} = $providers; - $json_data{name} = $xml -> getImageName(); + $json_data{name} = $boxname; $json_data{description} = $desc -> getSpecificationDescript(); $json_data{description} =~ s/[\n\t]+//g; $json_data{versions} = $versions; 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 2014-09-26 10:22:22.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-09-30 09:22:59.000000000 +0200 @@ -2874,8 +2874,12 @@ # activate secure boot if required #-------------------------------------- if [ "$kiwi_firmware" = "uefi" ];then - echo "GRUB_USE_LINUXEFI=true" >> $inst_default_grub - echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub + case $arch in + i?86|x86_64) + echo "GRUB_USE_LINUXEFI=true" >> $inst_default_grub + echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub + ;; + esac fi #====================================== # write vesa vga setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManagerZypper.pm new/kiwi/modules/KIWIManagerZypper.pm --- old/kiwi/modules/KIWIManagerZypper.pm 2014-09-26 10:22:22.000000000 +0200 +++ new/kiwi/modules/KIWIManagerZypper.pm 2014-10-01 17:25:20.000000000 +0200 @@ -369,8 +369,14 @@ if (! $chroot) { if (! $repo_exists) { $kiwi -> info ("Adding bootstrap zypper service: $alias"); + KIWIQX::qxx( + "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" + ); $data = KIWIQX::qxx ("@zypper --root \"$root\" $sadd 2>&1"); $code = $? >> 8; + KIWIQX::qxx( + "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" + ); } else { $kiwi -> info ("Updating bootstrap zypper service: $alias"); $data = KIWIQX::qxx ( @@ -395,8 +401,14 @@ my @zypper= @{$this->{zypper_chroot}}; if (! $repo_exists) { $kiwi -> info ("Adding chroot zypper service: $alias"); + KIWIQX::qxx( + "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" + ); $data = KIWIQX::qxx ("@kchroot @zypper $sadd 2>&1"); $code = $? >> 8; + KIWIQX::qxx( + "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" + ); } else { $kiwi -> info ("Updating chroot zypper service: $alias"); $data = KIWIQX::qxx ( @@ -417,9 +429,15 @@ $kiwi -> done (); if (($source{$alias}{imgincl}) && (! -f $imgRepo)) { $kiwi -> info ("Adding $alias repo to image"); + KIWIQX::qxx( + "mv /var/cache/kiwi/packages /var/cache/kiwi/packs" + ); $sadd =~ s/--keep-packages//; $data = KIWIQX::qxx ("@kchroot zypper $sadd 2>&1"); $code = $? >> 8; + KIWIQX::qxx( + "mv /var/cache/kiwi/packs /var/cache/kiwi/packages" + ); if ($code != 0) { $kiwi -> failed (); $kiwi -> error ("zypper: $data"); 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 2014-09-12 12:41:26.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2014-09-30 16:44:22.000000000 +0200 @@ -2563,9 +2563,20 @@ ] ] attribute virtualsize { xsd:nonNegativeInteger } + k.vagrantconfig.boxname.attribute = + ## The boxname as it's written into the json file + ## If not specified the image name is used + [ + db:para [ + "The boxname as it's written into the json file." + "If not specified the image name is used." + ] + ] + attribute boxname { text } k.vagrantconfig.attlist = k.vagrantconfig.provider.attribute & - k.vagrantconfig.virtualsize.attribute + k.vagrantconfig.virtualsize.attribute & + k.vagrantconfig.boxname.attribute? k.vagrantconfig = ## Specifies the Vagrant configuration section [ 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 2014-09-12 12:41:26.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2014-09-30 16:44:29.000000000 +0200 @@ -3659,10 +3659,20 @@ <data type="nonNegativeInteger"/> </attribute> </define> + <define name="k.vagrantconfig.boxname.attribute"> + <attribute name="boxname"> + <a:documentation>The boxname as it's written into the json file +If not specified the image name is used</a:documentation> + <db:para>The boxname as it's written into the json file.If not specified the image name is used.</db:para> + </attribute> + </define> <define name="k.vagrantconfig.attlist"> <interleave> <ref name="k.vagrantconfig.provider.attribute"/> <ref name="k.vagrantconfig.virtualsize.attribute"/> + <optional> + <ref name="k.vagrantconfig.boxname.attribute"/> + </optional> </interleave> </define> <define name="k.vagrantconfig"> 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 2014-09-17 16:25:06.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2014-09-30 16:49:06.000000000 +0200 @@ -2962,6 +2962,8 @@ my @vagrantConfigData; for my $vagrantConfig (@vagrantConfigNodes) { my %vagrantConfigSet; + $vagrantConfigSet{boxname} = + $vagrantConfig -> getAttribute('boxname'); $vagrantConfigSet{provider} = $vagrantConfig -> getAttribute('provider'); $vagrantConfigSet{virtual_size} = @@ -5876,7 +5878,7 @@ my $TFD = FileHandle -> new(); if ($TFD -> open ("$index.timestamp")) { my $curstamp = <$TFD>; chomp $curstamp; $TFD -> close(); - if ($curstamp eq $time) { + if (($time) && ($curstamp eq $time)) { $kiwi -> done(); unlink $repoMD; return $index; @@ -5915,9 +5917,9 @@ #========================================== # Store new time stamp #------------------------------------------ - if (! open ($RXML, '>', "$index.timestamp")) { + if ((! $time) || (! open ($RXML, '>', "$index.timestamp"))) { $kiwi -> failed (); - $kiwi -> error ("--> Failed to create timestamp: $!"); + $kiwi -> error ("--> Failed to create timestamp: $index.timestamp"); $kiwi -> failed (); unlink $repoMD; return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLVagrantConfigData.pm new/kiwi/modules/KIWIXMLVagrantConfigData.pm --- old/kiwi/modules/KIWIXMLVagrantConfigData.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/modules/KIWIXMLVagrantConfigData.pm 2014-09-30 16:49:46.000000000 +0200 @@ -46,6 +46,7 @@ # this = { # provider = '' # virtual_size = '' + # boxname = '' # } # --- #========================================== @@ -63,6 +64,7 @@ my %keywords = map { ($_ => 1) } qw( provider virtual_size + boxname ); $this->{supportedKeywords} = \%keywords; if (! $this -> p_isInitHashRef($init) ) { @@ -73,6 +75,7 @@ } $this->{provider} = $init->{provider}; $this->{virtual_size} = $init->{virtual_size}; + $this->{boxname} = $init->{boxname}; return $this; } @@ -119,6 +122,37 @@ } #========================================== +# getBoxName +#------------------------------------------ +sub getBoxName { + # ... + # Return the setting for the boxname configuration + # --- + my $this = shift; + return $this->{boxname}; +} + +#========================================== +# setBoxName +#------------------------------------------ +sub setBoxName { + # ... + # Set the boxname attribute, if called with no argument the + # attribute is erased + # --- + my $this = shift; + my $val = shift; + if (! $val) { + if ($this->{boxname}) { + delete $this->{boxname}; + } + } else { + $this->{boxname} = $val; + } + return $this; +} + +#========================================== # setVirtualSize #------------------------------------------ sub setVirtualSize { @@ -149,6 +183,10 @@ my $element = XML::LibXML::Element -> new('vagrantconfig'); my $provider = $this -> getProvider(); my $vsize = $this -> getVirtualSize(); + my $boxname = $this -> getBoxName(); + if ($boxname) { + $element -> setAttribute('boxname', $provider); + } if ($provider) { $element -> setAttribute('provider', $provider); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm new/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm --- old/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm 2014-08-29 22:30:36.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm 2014-09-30 16:52:49.000000000 +0200 @@ -26,7 +26,6 @@ use KIWIXMLVagrantConfigData; - #========================================== # Constructor #------------------------------------------ @@ -139,6 +138,36 @@ } #========================================== +# test_getBoxName +#------------------------------------------ +sub test_getBoxName { + # ... + # Test the getBoxName method + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $init = $this -> __getBaseInitHash(); + my $confDataObj = KIWIXMLVagrantConfigData -> new($init); + 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); + # Test this condition last to get potential error messages + $this -> assert_not_null($confDataObj); + my $scan = $confDataObj -> getBoxName(); + $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('foo', $scan); + return; +} + +#========================================== # test_getVirtualSize #------------------------------------------ sub test_getVirtualSize { @@ -182,6 +211,7 @@ # --- my $this = shift; my %init = ( + boxname => 'foo', provider => 'libvirt', virtual_size => '42' ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
