From nobody Sun Apr 28 04:31:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59372+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59372+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1589317429; cv=none; d=zohomail.com; s=zohoarc; b=hem+Fg9J845QTICtmGBPXbwMZuMnfJHR3cmdW5MHorN8yee7Lbk2VyX97kpvQ1gV/6CT3pfgw5ue3TdewuQqTqIbc3SHtYYNz72zpyR6pO2GUpGWc7Y1IS7n3MzJHsE2cgpCjvGEYBgPJGN9mf3o/vTV3/73jzib6coqsDkwgAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589317429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=ZikLH+jzHvtaQxgiFfClZwReHAu0vuS7l3OYcO+p0GQ=; b=Ok2d4gQW3x8ZK7AYsjbwovf+JrJ2MINPswNq+CWJOpotTu8WYtHuI0N1fFAJWCx5pFmHmFTRAe9Ejvf12p0ZjZd4x2xrfG/aNI1xONI9ENuZhpR8uUutH3lzxn/FlZaSziPmI1QjBMSsgVZS70c2FrzEEInpS7HaiWEgzaCqAgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59372+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589317429340998.5586698514842; Tue, 12 May 2020 14:03:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id CtWfYY1788612xvLiabYO1Qn; Tue, 12 May 2020 14:03:48 -0700 X-Received: from mta-01.yadro.com (mta-01.yadro.com [89.207.88.252]) by mx.groups.io with SMTP id smtpd.web12.1148.1589317340786740853 for ; Tue, 12 May 2020 14:02:21 -0700 X-Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id BF13041287; Tue, 12 May 2020 21:02:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at yadro.com X-Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id thhthn4F6l5f; Wed, 13 May 2020 00:02:14 +0300 (MSK) X-Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 59A9741286; Wed, 13 May 2020 00:02:14 +0300 (MSK) X-Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Wed, 13 May 2020 00:02:15 +0300 From: Roman Bolshakov To: CC: Cameron Esfahani , LAHAYE Olivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Ard Biesheuvel , Liming Gao , Andrew Fish , Laszlo Ersek Subject: [edk2-devel] [PATCH] OvmfPkg: Skip initrd command on Xcode toolchain Date: Tue, 12 May 2020 23:58:34 +0300 Message-ID: <20200512205832.17032-1-r.bolshakov@yadro.com> MIME-Version: 1.0 X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Precedence: Bulk List-Unsubscribe: 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,r.bolshakov@yadro.com X-Gm-Message-State: EqJiv13k4uWgIx7n8xVc1Ynpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589317428; bh=apbPVd80TPNdVN4LeXrCzCxfA5StxUEBbWps+kpRCf4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=uobMZBZ50gfXuoqTBy8L1TeZQKbh7GXZT9uVoyn37TRVUUPmp2skZ0QE5AIdYDkbN6J oeJgC/HIhpimwwaVKyJfpkrlaxvptXSKi+XKwwPxZxTLjooKAvAeQD85C8ufPScioRQGQ 8Ma3NJHinh9nOR6PZEqQD4NO3pVF+pfRqJw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" OVMF booting stops with the assert if built with Xcode on macOS: Loading driver at 0x0001FAB8000 EntryPoint=3D0x0001FABF249 LinuxInitrdDyn= amicShellCommand.efi InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 1F218398 ProtectUefiImageCommon - 0x1F218140 - 0x000000001FAB8000 - 0x0000000000008A60 ASSERT_EFI_ERROR (Status =3D Unsupported) ASSERT LinuxInitrdDynamicShellCommand.c(378): !EFI_ERROR (Status) The assert comes from InitializeHiiPackage() after an attempt to retrieve HII package list from ImageHandle. Xcode still doesn't support HII resource section and LinuxInitrdDynamicShellCommand depends on it. Likewise 277a3958d93a ("OvmfPkg: Don't include TftpDynamicCommand in XCODE5 tool chain"), disable initrd command if built with Xcode toolchain Fixes: 2632178bc683 ("OvmfPkg: add 'initrd' shell command to expose Linux i= nitrd via device path") Cc: Ard Biesheuvel Cc: Liming Gao Cc: Andrew Fish Cc: Laszlo Ersek Signed-off-by: Roman Bolshakov Acked-by: Philippe Mathieu-Daude --- OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgX64.fdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index fd81b6fa8b..e2b759aa8d 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -290,8 +290,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =20 !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -!endif INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf +!endif INF ShellPkg/Application/Shell/Shell.inf =20 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index f71134a659..bfca1eff9e 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -291,8 +291,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =20 !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -!endif INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf +!endif INF ShellPkg/Application/Shell/Shell.inf =20 INF MdeModulePkg/Logo/LogoDxe.inf --=20 2.26.1 -=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 (#59372): https://edk2.groups.io/g/devel/message/59372 Mute This Topic: https://groups.io/mt/74168379/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-