From patchwork Tue May 19 19:02:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11558613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B5E2660D for ; Tue, 19 May 2020 19:10:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D5C72075F for ; Tue, 19 May 2020 19:10:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D5C72075F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7cH-0005fA-EA; Tue, 19 May 2020 19:09:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7cG-0005eR-GX for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:09:28 +0000 X-Inumbo-ID: 3b9798a0-9a04-11ea-b9cf-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3b9798a0-9a04-11ea-b9cf-bc764e2007e4; Tue, 19 May 2020 19:09:16 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jb7Vk-0001da-Du; Tue, 19 May 2020 20:02:44 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 34/38] buster: grub, arm64: extend chainloading workaround Date: Tue, 19 May 2020 20:02:26 +0100 Message-Id: <20200519190230.29519-35-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519190230.29519-1-ian.jackson@eu.citrix.com> References: <20200519190230.29519-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , Stefano Stabellini , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" multiboot[2] isn't supported. Also link to the bug report. CC: Julien Grall CC: Stefano Stabellini Signed-off-by: Ian Jackson Acked-by: Julien Grall --- 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/; my $parsemenu= sub { my $f= bl_getmenu_open($ho, $rmenu, "$stash/$ho->{Name}--grub.cfg.1");