[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] roms/efirom, tests/uefi-test-tools: update edk2's own subm
From: |
Laszlo Ersek |
Subject: |
[PATCH 02/10] roms/efirom, tests/uefi-test-tools: update edk2's own submodules first |
Date: |
Tue, 8 Sep 2020 09:29:31 +0200 |
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>
---
roms/Makefile | 1 +
tests/uefi-test-tools/Makefile | 1 +
2 files changed, 2 insertions(+)
diff --git a/roms/Makefile b/roms/Makefile
index 5d9f15b6777f..c594d98f7094 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -140,6 +140,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 1dcddcdbbabf..471f0de98109 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)' \
--
2.19.1.3.g30247aa5d201
- [PATCH 00/10] edk2: adopt the edk2-stable202008 release, Laszlo Ersek, 2020/09/08
- [PATCH 01/10] Makefile: remove obsolete edk2 exception from "clean" rule, Laszlo Ersek, 2020/09/08
- [PATCH 02/10] roms/efirom, tests/uefi-test-tools: update edk2's own submodules first,
Laszlo Ersek <=
- [PATCH 03/10] roms/Makefile.edk2: prepare for replacing TPM2*_ENABLE macros, Laszlo Ersek, 2020/09/08
- [PATCH 04/10] tests: acpi: tolerate "virt/SSDT.memhp" mismatch temporarily, Laszlo Ersek, 2020/09/08
- [PATCH 06/10] roms/Makefile.edk2: complete replacing TPM2*_ENABLE macros, Laszlo Ersek, 2020/09/08
- [PATCH 07/10] roms/Makefile.edk2: enable new ARM/AARCH64 flags up to edk2-stable202008, Laszlo Ersek, 2020/09/08
- [PATCH 08/10] pc-bios: refresh edk2 build artifacts for edk2-stable202008, Laszlo Ersek, 2020/09/08