Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2013-02-08 18:24:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08
07:10:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-02-08
23:21:10.000000000 +0100
@@ -1,0 +2,34 @@
+Fri Feb 8 16:17:22 CET 2013 - m...@suse.de
+
+- v5.04.42 released
+
+-------------------------------------------------------------------
+Fri Feb 8 15:50:52 CET 2013 - m...@suse.de
+
+- use mcopy to create efi structure in vfat image.
+
+-------------------------------------------------------------------
+Fri Feb 8 15:21:19 CET 2013 - m...@suse.de
+
+- increased the vfat container image to be big enough to hold
+ additional efi modules like the shim
+
+-------------------------------------------------------------------
+Fri Feb 8 14:32:05 CET 2013 - m...@suse.de
+
+- fixed import of shim and grub efi modules. They are packaged
+ as links to usr/lib/grub2/xxx-efi thus moving data from this
+ directory will destroy the link target. We'd better copy it
+
+- also allow integration of shim-opensuse key. If no Microsoft
+ signed key is present we check if an opensuse key exists
+
+-------------------------------------------------------------------
+Fri Feb 8 11:55:42 CET 2013 - m...@suse.de
+
+- make sure shim package is part of the boot image for iso
+ vmx and oem image types starting with openSUSE >= 12.3.
+ The sim package contains the Microsoft signed efi module
+ which is the entry point for UEFI secure boot
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.rPHxJs/_old 2013-02-08 23:21:19.000000000 +0100
+++ /var/tmp/diff_new_pack.rPHxJs/_new 2013-02-08 23:21:19.000000000 +0100
@@ -26,7 +26,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.04.41
+Version: 5.04.42
Release: 0
# requirements to build packages
BuildRequires: e2fsprogs
@@ -446,6 +446,11 @@
%if 0%{?suse_version} > 1210
Recommends: grub2-branding-openSUSE
%endif
+%ifarch x86_64
+%if 0%{?suse_version} > 1220
+Recommends: shim
+%endif
+%endif
%endif
%description -n kiwi-media-requires
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ 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 @@
-bd4052b3ff5f7baa39c01f7e4a5851ed4cd57b92
+2ef96b582de94502fbdbce3eef6169a71cf0b6a0
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 16:30:24.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2013-02-08 16:19:59.000000000 +0100
@@ -852,22 +852,14 @@
#------------------------------------------
if (($firmware eq "efi") || ($firmware eq "uefi")) {
my $efi_fat = "$tmpdir/boot/grub2-efi/efiboot.img";
- $status = qxx ("qemu-img create $efi_fat 1M 2>&1");
+ $status = qxx ("qemu-img create $efi_fat 4M 2>&1");
$result = $? >> 8;
if ($result == 0) {
$status = qxx ("/sbin/mkdosfs -n 'BOOT' $efi_fat 2>&1");
$result = $? >> 8;
if ($result == 0) {
- $status = qxx ("mount -o loop $efi_fat /mnt
2>&1");
+ $status = qxx ("mcopy -Do -s -i $efi_fat
$tmpdir/efi :: 2>&1");
$result = $? >> 8;
- if ($result == 0) {
- $status = qxx ("mkdir -p
/mnt/efi/boot");
- $status = qxx (
- "cp
$tmpdir/efi/boot/bootx64.efi /mnt/efi/boot 2>&1"
- );
- $result = $? >> 8;
- }
- qxx ("umount /mnt 2>&1");
}
}
if ($result != 0) {
@@ -3327,9 +3319,10 @@
$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_ms} = "usr/$lib/efi/shim.efi";
+ $stages{efi}{shim_suse} =
"usr/$lib/efi/shim-opensuse.efi";
+ $stages{efi}{signed} = "usr/$lib/efi/grub.efi";
}
#==========================================
# Boot directories
@@ -3412,7 +3405,7 @@
my $stageT = $stages{$stage}{stageDST};
if (glob($tmpdir.$stageD.'/*')) {
$status = qxx (
- 'mv '.$tmpdir.$stageD.'/*
'.$tmpdir.$stageT.' 2>&1'
+ 'cp '.$tmpdir.$stageD.'/*
'.$tmpdir.$stageT.' 2>&1'
);
} else {
$kiwi -> skipped ();
@@ -3511,9 +3504,10 @@
#------------------------------------------
if ($firmware eq "uefi") {
$kiwi -> info ("Importing grub2 shim/signed efi
modules");
- my $s_data = $stages{efi}{data};
- my $s_shim = $stages{efi}{shim};
- my $s_signed = $stages{efi}{signed};
+ 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};
$result = 0;
if ($zipped) {
$status= qxx (
@@ -3524,32 +3518,46 @@
"cat $initrd | (cd $tmpdir && cpio -i
-d $s_data 2>&1)"
);
}
- if ((! -e "$tmpdir/$s_shim") || (! -e
"$tmpdir/$s_signed")) {
- $result = 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 ($result != 0) {
+ if (! -e "$tmpdir/$s_signed") {
$kiwi -> failed ();
$kiwi -> error (
- "Can't find grub2 $s_shim and/or
$s_signed in initrd");
+ "Can't find grub2 $s_signed in initrd");
$kiwi -> failed ();
return;
}
$status = qxx (
- "mv $tmpdir/$s_shim
$tmpdir/efi/boot/bootx64.efi 2>&1"
+ "cp $tmpdir/$s_shim_ms
$tmpdir/efi/boot/bootx64.efi 2>&1"
);
$result = $? >> 8;
if ($result != 0) {
+ $status = qxx (
+ "cp $tmpdir/$s_shim_suse
$tmpdir/efi/boot/bootx64.efi 2>&1"
+ );
+ $result = $? >> 8;
+ }
+ if ($result != 0) {
$kiwi -> failed ();
- $kiwi -> error ("Failed to move shim module:
$status");
+ $kiwi -> error ("Failed to copy shim module:
$status");
$kiwi -> failed ();
return;
}
$status = qxx (
- "mv $tmpdir/$s_signed $tmpdir/efi/boot/grub.efi
2>&1");
+ "cp $tmpdir/$s_signed $tmpdir/efi/boot/grub.efi
2>&1");
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
- $kiwi -> error ("Failed to move signed module:
$status");
+ $kiwi -> error ("Failed to copy signed module:
$status");
$kiwi -> failed ();
return;
}
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 16:30:24.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2013-02-08 16:19:59.000000000 +0100
@@ -927,7 +927,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.04.41";
+ $data{Version} = "5.04.42";
$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 16:30:24.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2013-02-08 16:19:59.000000000 +0100
@@ -2118,7 +2118,7 @@
#==========================================
# Copy modules/fonts/themes on CD
#------------------------------------------
- qxx ("mv $ir_modules/* $cd_modules 2>&1");
+ qxx ("cp $ir_modules/* $cd_modules 2>&1");
if (-d $ir_themes) {
qxx ("mv $ir_themes $cd_loader 2>&1");
}
@@ -2185,28 +2185,48 @@
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)) {
+ my $s_shim_ms = "$tmpdir/usr/$lib/efi/shim.efi";
+ my $s_shim_suse =
"$tmpdir/usr/$lib/efi/shim-opensuse.efi";
+ my $s_signed = "$tmpdir/usr/$lib/efi/grub.efi";
+ if ((! -e $s_shim_ms) && (! -e $s_shim_suse)) {
+ my $s_shim = $s_shim_ms;
+ if (-e $s_shim) {
+ $s_shim = $s_shim_suse;
+ }
+ $kiwi -> failed ();
+ $kiwi -> error (
+ "Can't find $s_shim in initrd");
+ $kiwi -> failed ();
+ return;
+ }
+ if (! -e $s_signed) {
$kiwi -> failed ();
$kiwi -> error (
- "Can't find grub2 $s_shim and/or
$s_signed in initrd");
+ "Can't find grub2 $s_signed in initrd");
$kiwi -> failed ();
return;
}
- $status = qxx ("mv $s_shim $CD/efi/boot/bootx64.efi
2>&1");
+ $status = qxx (
+ "cp $s_shim_ms $CD/efi/boot/bootx64.efi 2>&1"
+ );
$result = $? >> 8;
if ($result != 0) {
+ $status = qxx (
+ "cp $s_shim_suse
$CD/efi/boot/bootx64.efi 2>&1"
+ );
+ $result = $? >> 8;
+ }
+ if ($result != 0) {
$kiwi -> failed ();
- $kiwi -> error ("Failed to move shim module:
$status");
+ $kiwi -> error ("Failed to copy shim module:
$status");
$kiwi -> failed ();
return;
}
- $status = qxx ("mv $s_signed $CD/efi/boot/grub.efi
2>&1");
+ $status = qxx ("cp $s_signed $CD/efi/boot/grub.efi
2>&1");
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
- $kiwi -> error ("Failed to move signed module:
$status");
+ $kiwi -> error ("Failed to copy signed module:
$status");
$kiwi -> failed ();
return;
}
@@ -2216,22 +2236,14 @@
# make iso EFI bootable
#------------------------------------------
my $efi_fat = "$CD/boot/grub2-efi/efiboot.img";
- $status = qxx ("qemu-img create $efi_fat 1M 2>&1");
+ $status = qxx ("qemu-img create $efi_fat 4M 2>&1");
$result = $? >> 8;
if ($result == 0) {
$status = qxx ("/sbin/mkdosfs -n 'BOOT' $efi_fat 2>&1");
$result = $? >> 8;
if ($result == 0) {
- $status = qxx ("mount -o loop $efi_fat /mnt
2>&1");
+ $status = qxx ("mcopy -Do -s -i $efi_fat
$CD/efi :: 2>&1");
$result = $? >> 8;
- if ($result == 0) {
- $status = qxx ("mkdir -p
/mnt/efi/boot");
- $status = qxx (
- "cp $CD/efi/boot/bootx64.efi
/mnt/efi/boot 2>&1"
- );
- $result = $? >> 8;
- }
- qxx ("umount /mnt 2>&1");
}
}
if ($result != 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml
new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml
--- old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2013-02-07
10:34:44.000000000 +0100
+++ new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2013-02-08
16:19:59.000000000 +0100
@@ -108,6 +108,7 @@
<package name="grub"/>
<package name="grub2"/>
<package name="grub2-efi"/>
+ <package name="shim" arch="x86_64"/>
<package name="hdparm"/>
<package name="hwinfo"/>
<package name="iproute2"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml
new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2013-02-06
22:22:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2013-02-08
16:19:59.000000000 +0100
@@ -130,6 +130,7 @@
<package name="grub"/>
<package name="grub2"/>
<package name="grub2-efi"/>
+ <package name="shim" arch="x86_64"/>
<package name="hwinfo"/>
<package name="iputils"/>
<package name="kernel-firmware"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml
new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml
--- old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2013-02-06
22:22:37.000000000 +0100
+++ new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2013-02-08
16:19:59.000000000 +0100
@@ -107,6 +107,7 @@
<package name="grub"/>
<package name="grub2"/>
<package name="grub2-efi"/>
+ <package name="shim" arch="x86_64"/>
<package name="hwinfo"/>
<package name="kernel-firmware"/>
<package name="kexec-tools"/>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
