From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PULL 3/6] roms/Makefile.edk2: remove edk2-stable201903 network feature test macros
Date: Fri, 14 Jun 2019 22:23:30 +0200 [thread overview]
Message-ID: <20190614202333.19355-4-lersek@redhat.com> (raw)
In-Reply-To: <20190614202333.19355-1-lersek@redhat.com>
At tag "edk2-stable201905", the build flags HTTP_BOOT_ENABLE and
TLS_ENABLE have become useless. Their roles have been taken by
NETWORK_HTTP_BOOT_ENABLE and NETWORK_TLS_ENABLE, respectively. Remove the
old build flags.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1831477
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
roms/Makefile.edk2 | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index 071d6e454b68..6a19498d0738 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -57,8 +57,7 @@ submodules:
--arch=AARCH64 \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE
+ -D NETWORK_HTTP_BOOT_ENABLE
cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \
$@
truncate --size=64M $@
@@ -69,8 +68,7 @@ submodules:
--arch=ARM \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE
+ -D NETWORK_HTTP_BOOT_ENABLE
cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \
$@
truncate --size=64M $@
@@ -82,9 +80,7 @@ submodules:
--platform=OvmfPkg/OvmfPkgIa32.dsc \
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TLS_ENABLE \
-D TPM2_ENABLE \
-D TPM2_CONFIG_ENABLE
cp edk2/Build/OvmfIa32/DEBUG_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
@@ -96,9 +92,7 @@ submodules:
--platform=OvmfPkg/OvmfPkgIa32.dsc \
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TLS_ENABLE \
-D TPM2_ENABLE \
-D TPM2_CONFIG_ENABLE \
-D SECURE_BOOT_ENABLE \
@@ -112,9 +106,7 @@ submodules:
--platform=OvmfPkg/OvmfPkgX64.dsc \
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TLS_ENABLE \
-D TPM2_ENABLE \
-D TPM2_CONFIG_ENABLE
cp edk2/Build/OvmfX64/DEBUG_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
@@ -127,9 +119,7 @@ submodules:
--platform=OvmfPkg/OvmfPkgIa32X64.dsc \
-D NETWORK_IP6_ENABLE \
-D NETWORK_HTTP_BOOT_ENABLE \
- -D HTTP_BOOT_ENABLE \
-D NETWORK_TLS_ENABLE \
- -D TLS_ENABLE \
-D TPM2_ENABLE \
-D TPM2_CONFIG_ENABLE \
-D SECURE_BOOT_ENABLE \
--
2.19.1.3.g30247aa5d201
next prev parent reply other threads:[~2019-06-14 20:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 20:23 [Qemu-devel] [PULL 0/6] update edk2 submodule & binaries to edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 1/6] roms/Makefile.edk2: define edk2-stable201905 network feature test macros Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 2/6] roms/edk2: update submodule from edk2-stable201903 to edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` Laszlo Ersek [this message]
2019-06-14 20:23 ` [Qemu-devel] [PULL 4/6] roms/Makefile.edk2: update input file list for "pc-bios/edk2-licenses.txt" Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 5/6] pc-bios: refresh edk2 build artifacts for edk2-stable201905 Laszlo Ersek
2019-06-14 20:23 ` [Qemu-devel] [PULL 6/6] pc-bios: update the README file with edk2-stable201905 information Laszlo Ersek
2019-06-17 10:54 ` [Qemu-devel] [PULL 0/6] update edk2 submodule & binaries to edk2-stable201905 Peter Maydell
2019-06-19 23:40 ` Laszlo Ersek
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=20190614202333.19355-4-lersek@redhat.com \
--to=lersek@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.