Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2C9AC433E0 for ; Tue, 19 May 2020 19:09:34 +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 A0D37207E8 for ; Tue, 19 May 2020 19:09:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0D37207E8 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 1jb7cC-0005ce-59; Tue, 19 May 2020 19:09:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7cB-0005cI-H8 for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:09:23 +0000 X-Inumbo-ID: 3a4b0a68-9a04-11ea-b07b-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3a4b0a68-9a04-11ea-b07b-bc764e2007e4; Tue, 19 May 2020 19:09:14 +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-Sz; Tue, 19 May 2020 20:02:44 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 36/38] buster: setupboot_grub2: Handle missing policy file bug Date: Tue, 19 May 2020 20:02:28 +0100 Message-Id: <20200519190230.29519-37-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 Content-Transfer-Encoding: 8bit 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: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This is a complex interaction between update-grub and the Xen build system on ARM64. Not sure exactly who to blame but since we have our own 20_linux_xen bodge, let's wait until we don't. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index c0b669c9..6c289cc7 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -496,7 +496,17 @@ sub setupboot_grub2 ($$$$) { " kernel $entry->{KernVer}, not $want_kernver)"); } elsif ($want_xsm && !defined $entry->{Xenpolicy}) { logm("(skipping entry at $entry->{StartLine}..$.;". - " XSM policy file not present)"); + " XSM policy file not mentioned)"); + } elsif ($ho->{Suite} =~ m/buster/ && + defined $entry->{Xenpolicy} && + !$bootfiles{ + $entry->{Xenpolicy} =~ m{^/?} ? $' : die + }) { + # Our 20_linux_xen bodge with buster's update-grub + # generates entries which mention /boot/xenpolicy-xen + # even though that file doesn't exist on ARM64. + logm("(skipping entry at $entry->{StartLine}..$.;". + " XSM policy file not on disk!)"); } else { # yes! last; -- 2.20.1