Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-06-18 06:36:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-11 08:20:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-06-18 06:36:17.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 12 09:36:40 CEST 2015 - [email protected] + +- v7.02.56 released + +------------------------------------------------------------------- +Fri Jun 12 09:29:57 CEST 2015 - [email protected] + +- Fixed installation of Archive into root system + + Archives marked as bootinclude were excluded from being installed + into the image too. This is an unexpected behaviour change and + is fixed now + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.ZRSoUH/_old 2015-06-18 06:36:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ZRSoUH/_new 2015-06-18 06:36:19.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.02.55 +Version: 7.02.56 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 2015-02-19 21:11:51.000000000 +0100 @@ -1 +1 @@ -4a59e37e9e61434413b78110afe3052498ba71d2 +eaaf05e687b5f18cc0ac406bc8d85cfce68b612e 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-06-09 15:13:53.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-06-12 09:36:30.000000000 +0200 @@ -1943,7 +1943,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.55"; + $data{Version} = "7.02.56"; $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/KIWIImageCreator.pm new/kiwi/modules/KIWIImageCreator.pm --- old/kiwi/modules/KIWIImageCreator.pm 2015-06-08 17:01:12.000000000 +0200 +++ new/kiwi/modules/KIWIImageCreator.pm 2015-06-12 09:19:49.000000000 +0200 @@ -1717,7 +1717,7 @@ my $systemXML = shift; my $bootXML = shift; my $bootArchives = []; - my $systemBootArchives = $systemXML -> getBootIncludeArchives(); + my $systemBootArchives = $systemXML -> getBootIncludeImageArchives(); if ($systemBootArchives) { push @{$bootArchives}, @{$systemBootArchives}; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2015-05-08 10:15:22.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2015-06-12 09:20:03.000000000 +0200 @@ -893,12 +893,12 @@ push @bootinclude_archives, $name; } } else { - my $archiveList = $xml -> getArchives(); + my $archiveList = $xml -> getImageArchives(); for my $archive (@{$archiveList}) { my $name = $archive -> getName(); push @archives, $name; } - my $archiveListBootInclude = $xml -> getBootIncludeArchives(); + my $archiveListBootInclude = $xml -> getBootIncludeImageArchives(); for my $archive (@{$archiveListBootInclude}) { my $name = $archive -> getName(); push @bootinclude_archives, $name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRuntimeChecker.pm new/kiwi/modules/KIWIRuntimeChecker.pm --- old/kiwi/modules/KIWIRuntimeChecker.pm 2015-06-09 09:55:42.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-06-12 09:27:44.000000000 +0200 @@ -1365,22 +1365,14 @@ my $xml = $this->{xml}; my $cmdL = $this->{cmdArgs}; my $archives = []; - my $systemArchives = $xml -> getArchives(); - my $systemBinclArchives = $xml -> getBootIncludeArchives(); + my $imageArchives = $xml -> getImageArchives(); my $bootstrapArchives = $xml -> getBootStrapArchives(); - my $bootstrapBinclArchives = $xml -> getBootIncludeBootStrapArchives(); - if ($systemArchives) { - push @{$archives}, @{$systemArchives}; - } - if ($systemBinclArchives) { - push @{$archives}, @{$systemBinclArchives}; + if ($imageArchives) { + push @{$archives}, @{$imageArchives}; } if ($bootstrapArchives) { push @{$archives}, @{$bootstrapArchives}; } - if ($bootstrapBinclArchives) { - push @{$archives}, @{$bootstrapBinclArchives}; - } my $desc = $cmdL-> getConfigDir(); if (! $desc) { return 1; 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-06-08 16:50:47.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2015-06-12 09:19:26.000000000 +0200 @@ -1259,11 +1259,12 @@ } #========================================== -# getArchives +# getImageArchives #------------------------------------------ -sub getArchives { +sub getImageArchives { # ... # Return an array ref containing ArchiveData objects + # which contains all archives from the image typed packages sections # --- my $this = shift; return $this -> __getInstallData('archives'); @@ -1275,6 +1276,7 @@ sub getBootStrapArchives { # ... # Return an array ref containing ArchiveData objects + # which contains all archives from the bootstrap packages section # --- my $this = shift; return $this -> __getInstallData('bootStrapArchives'); @@ -1306,11 +1308,13 @@ } #========================================== -# getBootIncludeArchives +# getBootIncludeImageArchives #------------------------------------------ -sub getBootIncludeArchives { +sub getBootIncludeImageArchives { # ... # Return an array ref containing ArchiveData objects + # which contains all archives from the image types packages section(s) + # marked as bootinclude # --- my $this = shift; return $this -> __getInstallData('bootArchives'); @@ -1322,6 +1326,8 @@ sub getBootIncludeBootStrapArchives { # ... # Return an array ref containing ArchiveData objects + # which contains all archives from the bootstrap packages section + # marked as bootinclude # --- my $this = shift; return $this -> __getInstallData('bootStrapBootArchives'); @@ -4519,17 +4525,9 @@ my $archiveObj = KIWIXMLPackageArchiveData -> new(\%archData); my $accessID; if ($type eq 'bootstrap') { - if ($bootIncl && $bootIncl eq 'true') { - $accessID = 'bootStrapBootArchives'; - } else { - $accessID = 'bootStrapArchives'; - } + $accessID = 'bootStrapArchives'; } else { - if ($bootIncl && $bootIncl eq 'true') { - $accessID = 'bootArchives'; - } else { - $accessID = 'archives'; - } + $accessID = 'archives'; } my %storeData = ( accessID => $accessID, @@ -4541,6 +4539,26 @@ if (! $this -> __storeInstallData(\%storeData)) { return; } + if ($bootIncl && $bootIncl eq 'true') { + my $bootArchiveObj = KIWIXMLPackageArchiveData -> new( + \%archData + ); + if ($type eq 'bootstrap') { + $accessID = 'bootStrapBootArchives'; + } else { + $accessID = 'bootArchives'; + } + my %storeBootData = ( + accessID => $accessID, + arch => $arch, + dataObj => $bootArchiveObj, + profName => $prof, + type => $type + ); + if (! $this -> __storeInstallData(\%storeBootData)) { + return; + } + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLInfo.pm new/kiwi/modules/KIWIXMLInfo.pm --- old/kiwi/modules/KIWIXMLInfo.pm 2015-06-08 16:49:47.000000000 +0200 +++ new/kiwi/modules/KIWIXMLInfo.pm 2015-06-12 09:28:29.000000000 +0200 @@ -474,22 +474,14 @@ my $this = shift; my $xml = $this->{xml}; my $archives = []; - my $systemArchives = $xml -> getArchives(); - my $systemBinclArchives = $xml -> getBootIncludeArchives(); + my $imageArchives = $xml -> getImageArchives(); my $bootstrapArchives = $xml -> getBootStrapArchives(); - my $bootstrapBinclArchives = $xml -> getBootIncludeBootStrapArchives(); - if ($systemArchives) { - push @{$archives}, @{$systemArchives}; - } - if ($systemBinclArchives) { - push @{$archives}, @{$systemBinclArchives}; + if ($imageArchives) { + push @{$archives}, @{$imageArchives}; } if ($bootstrapArchives) { push @{$archives}, @{$bootstrapArchives}; } - if ($bootstrapBinclArchives) { - push @{$archives}, @{$bootstrapBinclArchives}; - } my @result = @{$archives}; if ((scalar @result) == 0) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXML.pm new/kiwi/tests/unit/lib/Test/kiwiXML.pm --- old/kiwi/tests/unit/lib/Test/kiwiXML.pm 2015-06-08 16:54:10.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXML.pm 2015-06-12 09:21:32.000000000 +0200 @@ -111,7 +111,7 @@ $this -> assert_str_equals('none', $msgT); $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); - my $archives = $xml -> getArchives(); + my $archives = $xml -> getImageArchives(); my @archiveNames; for my $archive (@{$archives}) { push @archiveNames, $archive -> getName(); @@ -292,7 +292,7 @@ my $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); # Verify that the default has not changed - my $archives = $xml -> getArchives(); + my $archives = $xml -> getImageArchives(); my @archiveNames; for my $archive (@{$archives}) { push @archiveNames, $archive -> getName(); @@ -303,7 +303,7 @@ $xml = $xml -> setSelectionProfileNames(\@useProf); # Clear the log $state = $kiwi -> getState(); - $archives = $xml -> getArchives(); + $archives = $xml -> getImageArchives(); my @profArchiveNames; for my $archive (@{$archives}) { push @profArchiveNames, $archive -> getName(); @@ -354,7 +354,7 @@ my $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); # Verify that the default has not changed - my $archives = $xml -> getArchives(); + my $archives = $xml -> getImageArchives(); my @archiveNames; for my $archive (@{$archives}) { push @archiveNames, $archive -> getName(); @@ -366,7 +366,7 @@ $xml = $xml -> setSelectionProfileNames(\@useProf); # Clear the log $state = $kiwi -> getState(); - $archives = $xml -> getArchives(); + $archives = $xml -> getImageArchives(); my @profArchiveNames; for my $archive (@{$archives}) { push @profArchiveNames, $archive -> getName(); @@ -374,7 +374,7 @@ $this -> assert_array_equal(\@expected, \@profArchiveNames); # Change the build type and now we should get the added archives $xml = $xml -> setBuildType('iso'); - $archives = $xml -> getArchives(); + $archives = $xml -> getImageArchives(); my @typeArchiveNames; for my $archive (@{$archives}) { push @typeArchiveNames, $archive -> getName(); @@ -3774,11 +3774,11 @@ } #========================================== -# test_getArchives +# test_getImageArchives #------------------------------------------ -sub test_getArchives { +sub test_getImageArchives { # ... - # Verify proper return of getArchives method + # Verify proper return of getImageArchives method # --- if ($ENV{KIWI_NO_NET} && $ENV{KIWI_NO_NET} == 1) { return; # skip the test if there is no network connection @@ -3789,7 +3789,7 @@ my $xml = KIWIXML -> new( $confDir, undef, undef,$this->{cmdL} ); - my $archives = $xml -> getArchives(); + my $archives = $xml -> getImageArchives(); my $msg = $kiwi -> getMessage(); $this -> assert_str_equals('No messages set', $msg); my $msgT = $kiwi -> getMessageType(); @@ -3803,6 +3803,7 @@ } my @expected = qw( myImageStuff.tgz + myInitStuff.tar myOEMstuffProf.tar.bz2 ); $this -> assert_array_equal(\@expected, \@archiveNames); @@ -3810,11 +3811,11 @@ } #========================================== -# test_getArchivesUseProf +# test_getImageArchivesUseProf #------------------------------------------ -sub test_getArchivesUseProf { +sub test_getImageArchivesUseProf { # ... - # Verify proper return of getArchives method with a selected build + # Verify proper return of getImageArchives method with a selected build # profile # --- if ($ENV{KIWI_NO_NET} && $ENV{KIWI_NO_NET} == 1) { @@ -3835,7 +3836,7 @@ $this -> assert_str_equals('info', $msgT); my $state = $kiwi -> getState(); $this -> assert_str_equals('completed', $state); - my $archives = $xml -> getArchives(); + my $archives = $xml -> getImageArchives(); $msg = $kiwi -> getMessage(); $this -> assert_str_equals('No messages set', $msg); $msgT = $kiwi -> getMessageType(); @@ -3850,6 +3851,7 @@ my @expected = qw( myAppArch.tgz myImageStuff.tgz + myInitStuff.tar myOEMstuffProf.tar.bz2 ); $this -> assert_array_equal(\@expected, \@archiveNames); @@ -3889,11 +3891,11 @@ } #========================================== -# test_getBootIncludeArchives +# test_getBootIncludeImageArchives #------------------------------------------ -sub test_getBootIncludeArchives { +sub test_getBootIncludeImageArchives { # ... - # Verify proper return of getArchives method + # Verify proper return of getImageArchives method # --- if ($ENV{KIWI_NO_NET} && $ENV{KIWI_NO_NET} == 1) { return; # skip the test if there is no network connection @@ -3904,7 +3906,7 @@ my $xml = KIWIXML -> new( $confDir, undef, undef,$this->{cmdL} ); - my $archives = $xml -> getBootIncludeArchives(); + my $archives = $xml -> getBootIncludeImageArchives(); my $msg = $kiwi -> getMessage(); $this -> assert_str_equals('No messages set', $msg); my $msgT = $kiwi -> getMessageType();
