Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2017-04-11 09:28:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Tue Apr 11 09:28:44 2017 rev:656 rq:484033 version:7.04.30 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2017-03-18 20:47:51.324787272 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-04-11 09:28:48.319719941 +0200 @@ -1,0 +2,21 @@ +Fri Mar 24 09:32:39 CET 2017 - [email protected] + +- v7.04.30 released + +------------------------------------------------------------------- +Thu Mar 23 15:30:12 CET 2017 - [email protected] + +- Fixup boot setup in uefi mode + + Revert "Delete obsolete shim code from kiwi", because it was + not obsolete for setting up an iso image to boot via the shim + secure boot module. Also revert "Follow up fix for not writing + grub.cfg to EFI dir", as this is also needed for the setup + of an efi bootable iso image (bsc#1030740) + +------------------------------------------------------------------- +Thu Mar 9 16:22:44 CET 2017 - [email protected] + +- Fix doc typos + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.NrUjvC/_old 2017-04-11 09:28:49.703524506 +0200 +++ /var/tmp/diff_new_pack.NrUjvC/_new 2017-04-11 09:28:49.707523941 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.29 +Version: 7.04.30 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/docbook/xml/kiwi-doc-workflow.xml new/doc/docbook/xml/kiwi-doc-workflow.xml --- old/doc/docbook/xml/kiwi-doc-workflow.xml 2016-04-26 12:59:40.626492383 +0200 +++ new/doc/docbook/xml/kiwi-doc-workflow.xml 2017-03-23 14:56:53.819425596 +0100 @@ -912,7 +912,7 @@ class="element">package</sgmltag> element to <sgmltag class="attvalue">true</sgmltag>, as follows: </para> -<screen><packages type="image"/> +<screen><packages type="image"> <package name="<replaceable>PACKAGE</replaceable>" bootinclude="true"/> </packages></screen> </answer> @@ -943,7 +943,7 @@ the <sgmltag class="attribute">type</sgmltag> attribute set to <sgmltag class="attvalue">tools</sgmltag>, as follows: </para> -<screen><strip type="tools"/> +<screen><strip type="tools"> <file name="<replaceable>FILENAME</replaceable>"/> </strip></screen> <para> ++++++ 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 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 @@ -1 +1 @@ -55d2805f85eef2ec2193b61d125471ecf7e4170a +db1de55608c1e1e7586f6026226bf1f9e1d6cdee 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 2016-10-10 16:33:54.021424056 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2017-03-24 09:32:11.849423945 +0100 @@ -3933,6 +3933,80 @@ $kiwi -> done(); } #========================================== + # Use signed EFI modules from packages UEFI + #------------------------------------------ + if (($type eq 'iso') && ($firmware eq "uefi")) { + $kiwi -> info ("Importing grub2 shim/signed efi modules"); + my $s_data = $stages{efi}{data}; + my $s_shim_ms = $stages{efi}{shim_ms}; + my $s_shim_suse = $stages{efi}{shim_suse}; + my $s_signed = $stages{efi}{signed}; + my $fo_bin; + if ($arch eq 'x86_64') { + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { + $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo_bin = 'bootaa64.efi'; + } elsif ($arch =~ /arm/) { + $fo_bin = 'bootarm.efi'; + } + $result = 0; + if ($zipped) { + $status= KIWIQX::qxx ( + "$unzip | (cd $tmpdir && cpio -i -d $s_data 2>&1)" + ); + } else { + $status= KIWIQX::qxx ( + "cat $initrd | (cd $tmpdir && cpio -i -d $s_data 2>&1)" + ); + } + if ((! -e "$tmpdir/$s_shim_ms") && (! -e "$tmpdir/$s_shim_suse")) { + my $s_shim = "$tmpdir/$s_shim_ms"; + if (-e $s_shim) { + $s_shim = "$tmpdir/$s_shim_suse" + } + $kiwi -> failed (); + $kiwi -> error ( + "Can't find shim $s_shim in initrd"); + $kiwi -> failed (); + return; + } + if (! -e "$tmpdir/$s_signed") { + $kiwi -> failed (); + $kiwi -> error ( + "Can't find grub2 $s_signed in initrd"); + $kiwi -> failed (); + return; + } + $status = KIWIQX::qxx ( + "cp $tmpdir/$s_shim_ms $tmpdir/EFI/BOOT/$fo_bin 2>&1" + ); + $result = $? >> 8; + if ($result != 0) { + $status = KIWIQX::qxx ( + "cp $tmpdir/$s_shim_suse $tmpdir/EFI/BOOT/$fo_bin 2>&1" + ); + $result = $? >> 8; + } + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Failed to copy shim module: $status"); + $kiwi -> failed (); + return; + } + $status = KIWIQX::qxx ( + "cp $tmpdir/$s_signed $tmpdir/EFI/BOOT/grub.efi 2>&1"); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Failed to copy signed module: $status"); + $kiwi -> failed (); + return; + } + $kiwi -> done(); + } + #========================================== # Create OFW grub2 boot images #------------------------------------------ if ($firmware eq 'ofw') { @@ -4787,6 +4861,14 @@ } } $FD -> close(); + #========================================== + # copy grub2 config file to efi path too + #------------------------------------------ + if (($firmware eq "efi") || ($firmware eq "uefi")) { + KIWIQX::qxx ( + "cp $tmpdir/boot/$config/grub.cfg $tmpdir/EFI/BOOT 2>&1" + ); + } $kiwi -> done(); } #========================================== 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 2017-03-08 11:16:05.302678078 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2017-03-24 09:32:33.637501263 +0100 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.29"; + $data{Version} = "7.04.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/template/ix86/suse-SLE12-community-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2016-06-23 12:27:49.756159882 +0200 +++ new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2017-03-24 09:32:11.861423987 +0100 @@ -76,7 +76,7 @@ <vmnic driver="e1000" interface="0" mode="bridged"/> </machine> </type> - <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12" installiso="true" bootloader="grub2" firmware="efi" hybrid="true" kernelcmdline="splash"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12" installiso="true" bootloader="grub2" firmware="uefi" hybrid="true" kernelcmdline="splash"> <oemconfig> <oem-systemsize>2048</oem-systemsize> <oem-swap>true</oem-swap> @@ -134,6 +134,7 @@ <package name="systemd-sysvinit"/> <package name="dracut"/> <package name="wicked"/> + <package name="shim" bootinclude="true"/> <package name="iproute2"/> <package name="kiwi"/> <package name="kiwi-templates"/>
