Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-07-26 12:19:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-18 14:03:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-07-26 12:19:49.000000000 +0200 @@ -1,0 +2,53 @@ +Thu Jul 24 15:40:17 CEST 2014 - [email protected] + +- v5.06.134 released + +------------------------------------------------------------------- +Thu Jul 24 15:30:14 CEST 2014 - [email protected] + +- Fixed setup of object variable originXMLPath + According to the XML read code moved from KIWIBoot into a function + KIWIGlobals::readXMLFromImage the path information was stored in + the wrong module. This had an impact to the search path of the + editbootinstall/editbootconfig scripts so that they were not + found anymore if specified relatively to the origin of the XML + description + +------------------------------------------------------------------- +Thu Jul 24 11:24:33 CEST 2014 - [email protected] + +- Fixed use of repo URI with credentials information + If there is no ?credentials= tag in the repo URI kiwi uses the + default credentials file name 'kiwiRepoCredentials' and does + not fail using an uninitialized value $credFile + +------------------------------------------------------------------- +Thu Jul 24 10:50:50 CEST 2014 - [email protected] + +- v5.06.133 released + +------------------------------------------------------------------- +Wed Jul 23 16:16:27 CEST 2014 - [email protected] + +- Fixed creation of vagrant boxes for virtualbox provider + + vagrant's VBoxManage requires boxes containing ovf metadata + which kiwi did not provide. This commit changes the raw box + contents to match these requirements (github: #374) + +------------------------------------------------------------------- +Fri Jul 18 17:01:37 CEST 2014 - [email protected] + +- v5.06.132 released + +------------------------------------------------------------------- +Fri Jul 18 17:00:07 CEST 2014 - [email protected] + +- DB: rebuild documentation + +------------------------------------------------------------------- +Fri Jul 18 16:56:54 CEST 2014 - [email protected] + +- DB: Update kiwi-doc-signkey.xml by native speaker + +------------------------------------------------------------------- @@ -19,0 +73,8 @@ +Thu Jul 17 08:46:53 CEST 2014 - [email protected] + +- properly setup grub2 for EC2 usage [bnc #887801] + + PV-GRUB looks for the grub2 modules in /boot/grub2/xen-x86_64, although + this is not a "real grub2 target. Symlinking to i386-pc does the trick. + Using the prefix setting in the grub configuration trips up PV-GRUB. + +------------------------------------------------------------------- @@ -53,0 +115,6 @@ + +------------------------------------------------------------------- +Tue Jul 15 18:36:11 CEST 2014 - [email protected] + +- DB: update documentation (bnc #886791) + * Added Chapter how to include rpm signing keys ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.rnHERU/_old 2014-07-26 12:19:50.000000000 +0200 +++ /var/tmp/diff_new_pack.rnHERU/_new 2014-07-26 12:19:50.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 5.06.131 +Version: 5.06.134 Release: 0 Provides: kiwi-schema = 6.1 # requirements to build packages ++++++ 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 2014-07-14 16:44:54.000000000 +0200 +++ new/kiwi/.revision 2014-07-14 16:44:54.000000000 +0200 @@ -1 +1 @@ -5bff2c0217a4c594415c9a46ca03945b1ecdfcb0 +0191ab7adcc5b9aed562e438cd6e862ea594d4b8 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 2014-07-17 11:27:21.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2014-07-24 15:41:26.000000000 +0200 @@ -244,6 +244,9 @@ if ($read_result{split}) { $haveSplit = $read_result{split}; } + if ($read_result{originXMLPath}) { + $this->{originXMLPath} = $read_result{originXMLPath}; + } } #========================================== # store type information @@ -4328,7 +4331,9 @@ if ($config eq 'grub2-efi') { print $FD 'set prefix=($root)/boot/grub2-efi'."\n"; } else { - print $FD 'set prefix=($root)/boot/grub2'."\n"; + if ($firmware ne 'ec2') { + print $FD 'set prefix=($root)/boot/grub2'."\n"; + } } # print $FD "set debug=all\n"; print $FD "set default=$defaultBootNr\n"; @@ -5478,6 +5483,21 @@ $kiwi -> failed (); return; } + if ($firmware eq 'ec2') { + $status = KIWIQX::qxx ( + "cd /mnt/boot/grub2/; ln -s $grubarch xen-x86_64 2>&1" + ); + $result = $? >> 8; + if ($result != 0) { + my $msg = "Could not create symlink xen-x86_64 -> $grubarch " + . 'for EV2 grub2 setup'; + $kiwi -> failed (); + $kiwi -> error ($msg); + $kiwi -> failed (); + $this -> cleanStack (); + return; + } + } #========================================== # Copy grub2 core modules to tmpdir #------------------------------------------ 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-07-17 11:27:21.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-07-24 15:41:26.000000000 +0200 @@ -1675,6 +1675,7 @@ my $profile= $cmdL -> getBuildProfiles(); my $syszSize = 0; my $haveSplit= 0; + my $originXMLPath; if ((! $system) || (! $cmdL)) { return; } @@ -1728,7 +1729,7 @@ #------------------------------------------ if (open my $FD, '<', "$rootpath/image/main::Prepare") { my $idesc = <$FD>; close $FD; - $this->{originXMLPath} = $idesc; + $originXMLPath = $idesc; } #========================================== # read and validate XML description @@ -1781,7 +1782,8 @@ my %result = ( "xml" => $xml, "sysz_size" => $syszSize, - "split" => $haveSplit + "split" => $haveSplit, + "originXMLPath" => $originXMLPath ); return %result; } @@ -1812,7 +1814,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.06.131"; + $data{Version} = "5.06.134"; $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-07-17 11:27:21.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2014-07-24 10:51:59.000000000 +0200 @@ -223,7 +223,7 @@ my $xml = $this->{xml}; my $bootp = $this->{bootp}; my $vconf = $this->{vmdata}; - if ((! $vconf) && ($format =~ /qcow2|raw|vagrant/)) { + if ((! $vconf) || ($format =~ /qcow2|raw|vagrant/)) { # a machine configuration doesn't make sense with these # formats requested. Thus we can silently return here return; @@ -549,6 +549,19 @@ if (! $img) { return; } + #========================================== + # create OVF file for virtualbox provider + #------------------------------------------ + if ($provider eq 'virtualbox') { + $this->{image} = $img; + $this->{ovfdir} = $dest; + $this->{format} = 'ovf'; + my $ovf = $this -> createOVFConfiguration(); + $this->{format} = 'vagrant'; + if (! -e $ovf) { + return; + } + } $kiwi -> info ("--> Creating box metadata files"); #========================================== # create vagrant metadata.json @@ -632,12 +645,24 @@ # package vagrant box #------------------------------------------ $kiwi -> info ("--> Creating box archive"); - my $img_basename = basename $img; - KIWIQX::qxx ("cd $dest && mv $img_basename box.img"); my @components = (); + my $img_basename = basename $img; + if ($provider eq 'virtualbox') { + my $ovf_basename = $img_basename; + my $mf_basename = $img_basename; + $ovf_basename =~ s/vmdk$/ovf/; + $mf_basename =~ s/vmdk$/mf/; + KIWIQX::qxx ("cd $dest && mv $img_basename box-disk1.vmdk"); + KIWIQX::qxx ("cd $dest && mv $ovf_basename box.ovf"); + KIWIQX::qxx ("cd $dest && rm $mf_basename"); + push @components, 'box.ovf'; + push @components, 'box-disk1.vmdk'; + } else { + KIWIQX::qxx ("cd $dest && mv $img_basename box.img"); + push @components, 'box.img'; + } push @components, basename $json_meta; push @components, basename $vagrant_meta; - push @components, 'box.img'; my $status = KIWIQX::qxx ( "tar -C $dest -czf $box @components 2>&1" ); @@ -655,7 +680,7 @@ #========================================== # cleanup #------------------------------------------ - KIWIQX::qxx ("rm -f $json_meta $vagrant_meta $dest/box.img"); + KIWIQX::qxx ("cd $dest && rm -f @components"); } return @boxes; } 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-07-17 11:27:21.000000000 +0200 +++ new/kiwi/modules/KIWIManagerZypper.pm 2014-07-24 15:41:26.000000000 +0200 @@ -81,8 +81,11 @@ my ($uname, $pass) = $repo -> getCredentials(); if ($uname) { $kiwi -> info ('Creating credentials data'); - $repo -> getPath() =~ /credentials=(\w+)/; - my $credFile = $1; + my $uri = $repo -> getPath(); + my $credFile = 'kiwiRepoCredentials'; + if ($uri =~ /credentials=(\w+)/) { + $credFile = $1; + } my $credDir = "$dataDir/credentials.d"; mkdir $credDir; $zconfig->newval('main', 'credentials.global.dir', $credDir); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
