[PATCH 03/11] edk2: switch to release builds

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Ani Sinha" <ani@anisinha.ca>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH 03/11] edk2: switch to release builds
Date: Tue,  8 Mar 2022 15:55:13 +0100	[thread overview]
Message-ID: <20220308145521.3106395-4-kraxel@redhat.com> (raw)
In-Reply-To: <20220308145521.3106395-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 @@
 
 SHELL = /bin/bash
 
+target = RELEASE
 toolchain = $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1))
 
 licenses := \
@@ -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=64M $@
 
@@ -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=64M $@
 
@@ -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 $@
 
 ../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 $@
 
 ../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 $@
 
 ../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 $@
 
 ../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_VARS.fd \
 		$@
 	truncate --size=64M $@
 
 ../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 $@
 
 # The license file accumulates several individual licenses from under edk2,
 # prefixing each individual license with a header (generated by "tail") that
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=65536 \
   -n "$edk2_thread_count" \
-  --buildtarget=DEBUG \
+  --buildtarget=RELEASE \
   --tagname="$edk2_toolchain" \
   "${args[@]}"
-- 
2.35.1

next prev parent reply	other threads:[~2022-03-08 15:02 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-08 14:55 [PATCH 00/11] edk2: update to stable202202 Gerd Hoffmann
2022-03-08 14:55 ` [PATCH 01/11] tests/acpi: allow virt memory hotplug changes Gerd Hoffmann
2022-03-09 11:34   ` Alex Bennée
2022-03-08 14:55 ` [PATCH 02/11] edk2: update submodule to stable202202 Gerd Hoffmann
2022-03-09 11:35   ` Alex Bennée
2022-03-08 14:55 ` Gerd Hoffmann [this message]
2022-03-08 15:02   ` [PATCH 03/11] edk2: switch to release builds Philippe Mathieu-Daudé
2022-03-09 11:51   ` Alex Bennée
2022-03-08 14:55 ` [PATCH 04/11] edk2: .git can be a file Gerd Hoffmann
2022-03-08 22:56   ` Eric Blake
2022-03-08 14:55 ` [PATCH 05/11] edk2: add microvm build Gerd Hoffmann
2022-03-08 15:04   ` Philippe Mathieu-Daudé
2022-03-09 11:55   ` Alex Bennée
2022-03-09 12:12     ` Gerd Hoffmann
2022-03-09 12:21       ` Philippe Mathieu-Daudé
2022-03-09 13:30       ` Ani Sinha
2022-03-08 14:55 ` [PATCH 06/11] edk2: update binaries to stable202202 Gerd Hoffmann
2022-03-09 12:15   ` Michael S. Tsirkin
2022-03-08 14:55 ` [PATCH 07/11] tests/acpi: update expected data files Gerd Hoffmann
2022-03-09 10:17   ` Igor Mammedov
2022-03-08 14:55 ` [PATCH 08/11] tests/acpi: disallow virt memory hotplug changes Gerd Hoffmann
2022-03-08 14:55 ` [PATCH 09/11] edk2/docker: install python3 Gerd Hoffmann
2022-03-09 12:10   ` Alex Bennée
2022-03-08 14:55 ` [PATCH 10/11] edk2/docker: use ubuntu 18.04 Gerd Hoffmann
2022-03-09 12:10   ` Alex Bennée
2022-03-08 14:55 ` [PATCH 11/11] MAINTAINERS: take edk2 Gerd Hoffmann
2022-03-08 15:08   ` Philippe Mathieu-Daudé
2022-03-09  8:16     ` Gerd Hoffmann
2022-03-09 10:05       ` MAINTAINERS: macOS host support (was: MAINTAINERS: take edk2) Philippe Mathieu-Daudé
2022-03-09 10:40         ` Christian Schoenebeck
2022-03-09 11:44           ` Daniel P. Berrangé
2022-03-10 11:00             ` Christian Schoenebeck
2022-03-10 11:07               ` Daniel P. Berrangé
2022-03-10 11:40                 ` Philippe Mathieu-Daudé
2022-03-11  9:13                   ` Christian Schoenebeck
2022-03-11  9:26                     ` Daniel P. Berrangé
2022-03-12 13:51                       ` Christian Schoenebeck via
2022-03-14  9:31                         ` Daniel P. Berrangé
2022-03-09 11:18         ` Gerd Hoffmann

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fdae0b511f5 dfblob:3d75a842a4d dfblob:d5391c76372
dfblob:ea79dc27a26 )
 OR (
bs:"[PATCH 03/11] edk2: switch to release builds" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220308145521.3106395-4-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=ani@anisinha.ca \
    --cc=bleal@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=imammedo@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).