[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/11] edk2: switch to release builds
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 03/11] edk2: switch to release builds |
Date: |
Fri, 11 Mar 2022 06:37:51 +0100 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
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
- [PATCH v2 00/11] edk2: update to stable202202, Gerd Hoffmann, 2022/03/11
- [PATCH v2 01/11] tests/acpi: allow virt memory hotplug changes, Gerd Hoffmann, 2022/03/11
- [PATCH v2 02/11] edk2: update submodule to stable202202, Gerd Hoffmann, 2022/03/11
- [PATCH v2 05/11] edk2: add microvm build, Gerd Hoffmann, 2022/03/11
- [PATCH v2 03/11] edk2: switch to release builds,
Gerd Hoffmann <=
- [PATCH v2 04/11] edk2: .git can be a file, Gerd Hoffmann, 2022/03/11
- [PATCH v2 07/11] tests/acpi: update expected data files, Gerd Hoffmann, 2022/03/11
- [PATCH v2 08/11] tests/acpi: disallow virt memory hotplug changes, Gerd Hoffmann, 2022/03/11
- [PATCH v2 09/11] edk2/docker: install python3, Gerd Hoffmann, 2022/03/11