[OSSTEST,34/38] buster: grub, arm64: extend chainloading workaround
diff mbox series

Message ID 20200519190230.29519-35-ian.jackson@eu.citrix.com
State New
Headers show
Series
  • Upgrade most hosts/guests to buster
Related show

Commit Message

Ian Jackson May 19, 2020, 7:02 p.m. UTC
multiboot[2] isn't supported.

Also link to the bug report.

CC: Julien Grall <julien@xen.org>
CC: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Debian.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Julien Grall May 20, 2020, 11:36 a.m. UTC | #1
Hi,

On 19/05/2020 20:02, Ian Jackson wrote:
> multiboot[2] isn't supported.
> 
> Also link to the bug report.
> 
> CC: Julien Grall <julien@xen.org>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

Acked-by: Julien Grall <jgrall@amazon.com>

> ---
>   Osstest/Debian.pm | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 77508d19..151677ed 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -443,9 +443,10 @@ sub setupboot_grub2 ($$$$) {
>       my $kernkey= (defined $xenhopt ? 'KernDom0' : 'KernOnly');
>   
>       # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainload.
> +    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884770
>       my $need_uefi_chainload =
>           get_host_property($ho, "firmware") eq "uefi" &&
> -        $ho->{Suite} =~ m/jessie|stretch/ && $ho->{Arch} =~ m/^arm/;
> +        $ho->{Suite} =~ m/jessie|stretch|buster/ && $ho->{Arch} =~ m/^arm/;

FWIW, the next version of Debian seems to have a newer GRUB version with 
Xen on Arm support.

Cheers,
Ian Jackson May 20, 2020, 2:57 p.m. UTC | #2
Julien Grall writes ("Re: [OSSTEST PATCH 34/38] buster: grub, arm64: extend chainloading workaround"):
> On 19/05/2020 20:02, Ian Jackson wrote:
> > multiboot[2] isn't supported.
> > 
> > Also link to the bug report.
> > 
> > CC: Julien Grall <julien@xen.org>
> > CC: Stefano Stabellini <sstabellini@kernel.org>
> > Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Acked-by: Julien Grall <jgrall@amazon.com>
> 
> > ---
> >   Osstest/Debian.pm | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> > index 77508d19..151677ed 100644
> > --- a/Osstest/Debian.pm
> > +++ b/Osstest/Debian.pm
> > @@ -443,9 +443,10 @@ sub setupboot_grub2 ($$$$) {
> >       my $kernkey= (defined $xenhopt ? 'KernDom0' : 'KernOnly');
> >   
> >       # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainload.
> > +    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884770
> >       my $need_uefi_chainload =
> >           get_host_property($ho, "firmware") eq "uefi" &&
> > -        $ho->{Suite} =~ m/jessie|stretch/ && $ho->{Arch} =~ m/^arm/;
> > +        $ho->{Suite} =~ m/jessie|stretch|buster/ && $ho->{Arch} =~ m/^arm/;
> 
> FWIW, the next version of Debian seems to have a newer GRUB version with 
> Xen on Arm support.

Cool, we can drop this eventually then :-).

Thanks,
Ian.

Patch
diff mbox series

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 77508d19..151677ed 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -443,9 +443,10 @@  sub setupboot_grub2 ($$$$) {
     my $kernkey= (defined $xenhopt ? 'KernDom0' : 'KernOnly');
 
     # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainload.
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884770
     my $need_uefi_chainload =
         get_host_property($ho, "firmware") eq "uefi" &&
-        $ho->{Suite} =~ m/jessie|stretch/ && $ho->{Arch} =~ m/^arm/;
+        $ho->{Suite} =~ m/jessie|stretch|buster/ && $ho->{Arch} =~ m/^arm/;
 
     my $parsemenu= sub {
         my $f= bl_getmenu_open($ho, $rmenu, "$stash/$ho->{Name}--grub.cfg.1");