From nobody Wed Jun 24 09:06:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+114328+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114328+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706114296; cv=none; d=zohomail.com; s=zohoarc; b=n3UrMKkH5YIw1OiWs9vX3MR78tGwP5wWTJiYnfLO5G1NgUoCOw7KKCGpjKxuOVyaGRn9bGIpIavWkuYJ6YGgZx+iqypRbk+GhG9aHD8lxyQvm5W1GhiSxWlyXgpA3I1DC9EN00OUbORptdTgLjU1tcRd62TGACYh+EBEjX8BWrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706114296; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=XRy3sx8VfdAtiwQxbAliqHSD9swz3ng4Nf7EkdxfPBQ=; b=nnPp3PaZQfQo4jMub/fVfQzpPI3kdVXHb03XidECn7zdvUyRZGL1+L1A3z4MCKaQlP9mUjEFiM9buME3pilOfmUwbuv4F2Aq5fMjwNu1t7U13Sz/xn9Csp+Nsgo3UYIw6j4cvGYKbTeJVMb/Hi8LtptXYQDPLwPULF8CB7cUtXY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114328+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1706114296220836.1472115102346; Wed, 24 Jan 2024 08:38:16 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=7nFT8nRUnBorzgSNOh8mKIL66Qo+F8VnegFkHWYDtlI=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1706114295; v=1; b=HAiqDFikJnGRdQd5wrE/nbcKVf5jZlQ6LsiHQcr8ahfSwq6DfcevIfXV7yURVfwUfR8df7ti JnOoVyW378/UU0l/0uWGbsb8Nv8SxT/iWYENimK7t+QqdQcVactfWV9wF8O1VJuqcha1mKt+zqb UyL0bDWZwNLwd6DZ1pTpj4Vk= X-Received: by 127.0.0.2 with SMTP id vZ38YY1788612xxFFrQDVaGC; Wed, 24 Jan 2024 08:38:15 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.27639.1706114295274189435 for ; Wed, 24 Jan 2024 08:38:15 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-57-S4ZyQeTkPvepq8pb_4Snww-1; Wed, 24 Jan 2024 11:38:11 -0500 X-MC-Unique: S4ZyQeTkPvepq8pb_4Snww-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7049835140; Wed, 24 Jan 2024 16:38:10 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C77F1121312; Wed, 24 Jan 2024 16:38:10 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DA2361801A84; Wed, 24 Jan 2024 17:38:02 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Ard Biesheuvel , Michael Roth , Gerd Hoffmann , Laszlo Ersek , Erdem Aktas , Min Xu , Tom Lendacky , Oliver Steffen Subject: [edk2-devel] [PATCH 11/11] OvmfPkg/CI: copy shell to virtual drive Date: Wed, 24 Jan 2024 17:38:02 +0100 Message-ID: <20240124163802.2160303-12-kraxel@redhat.com> In-Reply-To: <20240124163802.2160303-1-kraxel@redhat.com> References: <20240124163802.2160303-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wEplo67TlvTaWxwwXqIjoqjCx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1706114296942100035 Content-Type: text/plain; charset="utf-8"; x-default="true" Place the EFI shell as EFI/BOOT/BOOT{ARCH}.EFI on the virtual drive. This allows the "run to shell" CI test case to work even in case the shell is not included in the firmware image. Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformCI/PlatformBuildLib.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/Pl= atformBuildLib.py index f829738cdda4..00d454954bff 100644 --- a/OvmfPkg/PlatformCI/PlatformBuildLib.py +++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py @@ -5,6 +5,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## import os +import shutil import logging import io =20 @@ -181,7 +182,8 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManage= r): =20 def FlashRomImage(self): VirtualDrive =3D os.path.join(self.env.GetValue("BUILD_OUTPUT_BASE= "), "VirtualDrive") - os.makedirs(VirtualDrive, exist_ok=3DTrue) + VirtualDriveBoot =3D os.path.join(VirtualDrive, "EFI", "BOOT") + os.makedirs(VirtualDriveBoot, exist_ok=3DTrue) OutputPath_FV =3D os.path.join(self.env.GetValue("BUILD_OUTPUT_BAS= E"), "FV") =20 if (self.env.GetValue("QEMU_SKIP") and @@ -189,6 +191,14 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManag= er): logging.info("skipping qemu boot test") return 0 =20 + # copy shell to VirtualDrive + for arch in self.env.GetValue("TARGET_ARCH").split(): + src =3D os.path.join(self.env.GetValue("BUILD_OUTPUT_BASE"), a= rch, "Shell.efi") + dst =3D os.path.join(VirtualDriveBoot, f'BOOT{arch}.EFI') + if os.path.exists(src): + logging.info("copy %s -> %s", src, dst) + shutil.copyfile(src, dst) + # # QEMU must be on the path # --=20 2.43.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114328): https://edk2.groups.io/g/devel/message/114328 Mute This Topic: https://groups.io/mt/103935352/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-