Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2013-02-08 07:10:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-02-07
14:21:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-02-08
07:10:35.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Feb 7 16:29:55 CET 2013 - m...@suse.de
+
+- v5.04.41 released
+
+-------------------------------------------------------------------
+Thu Feb 7 16:11:54 CET 2013 - m...@suse.de
+
+- fixed search path for UEFI signed shim.efi and grub.efi
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.k8ImWG/_old 2013-02-08 07:10:38.000000000 +0100
+++ /var/tmp/diff_new_pack.k8ImWG/_new 2013-02-08 07:10:38.000000000 +0100
@@ -26,7 +26,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.04.40
+Version: 5.04.41
Release: 0
# requirements to build packages
BuildRequires: e2fsprogs
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100
+++ new/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100
@@ -1 +1 @@
-864f0b0d025a9e372f3bc3ef9699d46cfefbc274
+bd4052b3ff5f7baa39c01f7e4a5851ed4cd57b92
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 2013-02-07 10:34:44.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2013-02-07 16:30:24.000000000 +0100
@@ -3294,6 +3294,7 @@
my %stages = ();
my $test = "cat $initrd";
my $grub = 'grub2-efi';
+ my $lib = 'lib';
if ($zipped) {
$test = $unzip;
}
@@ -3302,6 +3303,11 @@
if ($result != 0) {
$grub = 'grub2';
}
+ $status = qxx ("$test | cpio -it | grep -q lib64/efi 2>&1");
+ $result = $? >> 8;
+ if ($result == 0) {
+ $lib = 'lib64';
+ }
#==========================================
# boot id in grub2 context
#------------------------------------------
@@ -3321,9 +3327,9 @@
$stages{efi}{stageDST} = "/boot/grub2-efi/$efipc";
}
if ($firmware eq "uefi") {
- $stages{efi}{data} = "'usr/lib/efi/*'";
- $stages{efi}{shim} = "usr/lib/efi/shim.efi";
- $stages{efi}{signed} = "usr/lib/efi/grub.efi";
+ $stages{efi}{data} = "'usr/$lib/efi/*'";
+ $stages{efi}{shim} = "usr/$lib/efi/shim.efi";
+ $stages{efi}{signed} = "usr/$lib/efi/grub.efi";
}
#==========================================
# Boot directories
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 2013-02-07 10:34:44.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2013-02-07 16:30:24.000000000 +0100
@@ -927,7 +927,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.04.40";
+ $data{Version} = "5.04.41";
$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/KIWIImage.pm
new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2013-02-07 10:34:44.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2013-02-07 16:30:24.000000000 +0100
@@ -2181,8 +2181,12 @@
$kiwi -> done();
} else {
$kiwi -> info ("Importing grub2 shim/signed efi
modules");
- my $s_shim = "$tmpdir/usr/lib/efi/shim.efi";
- my $s_signed = "$tmpdir/usr/lib/efi/grub.efi";
+ my $lib = 'lib';
+ if ( -d "$tmpdir/usr/lib64" ) {
+ $lib = 'lib64';
+ }
+ my $s_shim = "$tmpdir/usr/$lib/efi/shim.efi";
+ my $s_signed = "$tmpdir/usr/$lib/efi/grub.efi";
if ((! -e $s_shim) || (! -e $s_signed)) {
$kiwi -> failed ();
$kiwi -> error (
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
