Hello community, here is the log from the commit of package kiwi for openSUSE:12.3 checked in at 2013-02-15 13:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kiwi (Old) and /work/SRC/openSUSE:12.3/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fix-efi.patch ++++++ --- /var/tmp/diff_new_pack.KsA7zA/_old 2013-02-15 13:00:59.000000000 +0100 +++ /var/tmp/diff_new_pack.KsA7zA/_new 2013-02-15 13:00:59.000000000 +0100 @@ -2,7 +2,18 @@ =================================================================== --- kiwi.orig/modules/KIWIBoot.pm +++ kiwi/modules/KIWIBoot.pm -@@ -851,14 +851,14 @@ sub setupInstallCD { +@@ -847,18 +847,25 @@ sub setupInstallCD { + $system =~ s/\.squashfs$//; + $kiwi -> done(); + } ++ #========================================== ++ # copy grub2 config file to efi path too ++ #------------------------------------------ ++ if (($firmware eq "efi") || ($firmware eq "uefi")) { ++ qxx ("cp $tmpdir/boot/grub2-efi/grub.cfg $tmpdir/EFI/BOOT"); ++ } ++ + #========================================== # make iso EFI bootable #------------------------------------------ if (($firmware eq "efi") || ($firmware eq "uefi")) { @@ -19,16 +30,20 @@ $result = $? >> 8; } } -@@ -873,7 +873,7 @@ sub setupInstallCD { - # copy grub2 config file to efi path too - #------------------------------------------ - if (($firmware eq "efi") || ($firmware eq "uefi")) { -- qxx ("cp $tmpdir/boot/grub2-efi/grub.cfg $tmpdir/efi/boot"); -+ qxx ("cp $tmpdir/boot/grub2-efi/grub.cfg $tmpdir/EFI/BOOT"); +@@ -870,12 +877,6 @@ sub setupInstallCD { + } } #========================================== +- # copy grub2 config file to efi path too +- #------------------------------------------ +- if (($firmware eq "efi") || ($firmware eq "uefi")) { +- qxx ("cp $tmpdir/boot/grub2-efi/grub.cfg $tmpdir/efi/boot"); +- } +- #========================================== # Create an iso image from the tree -@@ -893,7 +893,7 @@ sub setupInstallCD { + #------------------------------------------ + $kiwi -> info ("Creating ISO image..."); +@@ -893,7 +894,7 @@ sub setupInstallCD { $base.= "-R -J -f -b boot/grub2/i386-pc/eltorito.img -no-emul-boot "; $base.= "-boot-load-size 4 -boot-info-table -udf -allow-limited-size "; if (($firmware eq "efi") || ($firmware eq "uefi")) { @@ -211,20 +226,7 @@ if (! $this -> findAndCopyMagicBlock()) { $kiwi -> error ("Failed to read magic iso header"); $kiwi -> failed (); -@@ -1016,7 +1017,11 @@ sub createHybrid { - } - if ($type{firmware}) { - $firmware = $type{firmware}; -- } -+ } else { -+ if ($mbrid eq '_product') { -+ $firmware = 'uefi'; -+ } -+ } - #========================================== - # Call isohybrid - #------------------------------------------ -@@ -1055,12 +1060,12 @@ sub createHybrid { +@@ -1055,12 +1056,12 @@ sub createHybrid { my $partOpt = $optNames{'partok'}; my $uefiOpt = $optNames{'uefi'}; my $offset = 64; @@ -239,7 +241,7 @@ $offset = $this->{efi_offset}; } #========================================== -@@ -1070,7 +1075,7 @@ sub createHybrid { +@@ -1070,7 +1071,7 @@ sub createHybrid { if ($mbrid) { $cmd.= " $idOpt $mbrid $typeOpt 0x83"; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
