Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-11-03 13:11:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-25 08:33:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-11-03 13:11:42.000000000 +0100 @@ -1,0 +2,46 @@ +Thu Oct 30 17:38:35 CET 2014 - chingpang@suse.de + +- Correct the loader type of grub2 + + For the UEFI machines, the loader type has to be "grub2-efi" to + make grub2-install search the efi modules. + +------------------------------------------------------------------- +Thu Oct 30 12:39:00 CET 2014 - ms@suse.de + +- v7.01.17 released + +------------------------------------------------------------------- +Thu Oct 30 12:37:45 CET 2014 - ms@suse.de + +- Activate efi support in suse-13.2-JeOS template + +------------------------------------------------------------------- +Thu Oct 30 10:34:42 CET 2014 - ms@suse.de + +- Fixed git tag helper + + report only first tag matching current version + +------------------------------------------------------------------- +Mon Oct 27 12:16:20 CET 2014 - ms@suse.de + +- Don't remove libdrm from boot images + +------------------------------------------------------------------- +Mon Oct 27 09:54:08 CET 2014 - schwab@suse.de + +- Set proper boot catalog in aarch64_efi + +------------------------------------------------------------------- +Fri Oct 24 11:30:44 CEST 2014 - ms@suse.de + +- Don't call makeIsoEFIBootable for product iso's + + The required data is provided by the installation-images-<distro> + package and doesn't need to be created. In addition the method + checks for the underlaying architecture which does not work when + creating product iso's because there the underlaying architecture + does not necessarily have to match the distro architecture + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.OiLETP/_old 2014-11-03 13:11:44.000000000 +0100 +++ /var/tmp/diff_new_pack.OiLETP/_new 2014-11-03 13:11:44.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.16 +Version: 7.01.17 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/.releasetags new/kiwi/.releasetags --- old/kiwi/.releasetags 2014-08-01 21:00:46.000000000 +0200 +++ new/kiwi/.releasetags 2014-10-30 10:34:28.000000000 +0100 @@ -6,7 +6,7 @@ ); do commit=$(echo $item | cut -f1 -d,) version=$(echo $item | cut -f2 -d,) - last_tagged=$(git tag --list --contains $commit 2>/dev/null) + last_tagged=$(git tag --list --contains $commit | head -n 1 2>/dev/null) if [ ! -z "$last_tagged" ];then echo "Current tagged version: $last_tagged" break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-09-16 20:39:43.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200 @@ -1 +1 @@ -246e906b77d90a76df5872eeea1c911ac611524e +e5780ac3778a5cef2c3e17f76e0750ca079dd730 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-09-08 20:54:44.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2014-10-27 12:16:13.000000000 +0100 @@ -308,6 +308,7 @@ <file name="libjpeg"/> <file name="libkms"/> <file name="libaio"/> + <file name="libdrm"/> </strip> </initrd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2014-10-26 10:15:14.000000000 +0100 @@ -843,11 +843,6 @@ # Just the first media is usually bootable at SUSE my $is_bootable = 0; if(-d "$this->{m_basesubdir}->{$cd}/boot") { - if(!$iso->makeIsoEFIBootable()) { - my $msg = 'Creating fat image for efi iso boot failed ' - . 'not efi bootable'; - $this->logMsg('W', $msg); - } if(!$iso->callBootMethods()) { my $msg = 'Creating boot methods failed, medium maybe ' . 'not be bootable'; @@ -1323,6 +1318,7 @@ print $XML $this->{m_appdata}; print $XML "$appdata_type>\n"; $XML -> close (); + return $this; } #========================================== 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 2014-10-22 11:50:20.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-30 12:38:56.000000000 +0100 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.16"; + $data{Version} = "7.01.17"; $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/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2014-10-06 21:29:00.000000000 +0200 +++ new/kiwi/modules/KIWIIsoLinux.pm 2014-10-27 15:18:11.000000000 +0100 @@ -404,6 +404,8 @@ $para.= " -no-emul-boot"; $para.= " -boot-load-size 1"; $para.= " -b $loader"; + $para.= " -c $boot/boot.catalog"; + $para.= " -hide $boot/boot.catalog -hide-joliet $boot/boot.catalog"; $this -> {params} = $para; 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 2014-10-22 11:19:41.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-10-30 11:59:29.000000000 +0100 @@ -2749,6 +2749,7 @@ local cmdline local timeout local vesa + local loader_type="grub2" #====================================== # vesa hex => resolution table #-------------------------------------- @@ -2886,6 +2887,7 @@ echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub ;; esac + loader_type="grub2-efi" fi #====================================== # write vesa vga setup @@ -2917,7 +2919,7 @@ #-------------------------------------- mkdir -p $destsPrefix/etc/sysconfig local sysb=$destsPrefix/etc/sysconfig/bootloader - echo "LOADER_TYPE=\"grub2\"" > $sysb + echo "LOADER_TYPE=\"$loader_type\"" > $sysb echo "LOADER_LOCATION=\"mbr\"" >> $sysb echo "DEFAULT_APPEND=\"$cmdline\"" >> $sysb echo "FAILSAFE_APPEND=\"$failsafe $cmdline\"" >> $sysb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-08-25 20:24:41.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-10-30 12:37:38.000000000 +0100 @@ -46,14 +46,14 @@ </type> </preferences> <preferences profiles="vmxFlavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2" format="vmdk" bootloader="grub2" kernelcmdline="splash" bootpartition="false"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2" format="vmdk" bootloader="grub2" kernelcmdline="splash" bootpartition="false" firmware="efi"> <systemdisk name="systemVG"/> <machine memory="512" guestOS="suse" HWversion="4"> <vmdisk id="0" controller="ide"/> <vmnic driver="e1000" interface="0" mode="bridged"/> </machine> </type> - <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2" installiso="true" bootloader="grub2" kernelcmdline="splash"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2" installiso="true" bootloader="grub2" kernelcmdline="splash" firmware="efi"> <oemconfig> <oem-systemsize>2048</oem-systemsize> <oem-swap>true</oem-swap> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org