https://bugzilla.novell.com/show_bug.cgi?id=894307 https://bugzilla.novell.com/show_bug.cgi?id=894307#c1 --- Comment #1 from Alexander Graf 2014-08-30 23:35:18 UTC --- The following patch does look correct to me, but still fails at the same spot: --- /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm.orig 2014-08-31 01:07:37.422519879 +0200 +++ /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm 2014-08-31 01:23:08.439754072 +0200 @@ -561,9 +561,13 @@ my $appid = $this->{mbrid}; my $type = $this->{type}; my $bootloader= "syslinux"; - my $efi_arch = 'x86_64'; - if ($arch ne 'x86_64') { + my $efi_arch; + if ($arch eq 'x86_64') { + $efi_arch = 'x86_64'; + } elsif ($arch =~ /i.86/) { $efi_arch = 'i386'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efi_arch = 'arm64'; } my $status; my $result; @@ -3482,8 +3486,8 @@ # Grub2 #------------------------------------------ if ($loader eq "grub2") { - my $efipc = 'x86_64-efi'; - my $grubpc = 'i386-pc'; + my $efipc; + my $grubpc; my $grubofw = 'powerpc-ieee1275'; my $bootbios = "$tmpdir/boot/grub2/bootpart.cfg"; my $bootofw = "$tmpdir/boot/grub2/bootpart.cfg"; @@ -3502,8 +3506,18 @@ $grubpc = 'i386-xen'; } } - if ($arch ne 'x86_64') { + if ($arch eq 'x86_64') { + $efipc = 'x86_64-efi'; + } elsif ($arch =~ /i.86/) { $efipc = 'i386-efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $efipc = 'arm64-efi'; + $grubpc = 'arm64-efi'; + } else { + $kiwi -> failed (); + $kiwi -> error ("grub2: Unknown architecture"); + $kiwi -> failed (); + return; } if ($zipped) { $test = $unzip; @@ -3779,11 +3793,22 @@ return; } my @modules = @efi_core_modules; - my $fo = 'x86_64-efi'; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo; + my $fo_bin; + if ($arch eq 'x86_64') { + $fo = 'x86_64-efi'; + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo = 'i386-efi'; $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo = 'arm64-efi'; + $fo_bin = 'boota64.efi'; + } else { + $kiwi -> failed (); + $kiwi -> error ("grub2: Unknown architecture"); + $kiwi -> failed (); + return; } my $core= "$tmpdir/EFI/BOOT/$fo_bin"; my $core_opts; @@ -3810,9 +3835,19 @@ my $s_shim_ms = $stages{efi}{shim_ms}; my $s_shim_suse = $stages{efi}{shim_suse}; my $s_signed = $stages{efi}{signed}; - my $fo_bin = 'bootx64.efi'; - if ($arch ne 'x86_64') { + my $fo_bin; + + if ($arch eq 'x86_64') { + $fo_bin = 'bootx64.efi'; + } elsif ($arch =~ /i.86/) { $fo_bin = 'bootx32.efi'; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + $fo_bin = 'boota64.efi'; + } else { + $kiwi -> failed (); + $kiwi -> error ("grub2: Unknown architecture"); + $kiwi -> failed (); + return; } $result = 0; if ($zipped) { @@ -4397,8 +4432,15 @@ print $FD "\t"."set root='hd0,1'"."\n"; if ($arch eq 'x86_64') { print $FD "\t".'chainloader /EFI/BOOT/bootx64.efi'."\n"; - } else { + } elsif ($arch =~ /i.86/) { print $FD "\t".'chainloader /EFI/BOOT/bootx32.efi'."\n"; + } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { + print $FD "\t".'chainloader /EFI/BOOT/boota64.efi'."\n"; + } else { + $kiwi -> failed (); + $kiwi -> error ("grub2: Unknown architecture"); + $kiwi -> failed (); + return; } } else { print $FD "\t"."set root='hd0'"."\n"; -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.

https://bugzilla.novell.com/show_bug.cgi?id=894307 https://bugzilla.novell.com/show_bug.cgi?id=894307#c4 --- Comment #4 from Alexander Graf 2014-08-31 00:07:59 UTC --- The following 2 patches fix the unavailable grub modules for arm64: --- /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm.orig 2014-08-31 01:48:59.332894021 +0200 +++ /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm 2014-08-31 01:51:18.050563325 +0200 @@ -3600,7 +3600,7 @@ push @bios_core_modules, qw /biosdisk vga vbe chain multiboot/; } my @efi_core_modules = ( - 'part_gpt','efi_gop','efi_uga' + 'part_gpt','efi_gop' ); my @ofw_core_modules = ( 'ofnet','part_gpt','part_msdos' @@ -3620,6 +3620,9 @@ if ($firmware eq "ofw") { @bootdir = ("$tmpdir/boot/grub2/$grubofw"); } + if ($arch =~ /i.86|x86_64/) { + push @efi_core_modules,'efi_uga'; + } $status = KIWIQX::qxx ("mkdir -p @bootdir 2>&1"); $result = $? >> 8; if ($result != 0) { --- /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm.orig 2014-08-31 01:58:18.672524268 +0200 +++ /var/tmp/build-root/images-aarch64/usr/share/kiwi/modules/KIWIBoot.pm 2014-08-31 02:00:35.479984157 +0200 @@ -3597,7 +3597,10 @@ } if ($firmware ne 'ec2') { push @core_modules, 'boot'; - push @bios_core_modules, qw /biosdisk vga vbe chain multiboot/; + push @bios_core_modules, qw /chain/; + if ($arch =~ /i.86|x86_64/) { + push @bios_core_modules, qw /biosdisk vga vbe multiboot/; + } } my @efi_core_modules = ( 'part_gpt','efi_gop' -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.