Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-03-16 06:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-05 18:15:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-03-16 06:57:09.000000000 +0100 @@ -1,0 +2,87 @@ +Fri Mar 13 11:14:39 CET 2015 - [email protected] + +- v7.02.30 released + +------------------------------------------------------------------- +Thu Mar 12 14:46:10 CET 2015 - [email protected] + +- Fixed accident change in 13.2 JeOS + +------------------------------------------------------------------- +Thu Mar 12 12:01:40 CET 2015 - [email protected] + +- Cleanup calling basename + + Make sure basename is not called with a missing operand + +------------------------------------------------------------------- +Thu Mar 12 11:55:38 CET 2015 - [email protected] + +- Mount EFI partition only if not already mounted + +------------------------------------------------------------------- +Wed Mar 11 19:39:51 CET 2015 - [email protected] + +- Update elilo compat mode + + Support copy of vendor specific EFI boot config + In addition use the oem boot title as title for the + elilo configuration too + +------------------------------------------------------------------- +Tue Mar 10 11:34:15 CET 2015 - [email protected] + +- Fixed boot deleting packages + + A package marked with the bootdelete="true" flag was not removed + from the boot image if it was placed in the <delete> section of + the system image. + +------------------------------------------------------------------- +Fri Mar 6 16:19:45 CET 2015 - [email protected] + +- v7.02.29 released + +------------------------------------------------------------------- +Thu Mar 5 11:47:52 CET 2015 - [email protected] + +- Move loader install tool check to the right place + + Only if a bootloader must be installed check if the tool + to perform the call is present on the host + +------------------------------------------------------------------- +Thu Mar 5 11:27:55 CET 2015 - [email protected] + +- dhclient has no option for timeout + + The dhclient in openSUSE 13.2 has no parameter for timeout, but it + is specified in the setupNetworkDHCLIENT function. The timeout is + taken from the configuration file as mentioned in the manpage. + +------------------------------------------------------------------- +Wed Mar 4 16:52:47 CET 2015 - [email protected] + +- Fixed __checkSelectedBootLoaderIncluded check + + The runtime check for grub2 has the choice for several packages + Especially on SLE11 only grub2-x86_64-efi exists. + +------------------------------------------------------------------- +Wed Mar 4 16:38:22 CET 2015 - [email protected] + +- Increase the EFI/vboot fat partition + + Instead of 32MB use 200MB to allow holding a little more + data like firmware and/or loaders + +------------------------------------------------------------------- +Wed Mar 4 14:06:25 CET 2015 - [email protected] + +- Fix consistency check for LXC builds + + Prior to the emergence of systemd the lxc package provided a special + init script, lxc-init. This was necessary as SysV-init was not container + aware. systemd is container aware, thus including systemd as the init + system is sufficient. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.gBrcmx/_old 2015-03-16 06:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.gBrcmx/_new 2015-03-16 06:57:11.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.28 +Version: 7.02.30 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ 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 @@ -3f60936dcfcac28fa8e6e9d2682cef66eb614f28 +d00514db7fedee93fd432c38f8578d0442201f9f 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-02-25 11:39:26.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2015-03-05 11:47:32.000000000 +0100 @@ -1977,7 +1977,7 @@ ($firmware eq "uefi") || ($firmware eq "vboot") ) { - $this->{jumpsize} = 32; + $this->{jumpsize} = 200; $this -> __updateDiskSize ($this->{jumpsize}); $needJumpP = 1; } @@ -5570,11 +5570,6 @@ $grubtool = $locator -> getExecPath ('grub2-install'); $grubarch = "powerpc-ieee1275"; } - if (! $grubtool) { - $kiwi -> error ("Mandatory $grubtool not found"); - $kiwi -> failed (); - return; - } #========================================== # Mount boot partition #------------------------------------------ @@ -5647,6 +5642,11 @@ } } if ($loaderTarget) { + if (! $grubtool) { + $kiwi -> error ("Mandatory $grubtool not found"); + $kiwi -> failed (); + return; + } $kiwi -> info ("Installing grub2:\n"); $kiwi -> info ("--> $targetMessage: $loaderTarget\n"); $status = KIWIQX::qxx ( 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-03-03 10:50:17.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-03-13 11:14:33.000000000 +0100 @@ -1853,7 +1853,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.28"; + $data{Version} = "7.02.30"; $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-01-27 16:32:19.000000000 +0100 +++ new/kiwi/modules/KIWIImageCreator.pm 2015-03-10 11:25:13.000000000 +0100 @@ -1726,6 +1726,7 @@ my $bootArchives = $systemXML -> getBootIncludeArchives(); my $bootAddPacks = $systemXML -> getBootIncludePackages(); my $bootDelPacks = $systemXML -> getBootDeletePackages(); + my $systemDelPacks = $systemXML -> getPackagesToDelete(); my @addPacks = (); if (@{$bootArchives}) { $kiwi -> info ("Boot including archive(s) [bootstrap]:\n"); @@ -1754,14 +1755,6 @@ } $bootXML -> addBootstrapPackages ($bootAddPacks); } - if (@{$bootDelPacks}) { - $kiwi -> info ("Boot included package(s) marked for deletion:\n"); - for my $package (@{$bootDelPacks}) { - my $name = $package -> getName(); - $kiwi -> info ("--> $name\n"); - } - $bootXML -> addPackagesToDelete ($bootDelPacks); - } my $deletePackages = $bootXML -> getPackagesToDelete(); if (($deletePackages) && (@addPacks)) { my @resultDeletePackages; @@ -1792,6 +1785,24 @@ $bootXML -> setPackagesToDelete (\@resultDeletePackages); } } + if ($systemDelPacks) { + # check if there are packages marked as bootdelete in the delete + # section and add them to the bootDelPacks list + for my $package (@{$systemDelPacks}) { + my $bootdelete = $package -> getBootDelete(); + if (($bootdelete) && ($bootdelete eq 'true')) { + push @{$bootDelPacks}, $package + } + } + } + if (@{$bootDelPacks}) { + $kiwi -> info ("Boot included package(s) marked for deletion:\n"); + for my $package (@{$bootDelPacks}) { + my $name = $package -> getName(); + $kiwi -> info ("--> $name\n"); + } + $bootXML -> addPackagesToDelete ($bootDelPacks); + } return $this; } #========================================== 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-02-11 17:10:01.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-03-12 12:01:17.000000000 +0100 @@ -1118,7 +1118,9 @@ # check for elilo compat mode #-------------------------------------- if [ $isEFI -eq 1 ] && [ -e $product ] && [ -e $elilo_efi ];then - product=$(readlink $product) + local product=$(readlink $product) + local vendor=SuSE + local efipath=/boot/efi/EFI if [[ "$product" =~ "SUSE_SLE" ]];then #====================================== # write elilo.conf @@ -1132,7 +1134,7 @@ # Modified by YaST2. timeout = $timeout ##YaST - boot_efilabel = "SUSE Linux Enterprise Server 11" -vendor-directory = BOOT +vendor-directory = $vendor secure-boot = on prompt image = /boot/vmlinuz @@ -1140,9 +1142,13 @@ initrd = /boot/initrd label = linux append = "$GRUB_CMDLINE_LINUX_DEFAULT" -description = Linux +description = "$kiwi_oemtitle" root = $(getDiskID $imageRootDevice) EOF + #==================================================== + # copy vendor directory + #---------------------------------------------------- + cp -a $efipath/BOOT $efipath/$vendor #====================================== # update sysconfig/bootloader #-------------------------------------- @@ -1162,6 +1168,12 @@ # title for this system # ---- elilo --refresh-EBM -vv + #==================================================== + # create versionized kernel/initrd + #---------------------------------------------------- + local kversion=$(uname -r) + cp -a $efipath/$vendor/vmlinuz $efipath/$vendor/vmlinuz-$kversion + cp -a $efipath/$vendor/initrd $efipath/$vendor/initrd-$kversion #====================================== # return early for elilo case #-------------------------------------- @@ -3837,8 +3849,8 @@ continue fi isremovable=$description/removable - storageID=`echo $description | cut -f1 -d: | xargs basename` - devicebID=`basename $description | cut -f2 -d:` + storageID=$(echo $description | cut -f1 -d: | xargs basename) + devicebID=$(basename $description | cut -f2 -d:) if [ $devicebID = "block" ];then devicebID=`ls -1 $description` isremovable=$description/$devicebID/removable @@ -4979,7 +4991,7 @@ # assign DHCP IP address by using the dhclient tool # ---- local IFS=$IFS_ORIG - local dhclient_opts=" -4 -1 -q -timeout 20" + local dhclient_opts=" -4 -1 -q" mkdir -p /var/lib/dhclient mkdir -p /var/run for try_iface in ${dev_list[*]}; do @@ -5724,7 +5736,7 @@ fi unset kernel unset initrd - kname=`basename $i` + kname=$(basename "$i") if [ "$kname" = $krunning ];then continue fi @@ -7468,7 +7480,7 @@ continue fi local dev=$(readlink $i) - dev=/dev/$(basename $dev) + dev=/dev/$(basename "$dev") if [ $dev = $device ];then echo $i return @@ -7486,7 +7498,7 @@ continue fi local dev=$(readlink $i) - dev=/dev/$(basename $dev) + dev=/dev/$(basename "$dev") if [ $dev = $device ];then echo $i return @@ -8231,7 +8243,7 @@ # no map name set, build it from device #-------------------------------------- if [ -z "$name" ];then - name=luks_$(basename $ldev) + name=luks_$(basename "$ldev") fi #====================================== # luks map already exists, return @@ -8316,7 +8328,7 @@ # close all luks* map names #-------------------------------------- for i in /dev/mapper/luks*;do - name=$(basename $i) + name=$(basename "$i") cryptsetup luksClose $name done } 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-02-16 10:46:34.000000000 +0100 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-03-05 11:55:00.000000000 +0100 @@ -373,12 +373,12 @@ my $xml = $this->{xml}; my $kiwi = $this->{kiwi}; my %loaderPackages = ( - 'grub' => 'grub', - 'grub2' => 'grub2', - 'extlinux' => 'syslinux', - 'syslinux' => 'syslinux', - 'zipl' => 's390-tools', - 'uboot' => 'u-boot-tools' + 'grub' => ['grub'], + 'grub2' => ['grub2', 'grub2-x86_64-efi'], + 'extlinux' => ['syslinux'], + 'syslinux' => ['syslinux'], + 'zipl' => ['s390-tools'], + 'uboot' => ['u-boot-tools'] ); my $msg; my $type = $xml -> getImageType(); @@ -390,20 +390,22 @@ return 1; } my $bootloader = $type -> getBootLoader(); - my $loaderPackage = $loaderPackages{$bootloader}; - if (! $loaderPackage) { + my $loaderPackage_list = $loaderPackages{$bootloader}; + if (! $loaderPackage_list) { return 1; } my $pckgs = $xml -> getPackages(); push @{$pckgs}, @{$xml -> getBootstrapPackages()}; for my $pckg (@{$pckgs}) { my $pname = $pckg -> getName(); - if ($pname eq $loaderPackage) { - return 1; + foreach my $loaderPackage (@{$loaderPackage_list}) { + if ($pname eq $loaderPackage) { + return 1; + } } } - $msg = "Selected bootloader is $bootloader, but required "; - $msg.= "package $loaderPackage is not included in image."; + $msg = "Selected bootloader is $bootloader, but the required "; + $msg.= "package(s) @{$loaderPackage_list} are not included in the image."; $kiwi -> error ( $msg ); $kiwi -> failed (); return; @@ -428,13 +430,13 @@ push @{$pckgs}, @{$xml -> getBootstrapPackages()}; for my $pckg (@{$pckgs}) { my $pname = $pckg -> getName(); - if ($pname =~ /^lxc/smx) { + if ($pname =~ /^lxc|^systemd/smx) { return 1; } } my $kiwi = $this->{kiwi}; - my $msg = 'Attempting to build container, but no lxc package included ' - . 'in image.'; + my $msg = 'Attempting to build container, neither systemd nor the ' + . 'lxc package is included in the image.'; $kiwi -> error ( $msg ); $kiwi -> failed (); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-preinit new/kiwi/system/boot/armv7l/oemboot/suse-preinit --- old/kiwi/system/boot/armv7l/oemboot/suse-preinit 2014-12-15 14:32:48.000000000 +0100 +++ new/kiwi/system/boot/armv7l/oemboot/suse-preinit 2015-03-12 11:53:45.000000000 +0100 @@ -107,7 +107,7 @@ label=$(blkid $jdev -s LABEL -o value) if [ "$label" = "EFI" ];then mkdir -p /boot/efi - if ! mount $jdev /boot/efi;then + if ! mountpoint -q /boot/efi && ! mount $jdev /boot/efi;then systemException "Failed to mount EFI boot partition" "reboot" fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-preinit new/kiwi/system/boot/ix86/oemboot/rhel-preinit --- old/kiwi/system/boot/ix86/oemboot/rhel-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-preinit 2015-03-12 11:53:04.000000000 +0100 @@ -107,7 +107,7 @@ label=$(blkid $jdev -s LABEL -o value) if [ "$label" = "EFI" ];then mkdir -p /boot/efi - if ! mount $jdev /boot/efi;then + if ! mountpoint -q /boot/efi && ! mount $jdev /boot/efi;then systemException "Failed to mount EFI boot partition" "reboot" fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit --- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2015-03-12 11:50:58.000000000 +0100 @@ -107,7 +107,7 @@ label=$(blkid $jdev -s LABEL -o value) if [ "$label" = "EFI" ];then mkdir -p /boot/efi - if ! mount $jdev /boot/efi;then + if ! mountpoint -q /boot/efi && ! mount $jdev /boot/efi;then systemException "Failed to mount EFI boot partition" "reboot" fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-preinit new/kiwi/system/boot/ppc/oemboot/suse-preinit --- old/kiwi/system/boot/ppc/oemboot/suse-preinit 2014-12-15 14:32:49.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-preinit 2015-03-12 11:53:38.000000000 +0100 @@ -107,7 +107,7 @@ label=$(blkid $jdev -s LABEL -o value) if [ "$label" = "EFI" ];then mkdir -p /boot/efi - if ! mount $jdev /boot/efi;then + if ! mountpoint -q /boot/efi && ! mount $jdev /boot/efi;then systemException "Failed to mount EFI boot partition" "reboot" fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit --- old/kiwi/system/boot/s390/oemboot/suse-preinit 2014-12-15 14:32:50.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2015-03-12 11:53:29.000000000 +0100 @@ -120,7 +120,7 @@ label=$(blkid $jdev -s LABEL -o value) if [ "$label" = "EFI" ];then mkdir -p /boot/efi - if ! mount $jdev /boot/efi;then + if ! mountpoint -q /boot/efi && ! mount $jdev /boot/efi;then systemException "Failed to mount EFI boot partition" "reboot" fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiRuntimeChecker.pm new/kiwi/tests/unit/lib/Test/kiwiRuntimeChecker.pm --- old/kiwi/tests/unit/lib/Test/kiwiRuntimeChecker.pm 2014-12-15 14:32:51.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiRuntimeChecker.pm 2015-03-05 11:55:00.000000000 +0100 @@ -240,8 +240,8 @@ my $checker = KIWIRuntimeChecker -> new($cmd, $xml); $res = $checker -> __checkContainerHasLXC(); my $msg = $kiwi -> getMessage(); - my $expected = 'Attempting to build container, but no lxc package ' - . 'included in image.'; + my $expected = 'Attempting to build container, neither systemd nor the ' + . 'lxc package is included in the image.'; $this -> assert_str_equals($expected, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('error', $msgT); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
