diff options
| author | Laszlo Ersek | 2020-09-07 22:13:02 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-09-13 23:03:14 +0200 |
| commit | ec87b5daca761039bbcf781eedbe4987f790836f (patch) | |
| tree | 3ad2211fcab1f05045f4641a61f5bc8b84e20529 | |
| parent | Makefile: remove obsolete edk2 exception from "clean" rule (diff) | |
| download | qemu-ec87b5daca761039bbcf781eedbe4987f790836f.tar.gz qemu-ec87b5daca761039bbcf781eedbe4987f790836f.tar.xz qemu-ec87b5daca761039bbcf781eedbe4987f790836f.zip | |
roms/efirom, tests/uefi-test-tools: update edk2's own submodules first
In edk2 commit 06033f5abad3 ("BaseTools: Make brotli a submodule",
2020-04-16), part of edk2-stable202005, the Brotli compressor /
decompressor source code that edk2 had flattened into BaseTools was
replaced with a git submodule.
This means we have to initialize edk2's own submodules before building
BaseTools not just in "roms/Makefile.edk2", but in "roms/Makefile" (for
the sake of the "efirom" target) and "tests/uefi-test-tools/Makefile" as
well.
Right now this patch is effectively a no-op; it will become meaningful
after we move the edk2 submodule to edk2-stable202008.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugs.launchpad.net/qemu/+bug/1852196
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908072939.30178-3-lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | roms/Makefile | 1 | ||||
| -rw-r--r-- | tests/uefi-test-tools/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/roms/Makefile b/roms/Makefile index 8cafced348..d3a3228359 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -138,6 +138,7 @@ build-efi-roms: build-pxe-roms # efirom # edk2-basetools: + cd edk2/BaseTools && git submodule update --init --force $(MAKE) -C edk2/BaseTools \ PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile index 1dcddcdbba..471f0de981 100644 --- a/tests/uefi-test-tools/Makefile +++ b/tests/uefi-test-tools/Makefile @@ -99,6 +99,7 @@ Build/bios-tables-test.%.efi: build-edk2-tools +./build.sh $(edk2_dir) BiosTablesTest $* $@ build-edk2-tools: + cd $(edk2_dir)/BaseTools && git submodule update --init --force $(MAKE) -C $(edk2_dir)/BaseTools \ PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ |