From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 7B68FAC195F for ; Thu, 25 Jan 2024 17:09:08 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=y6Xg88RKK7xyShrZJDESiIqNeuITsl0WJf10yNcm8Lw=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1706202547; v=1; b=xTdtwFN7CI64Pl0XZ76pCHvKSDm/VYGrpHSsVUsQ0Qb5Ql6QbS4PuQUyHFfcrbo97vkRqYYh ZicAyVuApy7NrsDFoxCciyQKN4iMEssOO6C/zsL4TehYvLhQwwU3SZqMizt6qiTroCIRXsvG8Gn ivLG+K7Qe2sT1jaOt0aqef18= X-Received: by 127.0.0.2 with SMTP id ADlZYY7687511x65y896iWtG; Thu, 25 Jan 2024 09:09:07 -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.web10.23880.1706202546168368930 for ; Thu, 25 Jan 2024 09:09:06 -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-459-YOy6psauPSSsWp-lkhpQzg-1; Thu, 25 Jan 2024 12:08:08 -0500 X-MC-Unique: YOy6psauPSSsWp-lkhpQzg-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 A02C9185A781; Thu, 25 Jan 2024 17:07:21 +0000 (UTC) X-Received: from [10.39.195.100] (unknown [10.39.195.100]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38C8E492BC6; Thu, 25 Jan 2024 17:07:20 +0000 (UTC) Message-ID: <72f1ca3e-2ef4-56d8-5763-4a3a50d4c5dc@redhat.com> Date: Thu, 25 Jan 2024 18:07:19 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 11/11] OvmfPkg/CI: copy shell to virtual drive To: devel@edk2.groups.io, kraxel@redhat.com Cc: Jiewen Yao , Ard Biesheuvel , Michael Roth , Erdem Aktas , Min Xu , Tom Lendacky , Oliver Steffen References: <20240124163802.2160303-1-kraxel@redhat.com> <20240124163802.2160303-12-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240124163802.2160303-12-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: zFpprh6OJtkg0nOYdCd7vc0Ex7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=xTdtwFN7; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 1/24/24 17:38, Gerd Hoffmann wrote: > 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. In the commit message, can you list the platforms explicitly that benefit from this change? Thanks, Laszlo >=20 > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/PlatformCI/PlatformBuildLib.py | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) >=20 > diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/= PlatformBuildLib.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, BuildSettingsMana= ger): > =20 > def FlashRomImage(self): > VirtualDrive =3D os.path.join(self.env.GetValue("BUILD_OUTPUT_BA= SE"), "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_B= ASE"), "FV") > =20 > if (self.env.GetValue("QEMU_SKIP") and > @@ -189,6 +191,14 @@ class PlatformBuilder( UefiBuilder, BuildSettingsMan= ager): > 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"),= arch, "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 > # -=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 (#114437): https://edk2.groups.io/g/devel/message/114437 Mute This Topic: https://groups.io/mt/103935352/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-