diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2019-06-06 11:59:09 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-06-14 21:47:33 +0200 |
| commit | b1625c660f940d408c51986768281d9d220bbe7d (patch) | |
| tree | eee66d8aecead8ed25a174cab86d7ee976378e02 | |
| parent | f3d0bec9f80e4ed7796fffa834ba0a53f2094f7f (diff) | |
| download | focaccia-qemu-b1625c660f940d408c51986768281d9d220bbe7d.tar.gz focaccia-qemu-b1625c660f940d408c51986768281d9d220bbe7d.zip | |
roms/Makefile.edk2: define edk2-stable201905 network feature test macros
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>
| -rw-r--r-- | roms/Makefile.edk2 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 index 822c547fec..071d6e454b 100644 --- a/roms/Makefile.edk2 +++ b/roms/Makefile.edk2 @@ -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 \ |