Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-08-28 08:24:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07 00:17:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-08-28 08:24:37.000000000 +0200 @@ -1,0 +2,32 @@ +Mon Aug 24 11:16:49 CEST 2015 - [email protected] + +- v7.03.14 released + +------------------------------------------------------------------- +Mon Aug 24 11:09:59 CEST 2015 - [email protected] + +- Skip loopback nic in interface selection + + setupNetworkStatic selects the last interface to be used for + the setup. This is not a smart selection but it should not + select the loopback interface in any case. Whether or not it's + possible to automatically just select the "right" nic is still + an open task. + +------------------------------------------------------------------- +Mon Aug 24 10:59:56 CEST 2015 - [email protected] + +- Fixed reading of search path for editboot* scripts + + In build and create mode the origin path of the XML description was + not correctly initialized. kiwi skipped reading the meta information + from the unpacked image root tree because it already has a pointer + to the XML description, however this data set does not provide the + origin path of the kiwi call + +------------------------------------------------------------------- +Tue Aug 18 14:52:28 CEST 2015 - [email protected] + +- Remove duplicate provide of kiwi-image:tbz + +------------------------------------------------------------------- @@ -6,0 +39,5 @@ +Mon Aug 3 09:50:24 CEST 2015 - [email protected] + +- Add a line that helps solver debugging, commented out by default + +------------------------------------------------------------------- @@ -2600,0 +2638,2 @@ + +- Activate new swap after repartitioning ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.tDKbEE/_old 2015-08-28 08:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.tDKbEE/_new 2015-08-28 08:24:40.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.13 +Version: 7.03.14 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -203,7 +203,6 @@ Provides: kiwi-filesystem:squashfs Provides: kiwi-packagemanager:zypper Provides: kiwi-image:docker -Provides: kiwi-image:tbz Requires: btrfsprogs Requires: e2fsprogs Requires: kiwi = %{version} ++++++ 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 @@ -64fe4cbfc9fb134ad088a10d4213a56d9386fa97 +1f478cf99e795a2e5b81ea5585f5e39b25c499d4 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 2015-07-27 16:47:50.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2015-08-24 10:58:39.000000000 +0200 @@ -272,9 +272,13 @@ if ($read_result{sysz_size}) { $syszip = $read_result{sysz_size}; } - if ($read_result{originXMLPath}) { - $this->{originXMLPath} = $read_result{originXMLPath}; - } + } + #========================================== + # read origin path of XML description + #------------------------------------------ + if (($system) && (open my $FD, '<', "$system/image/main::Prepare")) { + my $idesc = <$FD>; close $FD; + $this->{originXMLPath} = $idesc; } #========================================== # store systemdisk information 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-03 10:56:33.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-08-24 11:16:44.000000000 +0200 @@ -1811,7 +1811,6 @@ my $global = KIWIGlobals -> instance(); my $profile= $cmdL -> getBuildProfiles(); my $syszSize = 0; - my $originXMLPath; if ((! $system) || (! $cmdL)) { return; } @@ -1854,13 +1853,6 @@ $rootpath = $tmpdir; } #========================================== - # read origin path of XML description - #------------------------------------------ - if (open my $FD, '<', "$rootpath/image/main::Prepare") { - my $idesc = <$FD>; close $FD; - $originXMLPath = $idesc; - } - #========================================== # read and validate XML description #------------------------------------------ my $gdata = $global -> getKiwiConfig(); @@ -1910,8 +1902,7 @@ #------------------------------------------ my %result = ( "xml" => $xml, - "sysz_size" => $syszSize, - "originXMLPath" => $originXMLPath + "sysz_size" => $syszSize ); return %result; } @@ -1942,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.13"; + $data{Version} = "7.03.14"; $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/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2015-07-28 12:30:05.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-08-24 11:09:46.000000000 +0200 @@ -5419,7 +5419,13 @@ #====================================== # activate network #-------------------------------------- - local iface=$(cat /proc/net/dev|tail -n1|cut -d':' -f1|sed 's/ //g') + # Please note: It is assumed the last interface in the list is the + # one which should receive the interface config. While the loopback + # interface is skipped this could still result in an unexpected + # behavior. + local iface=$( + cat /proc/net/dev|grep -v lo:|tail -n1|cut -d':' -f1|sed 's/ //g' + ) if ! setupNic $iface $hostip $netmask;then if [ -e "$root" ];then Echo "Failed to set up the network: $iface" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISatSolver.pm new/kiwi/modules/KIWISatSolver.pm --- old/kiwi/modules/KIWISatSolver.pm 2014-12-15 14:32:47.000000000 +0100 +++ new/kiwi/modules/KIWISatSolver.pm 2015-08-06 17:44:31.000000000 +0200 @@ -231,6 +231,8 @@ # Create SaT pool #------------------------------------------ $pool = $this -> __createPool(); + # Help with debugging solver issues + # pool->set_debuglevel(5); #========================================== # Create SaT repos #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-repart new/kiwi/system/boot/armv7l/oemboot/suse-repart --- old/kiwi/system/boot/armv7l/oemboot/suse-repart 2015-07-27 12:01:23.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-repart 2015-08-06 17:44:31.000000000 +0200 @@ -650,6 +650,10 @@ if ! mkswap $imageSwapDevice 1>&2;then systemException "Failed to create swap signature" "reboot" fi + Echo "Activating swap space on $imageSwapDevice" + if ! swapon $imageSwapDevice 1>&2;then + Echo "Warning: Could not activate swap on $imageSwapDevice" + fi fi fi #======================================
