@@ -57,6 +57,7 @@ submodules:
--arch=AARCH64 \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
+ -D NETWORK_HTTP_BOOT_ENABLE \
-D HTTP_BOOT_ENABLE
cp edk2/Build/ArmVirtQemu-AARCH64/DEBUG_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \
$@
@@ -68,6 +69,7 @@ submodules:
--arch=ARM \
--platform=ArmVirtPkg/ArmVirtQemu.dsc \
-D NETWORK_IP6_ENABLE \
+ -D NETWORK_HTTP_BOOT_ENABLE \
-D HTTP_BOOT_ENABLE
cp edk2/Build/ArmVirtQemu-ARM/DEBUG_$(call toolchain,arm)/FV/QEMU_EFI.fd \
$@
@@ -79,7 +81,9 @@ submodules:
--arch=IA32 \
--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
@@ -91,7 +95,9 @@ submodules:
--arch=IA32 \
--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 \
@@ -105,7 +111,9 @@ submodules:
--arch=X64 \
--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
@@ -118,7 +126,9 @@ submodules:
--arch=X64 \
--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 \
Due to edk2 commits 631195044ff0 ("OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.", 2019-05-16) and 157a3b1aa50f ("ArmVirtPkg: Update DSC/FDF to use NetworkPkg's include fragment file.", 2019-05-16), we'll have to pefix the HTTP_BOOT_ENABLE and TLS_ENABLE build flags with "NETWORK_", for building edk2 at tag "edk2-stable201905". Right now the new flags are no-ops, so we can insert them separately, before advancing our edk2 submodule reference. We will remove the old flags afterwards. 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 | 10 ++++++++++ 1 file changed, 10 insertions(+)