From nobody Tue Feb 10 02:43:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647334001189976.2846093728284; Tue, 15 Mar 2022 01:46:41 -0700 (PDT) Received: from localhost ([::1]:48470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nU2pD-000262-OF for importer@patchew.org; Tue, 15 Mar 2022 04:46:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2g1-0008Nb-4v for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:37:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nU2fz-0003yS-Dp for qemu-devel@nongnu.org; Tue, 15 Mar 2022 04:37:08 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-kB5JeHfbOu2LaMssB35Xiw-1; Tue, 15 Mar 2022 04:37:03 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 87E71382054C; Tue, 15 Mar 2022 08:37:03 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.196.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36D82C26E80; Tue, 15 Mar 2022 08:37:03 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AD1CD18003B8; Tue, 15 Mar 2022 09:36:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647333426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NoUkNu2dSwCD2SyNhVoKtvOhxpjz9pzttNj0iAj7PkE=; b=CITWuT/wTOfHe7VLt38iudBMSGwuKHFylzZhAMd9MeYk3X7D/Fud6MMZsWu8T3KIz/MvGk eEPH61c1JNsyrE7C50M96tRm9Zzw02q4scvWQY2yNIt5PxJ38TmsscvPfNtKDtT/Sa8Blh rJg+G/J7OIm2LNniR7wzGnsExlUktTk= X-MC-Unique: kB5JeHfbOu2LaMssB35Xiw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 03/11] edk2: switch to release builds Date: Tue, 15 Mar 2022 09:36:48 +0100 Message-Id: <20220315083656.1949517-4-kraxel@redhat.com> In-Reply-To: <20220315083656.1949517-1-kraxel@redhat.com> References: <20220315083656.1949517-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Beraldo Leal , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Gerd Hoffmann , Ani Sinha , Igor Mammedov , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1647334001681100001 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- roms/Makefile.edk2 | 17 +++++++++-------- roms/edk2-build.sh | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index fdae0b511f59..3d75a842a4df 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -13,6 +13,7 @@ =20 SHELL =3D /bin/bash =20 +target =3D RELEASE toolchain =3D $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(= 1)) =20 licenses :=3D \ @@ -73,7 +74,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE - cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU= _EFI.fd \ + cp edk2/Build/ArmVirtQemu-AARCH64/$(target)_$(call toolchain,aarch64)/FV/= QEMU_EFI.fd \ $@ truncate --size=3D64M $@ =20 @@ -87,7 +88,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM2_ENABLE \ -D TPM2_CONFIG_ENABLE - cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \ + cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_EFI= .fd \ $@ truncate --size=3D64M $@ =20 @@ -101,7 +102,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ =20 ../pc-bios/edk2-i386-secure-code.fd: submodules +./edk2-build.sh \ @@ -115,7 +116,7 @@ submodules: -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@ =20 ../pc-bios/edk2-x86_64-code.fd: submodules +./edk2-build.sh \ @@ -127,7 +128,7 @@ submodules: -D NETWORK_TLS_ENABLE \ -D TPM_ENABLE \ -D TPM_CONFIG_ENABLE - cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ + cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd = $@ =20 ../pc-bios/edk2-x86_64-secure-code.fd: submodules +./edk2-build.sh \ @@ -142,15 +143,15 @@ submodules: -D TPM_CONFIG_ENABLE \ -D SECURE_BOOT_ENABLE \ -D SMM_REQUIRE - cp edk2/Build/Ovmf3264/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@ + cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd= $@ =20 ../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd - cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_VARS.fd= \ + cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VAR= S.fd \ $@ truncate --size=3D64M $@ =20 ../pc-bios/edk2-i386-vars.fd: ../pc-bios/edk2-i386-code.fd - cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_VARS.fd $@ + cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_VARS.fd $@ =20 # The license file accumulates several individual licenses from under edk2, # prefixing each individual license with a header (generated by "tail") th= at diff --git a/roms/edk2-build.sh b/roms/edk2-build.sh index d5391c763728..ea79dc27a269 100755 --- a/roms/edk2-build.sh +++ b/roms/edk2-build.sh @@ -50,6 +50,6 @@ qemu_edk2_set_cross_env "$emulation_target" build \ --cmd-len=3D65536 \ -n "$edk2_thread_count" \ - --buildtarget=3DDEBUG \ + --buildtarget=3DRELEASE \ --tagname=3D"$edk2_toolchain" \ "${args[@]}" --=20 2.35.1