Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-07-28 23:44:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-07-14 09:42:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-07-28 23:45:00.000000000 +0200 @@ -1,0 +2,85 @@ +Mon Jul 18 12:23:59 CEST 2016 - m...@suse.de + +- v7.03.82 released + +------------------------------------------------------------------- +Mon Jul 18 12:09:41 CEST 2016 - m...@suse.de + +- Fixed changelog generator + +------------------------------------------------------------------- +Mon Jul 18 11:08:21 CEST 2016 - m...@suse.de + +- v7.03.81 released + +------------------------------------------------------------------- +Mon Jul 18 11:06:09 CEST 2016 - m...@suse.de + +- Don't ask to start recovery in unattended mode + +------------------------------------------------------------------- +Sun Jul 17 20:02:29 CEST 2016 - m...@suse.de + +- Fixed __checkSelectedBootLoaderIncluded check + + When explicitly specifying in config.xml the version of + grub to be used, the __checkSelectedBootLoaderIncluded() + function in KIWIRuntimeChecker.pm doesn't work properly. + This issue is that the comparison is done against + "grub=<version>" which will never match "grub" + +------------------------------------------------------------------- +Wed Jul 13 12:56:17 CEST 2016 - andrey.ara...@nixaid.com + +- insserv is not a chkconfig + +------------------------------------------------------------------- +Mon Jul 11 13:54:41 CEST 2016 - m...@suse.de + +- v7.03.80 released + +------------------------------------------------------------------- +Sun Jul 10 09:10:21 CEST 2016 - cyber...@opensuse.org + +- prefer newer overlayfs, otherwise mount succeeds in compat mode but live image fail to boot/exhibit weird symptoms + +------------------------------------------------------------------- +Sat Jul 9 16:45:29 CEST 2016 - cyber...@opensuse.org + +- prefer newer overlayfs, otherwise mount succeeds in compat mode but live image fail to boot/exhibit weird symptoms + +------------------------------------------------------------------- +Fri Jul 8 10:15:49 CEST 2016 - m...@suse.de + +- v7.03.79 released + +------------------------------------------------------------------- +Fri Jul 8 10:15:20 CEST 2016 - m...@suse.de + +- Message commit for bug reference + + Fixup of VMware disk tag references (bnc#988087) + +------------------------------------------------------------------- +Fri Jul 8 09:43:58 CEST 2016 - m...@suse.de + +- v7.03.78 released + +------------------------------------------------------------------- +Wed Jul 6 14:05:09 CEST 2016 - jma...@suse.com + +- Conditionally prefix encoding to vmware disk tag + + Prior code was always adding the encoding statement to vmware disk tag; + in the event it is already present there's no need to add it a second time. + +------------------------------------------------------------------- +Wed Jul 6 14:00:34 CEST 2016 - jma...@suse.com + +- Remove null padding on the vmware disk tag + + The block of data read via dd is null padded; adding the tools data after + the padding breaks detection of the data. We need to remove the nulls (0x0) + so appends can occur adjacent to the block of strings. + +------------------------------------------------------------------- @@ -38 +123 @@ -Fri Jun 17 12:36:00 CEST 2016 - k...@suse.de +Fri Jun 17 12:36:00 CEST 2016 - k...@opensuse.org @@ -47 +132 @@ -Fri Jun 17 12:30:50 CEST 2016 - k...@suse.de +Fri Jun 17 12:30:50 CEST 2016 - k...@opensuse.org @@ -91 +176 @@ -Mon Jun 6 11:17:08 CEST 2016 - i...@suse.de +Mon Jun 6 11:17:08 CEST 2016 - i...@marguerite.su @@ -98 +183 @@ -Mon Jun 6 11:14:01 CEST 2016 - i...@suse.de +Mon Jun 6 11:14:01 CEST 2016 - i...@marguerite.su @@ -167 +252 @@ -Thu May 5 21:34:14 CEST 2016 - dmuel...@suse.de +Thu May 5 21:34:14 CEST 2016 - dmuel...@suse.com @@ -182 +267 @@ -Mon May 2 17:05:43 CEST 2016 - dval...@suse.de +Mon May 2 17:05:43 CEST 2016 - dval...@suse.com @@ -207 +292 @@ -Mon Apr 25 08:08:18 CEST 2016 - x...@suse.de +Mon Apr 25 08:08:18 CEST 2016 - x...@naver.com @@ -277 +362 @@ -Mon Apr 11 08:35:23 CEST 2016 - alexandros.v...@suse.de +Mon Apr 11 08:35:23 CEST 2016 - alexandros.v...@gmail.com @@ -302 +387 @@ -Thu Mar 31 16:37:31 CEST 2016 - x...@suse.de +Thu Mar 31 16:37:31 CEST 2016 - x...@naver.com @@ -309 +394 @@ -Thu Mar 31 06:05:34 CEST 2016 - malh...@suse.de +Thu Mar 31 06:05:34 CEST 2016 - malh...@gmail.com @@ -316 +401 @@ -Wed Mar 30 12:23:24 CEST 2016 - n...@suse.de +Wed Mar 30 12:23:24 CEST 2016 - n...@unseen.is @@ -323 +408 @@ -Sat Mar 26 23:53:24 CET 2016 - eiosifi...@suse.de +Sat Mar 26 23:53:24 CET 2016 - eiosifi...@gmail.com @@ -335 +420 @@ -Mon Mar 21 15:15:27 CET 2016 - christian.brau...@suse.de +Mon Mar 21 15:15:27 CET 2016 - christian.brau...@mailbox.org @@ -412 +497 @@ -Fri Mar 4 18:47:53 CET 2016 - asa...@suse.de +Fri Mar 4 18:47:53 CET 2016 - asa...@suse.com @@ -423 +508 @@ -Fri Mar 4 17:27:33 CET 2016 - asa...@suse.de +Fri Mar 4 17:27:33 CET 2016 - asa...@suse.com @@ -437 +522 @@ -Fri Mar 4 16:42:05 CET 2016 - asa...@suse.de +Fri Mar 4 16:42:05 CET 2016 - asa...@suse.com @@ -502 +587 @@ -Tue Mar 1 14:39:09 CET 2016 - apla...@suse.de +Tue Mar 1 14:39:09 CET 2016 - apla...@suse.com @@ -509 +594 @@ -Tue Mar 1 14:33:18 CET 2016 - apla...@suse.de +Tue Mar 1 14:33:18 CET 2016 - apla...@suse.com @@ -536 +621 @@ -Thu Feb 25 14:48:14 CET 2016 - guillaume.gar...@suse.de +Thu Feb 25 14:48:14 CET 2016 - guillaume.gar...@opensuse.org @@ -543 +628 @@ -Tue Feb 23 14:03:33 CET 2016 - cyber...@suse.de +Tue Feb 23 14:03:33 CET 2016 - cyber...@opensuse.org @@ -548 +633 @@ -Tue Feb 23 13:11:10 CET 2016 - cyber...@suse.de +Tue Feb 23 13:11:10 CET 2016 - cyber...@opensuse.org @@ -587 +672 @@ -Sun Feb 21 22:04:30 CET 2016 - dmuel...@suse.de +Sun Feb 21 22:04:30 CET 2016 - dmuel...@suse.com @@ -596 +681 @@ -Sat Feb 20 21:29:02 CET 2016 - dmuel...@suse.de +Sat Feb 20 21:29:02 CET 2016 - dmuel...@suse.com @@ -604 +689 @@ -Sat Feb 20 21:20:24 CET 2016 - dmuel...@suse.de +Sat Feb 20 21:20:24 CET 2016 - dmuel...@suse.com @@ -620 +705 @@ -Wed Feb 17 13:42:29 CET 2016 - robert.pasche...@suse.de +Wed Feb 17 13:42:29 CET 2016 - robert.pasche...@web.de @@ -637 +722 @@ -Sat Feb 13 09:04:18 CET 2016 - atalantt...@suse.de +Sat Feb 13 09:04:18 CET 2016 - atalantt...@googlemail.com @@ -645 +730 @@ -Thu Feb 11 17:26:39 CET 2016 - atalantt...@suse.de +Thu Feb 11 17:26:39 CET 2016 - atalantt...@googlemail.com @@ -651 +736 @@ -Thu Feb 11 17:01:58 CET 2016 - atalantt...@suse.de +Thu Feb 11 17:01:58 CET 2016 - atalantt...@googlemail.com @@ -670 +755 @@ -Wed Feb 10 14:19:35 CET 2016 - rjsch...@suse.de +Wed Feb 10 14:19:35 CET 2016 - rjsch...@suse.com @@ -957 +1042 @@ -Sat Dec 26 13:55:55 CET 2015 - cyber...@suse.de +Sat Dec 26 13:55:55 CET 2015 - cyber...@opensuse.org @@ -1086 +1171 @@ -Sat Dec 19 18:56:13 CET 2015 - martin.koeg...@suse.de +Sat Dec 19 18:56:13 CET 2015 - martin.koeg...@chello.at @@ -1091 +1176 @@ -Sat Dec 19 18:13:43 CET 2015 - martin.koeg...@suse.de +Sat Dec 19 18:13:43 CET 2015 - martin.koeg...@chello.at @@ -1122 +1207 @@ -Wed Dec 16 08:46:31 CET 2015 - martin.koeg...@suse.de +Wed Dec 16 08:46:31 CET 2015 - martin.koeg...@chello.at @@ -1147 +1232 @@ -Tue Dec 15 09:12:59 CET 2015 - martin.koeg...@suse.de +Tue Dec 15 09:12:59 CET 2015 - martin.koeg...@chello.at @@ -1185 +1270 @@ -Sun Dec 6 01:08:19 CET 2015 - jo...@suse.de +Sun Dec 6 01:08:19 CET 2015 - jo...@ekhorva.se @@ -1289 +1374 @@ -Sat Nov 28 11:15:34 CET 2015 - seife+...@suse.de +Sat Nov 28 11:15:34 CET 2015 - seife+...@b1-sytems.com @@ -1301 +1386 @@ -Fri Nov 27 11:28:18 CET 2015 - seife+...@suse.de +Fri Nov 27 11:28:18 CET 2015 - seife+...@b1-sytems.com @@ -1317 +1402 @@ ++++ 1478 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.TP33Gk/_old 2016-07-28 23:45:02.000000000 +0200 +++ /var/tmp/diff_new_pack.TP33Gk/_new 2016-07-28 23:45:02.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.77 +Version: 7.03.82 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 18075 lines of diff (skipped) ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.changelog new/kiwi/.changelog --- old/kiwi/.changelog 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/.changelog 2016-07-18 12:15:51.000000000 +0200 @@ -17,8 +17,15 @@ if ($line =~ /^Merge|Conflicts/) { $ignore = 2; } - if (($ignore < 2) && ($line =~ /^Author: .*<(.*)@.*>/)) { + if (($ignore < 2) && ($line =~ /^Author: .*<(.*)@(.*)>/)) { $name = $1; + $add = $2; + if ($name eq 'ms') { + # for ms as contributor use suse.de domain in any case + # prevents incompatible changes to the changelog already + # published + $add = 'suse.de' + } $ignore = 1; } next if ($ignore); @@ -33,7 +40,7 @@ } my $date = qx /date --date="$1"/; chomp $date; push @out, "------------------------------------------------------------------\n"; - push @out, "$date - $name\@suse.de\n"; + push @out, "$date - $name\@$add\n"; undef $date; $ignore = 0; $count = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2016-01-01 17:37:14.000000000 +0100 +++ new/kiwi/.revision 2016-04-18 16:58:06.000000000 +0200 @@ -1 +1 @@ -fce0296a7d7af3ded84f59db9c45970a06f22f9b +06e3e5305b9fd443834175f8cae1ff5ed8f59a30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIContainerBuilder.pm new/kiwi/modules/KIWIContainerBuilder.pm --- old/kiwi/modules/KIWIContainerBuilder.pm 2016-06-15 21:42:08.000000000 +0200 +++ new/kiwi/modules/KIWIContainerBuilder.pm 2016-07-18 09:27:33.000000000 +0200 @@ -707,7 +707,7 @@ my $locator = $this->{locator}; $kiwi -> info("Disable unwanted services\n"); my $sysctl = $locator -> getExecPath('systemctl', $targetDir); - my $ins = $locator -> getExecPath('chkconfig', $targetDir); + my $ins = $locator -> getExecPath('insserv', $targetDir); my $croot = $locator -> getExecPath('chroot'); if (defined $sysctl) { my @srvs = qw ( 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 2016-07-06 09:04:03.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2016-07-18 12:23:53.000000000 +0200 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.77"; + $data{Version} = "7.03.82"; $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 2016-03-15 18:47:27.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2016-07-08 09:43:46.000000000 +0200 @@ -1548,8 +1548,12 @@ $kiwi -> failed (); return } + $data =~ s/\0*$//; my @descriptor_lines = split(/\n/, $data); - unshift (@descriptor_lines, 'encoding="UTF-8"'); + + if ($descriptor_lines[0] ne 'encoding="UTF-8"') { + unshift (@descriptor_lines, 'encoding="UTF-8"'); + } push (@descriptor_lines, "ddb.toolsInstallType = \"$ddb_install_type\""); push (@descriptor_lines, "ddb.toolsVersion = \"$ddb_tools_version\""); 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 2016-07-06 08:46:15.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-07-18 09:27:33.000000000 +0200 @@ -6674,17 +6674,22 @@ #====================================== # setup overlayfs mount #-------------------------------------- - local opts="rw,lowerdir=$roDir,upperdir=$rwDir" - if ! mount -t overlayfs -o $opts overlayfs $prefix;then - # overlayfs in version >= v22 behaves differently - # + renamed from overlayfs to overlay - # + requires a workdir to become mounted - # + requires workdir and upperdir to reside under the same mount - # + requires workdir and upperdir to be in separate subdirs - mkdir -p $rwDir/work - mkdir -p $rwDir/rw - opts="rw,lowerdir=$roDir,upperdir=$rwDir/rw,workdir=$rwDir/work" - if ! mount -t overlay -o $opts overlay $prefix;then + # overlayfs in version >= v22 behaves differently + # + renamed from overlayfs to overlay + # + requires a workdir to become mounted + # + requires workdir and upperdir to reside under the same mount + # + requires workdir and upperdir to be in separate subdirs + # try new mode first, if that fails then fallback to old style + mkdir -p $rwDir/work + mkdir -p $rwDir/rw + local opts="rw,lowerdir=$roDir,upperdir=$rwDir/rw,workdir=$rwDir/work" + if ! mount -t overlay -o $opts overlay $prefix;then + # overlayfs in version < v22 fallback/compat mode + # + does not require a workdir + rm -rf $rwDir/work + rm -rf $rwDir/rw + opts="rw,lowerdir=$roDir,upperdir=$rwDir" + if ! mount -t overlayfs -o $opts overlayfs $prefix;then Echo "Failed to mount root via overlayfs" return 1 fi 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-12-04 19:53:47.000000000 +0100 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2016-07-18 09:27:33.000000000 +0200 @@ -442,6 +442,8 @@ push @{$pckgs}, @{$xml -> getBootstrapPackages()}; for my $pckg (@{$pckgs}) { my $pname = $pckg -> getName(); + my $version; + ($pname, $version) = split(/=/,$pname); foreach my $loaderPackage (@{$loaderPackage_list}) { if ($pname eq $loaderPackage) { return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-12-09 17:10:13.000000000 +0100 +++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2016-07-18 11:05:35.000000000 +0200 @@ -341,11 +341,13 @@ if [ ! -z "$RESTORE" ];then text=$TEXT_RESTORE fi - Dialog --defaultno --yesno "\"$text\"" 5 50 - if [ ! $? = 0 ];then - systemException "System-Recovery not started" "reboot" + if [ "$kiwi_oemunattended" != "true" ]; then + Dialog --defaultno --yesno "\"$text\"" 5 50 + if [ ! $? = 0 ];then + systemException "System-Recovery not started" "reboot" + fi + clear fi - clear Echo "Starting System-Recovery/Restore..." #====================================== # 15.1) mount recovery partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-12-09 17:11:18.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2016-07-18 11:04:19.000000000 +0200 @@ -341,11 +341,13 @@ if [ ! -z "$RESTORE" ];then text=$TEXT_RESTORE fi - Dialog --defaultno --yesno "\"$text\"" 5 50 - if [ ! $? = 0 ];then - systemException "System-Recovery not started" "reboot" + if [ "$kiwi_oemunattended" != "true" ]; then + Dialog --defaultno --yesno "\"$text\"" 5 50 + if [ ! $? = 0 ];then + systemException "System-Recovery not started" "reboot" + fi + clear fi - clear Echo "Starting System-Recovery/Restore..." #====================================== # 15.1) mount recovery partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-12-09 17:10:26.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2016-07-18 11:05:24.000000000 +0200 @@ -341,11 +341,13 @@ if [ ! -z "$RESTORE" ];then text=$TEXT_RESTORE fi - Dialog --defaultno --yesno "\"$text\"" 5 50 - if [ ! $? = 0 ];then - systemException "System-Recovery not started" "reboot" + if [ "$kiwi_oemunattended" != "true" ]; then + Dialog --defaultno --yesno "\"$text\"" 5 50 + if [ ! $? = 0 ];then + systemException "System-Recovery not started" "reboot" + fi + clear fi - clear Echo "Starting System-Recovery/Restore..." #====================================== # 15.1) mount recovery partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-12-09 17:10:56.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2016-07-18 11:05:28.000000000 +0200 @@ -345,11 +345,13 @@ if [ ! -z "$RESTORE" ];then text=$TEXT_RESTORE fi - Dialog --defaultno --yesno "\"$text\"" 5 50 - if [ ! $? = 0 ];then - systemException "System-Recovery not started" "reboot" + if [ "$kiwi_oemunattended" != "true" ]; then + Dialog --defaultno --yesno "\"$text\"" 5 50 + if [ ! $? = 0 ];then + systemException "System-Recovery not started" "reboot" + fi + clear fi - clear Echo "Starting System-Recovery/Restore..." #====================================== # 15.1) mount recovery partition