Hello community,
here is the log from the commit of package kiwi for openSUSE:12.3 checked in at
2013-02-15 16:14:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kiwi (Old)
and /work/SRC/openSUSE:12.3/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fix-efi.patch ++++++
--- /var/tmp/diff_new_pack.imJ38e/_old 2013-02-15 16:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.imJ38e/_new 2013-02-15 16:14:25.000000000 +0100
@@ -110,24 +110,34 @@
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
-@@ -2235,14 +2235,14 @@ sub createImageLiveCD {
+@@ -2233,26 +2233,6 @@ sub createImageLiveCD {
+ $kiwi -> done();
+ }
#==========================================
- # make iso EFI bootable
- #------------------------------------------
+- # make iso EFI bootable
+- #------------------------------------------
- my $efi_fat = "$CD/boot/grub2-efi/efiboot.img";
-+ my $efi_fat = "$CD/boot/$isoarch/efi";
- $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 ("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 ("mcopy -Do -s -i $efi_fat
$CD/efi :: 2>&1");
-+ $status = qxx ("mcopy -Do -s -i $efi_fat
$CD/EFI :: 2>&1");
- $result = $? >> 8;
- }
- }
-@@ -2304,11 +2304,11 @@ sub createImageLiveCD {
+- $result = $? >> 8;
+- }
+- }
+- if ($result != 0) {
+- $kiwi -> error ("Failed creating efi fat image:
$status");
+- $kiwi -> failed ();
+- return;
+- }
+- $efibootloadsize = -s $efi_fat;
+- #==========================================
+ # create grub configuration
+ #------------------------------------------
+ $kiwi -> info ("Creating grub2 configuration file...");
+@@ -2304,11 +2284,11 @@ sub createImageLiveCD {
if (! $isxen) {
print $FD "\t"."echo Loading linux...\n";
print $FD "\t"."set gfxpayload=keep"."\n";
@@ -141,7 +151,7 @@
print $FD "}\n";
} else {
print $FD "\t"."echo Loading Xen\n";
-@@ -2330,12 +2330,12 @@ sub createImageLiveCD {
+@@ -2330,12 +2310,12 @@ sub createImageLiveCD {
if (! $isxen) {
print $FD "\t"."echo Loading linux...\n";
print $FD "\t"."set gfxpayload=keep"."\n";
@@ -156,7 +166,7 @@
print $FD "}\n";
} else {
print $FD "\t"."echo Loading Xen\n";
-@@ -2359,10 +2359,10 @@ sub createImageLiveCD {
+@@ -2359,10 +2339,10 @@ sub createImageLiveCD {
if (! $isxen) {
print $FD "\t"."echo Loading linux...\n";
print $FD "\t"."set gfxpayload=keep"."\n";
@@ -169,7 +179,7 @@
print $FD "}\n";
} else {
print $FD "\t"."echo Loading Xen\n";
-@@ -2386,7 +2386,7 @@ sub createImageLiveCD {
+@@ -2386,7 +2366,7 @@ sub createImageLiveCD {
print $FD 'menuentry "Boot from Hard Disk"';
print $FD ' --class opensuse --class os {'."\n";
print $FD "\t"."set root='hd0,1'"."\n";
@@ -178,15 +188,37 @@
print $FD '}'."\n";
#==========================================
# setup memtest entry
-@@ -2400,7 +2400,7 @@ sub createImageLiveCD {
+@@ -2400,8 +2380,29 @@ sub createImageLiveCD {
#==========================================
# copy grub config to efi directory too
#------------------------------------------
- qxx ("cp $CD/boot/grub2-efi/grub.cfg $CD/efi/boot");
+ qxx ("cp $CD/boot/grub2-efi/grub.cfg $CD/EFI/BOOT");
$kiwi -> done();
++
++ #==========================================
++ # make iso EFI bootable
++ #------------------------------------------
++ my $efi_fat = "$CD/boot/$isoarch/efi";
++ $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 ("mcopy -Do -s -i $efi_fat
$CD/EFI :: 2>&1");
++ $result = $? >> 8;
++ }
++ }
++ if ($result != 0) {
++ $kiwi -> error ("Failed creating efi fat image:
$status");
++ $kiwi -> failed ();
++ return;
++ }
++ $efibootloadsize = -s $efi_fat;
}
#==========================================
+ # copy base graphics boot CD files
Index: kiwi/modules/KIWIIsoLinux.pm
===================================================================
--- kiwi.orig/modules/KIWIIsoLinux.pm
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
