From ec87b5daca761039bbcf781eedbe4987f790836f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 7 Sep 2020 22:13:02 +0200 Subject: 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é Ref: https://bugs.launchpad.net/qemu/+bug/1852196 Signed-off-by: Laszlo Ersek Tested-by: Philippe Mathieu-Daudé Message-Id: <20200908072939.30178-3-lersek@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- roms/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'roms') 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)' \ -- cgit v1.2.3-55-g7522