[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] roms/Makefile.edk2: don't pull in submodules when building fr
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 2/5] roms/Makefile.edk2: don't pull in submodules when building from tarball |
Date: |
Mon, 7 Oct 2019 15:35:37 +0200 |
From: Michael Roth <address@hidden>
Currently the `make efi` target pulls submodules nested under the
roms/edk2 submodule as dependencies. However, when we attempt to build
from a tarball this fails since we are no longer in a git tree.
A preceding patch will pre-populate these submodules in the tarball,
so assume this build dependency is only needed when building from a
git tree.
Cc: Laszlo Ersek <address@hidden>
Cc: Bruce Rogers <address@hidden>
Cc: address@hidden # v4.1.0
Reported-by: Bruce Rogers <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
roms/Makefile.edk2 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index c2f2ff59d5..33a074d3a4 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -46,8 +46,13 @@ all: $(foreach
flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
# files.
.INTERMEDIATE: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd)
+# Fetch edk2 submodule's submodules. If it is not in a git tree, assume
+# we're building from a tarball and that they've already been fetched by
+# make-release/tarball scripts.
submodules:
- cd edk2 && git submodule update --init --force
+ if test -d edk2/.git; then \
+ cd edk2 && git submodule update --init --force; \
+ fi
# See notes on the ".NOTPARALLEL" target and the "+" indicator in
# "tests/uefi-test-tools/Makefile".
--
2.21.0
- [PULL 0/5] edk2-next patches for 2019-10-07, Philippe Mathieu-Daudé, 2019/10/07
- [PULL 1/5] make-release: pull in edk2 submodules so we can build it from tarballs, Philippe Mathieu-Daudé, 2019/10/07
- [PULL 2/5] roms/Makefile.edk2: don't pull in submodules when building from tarball,
Philippe Mathieu-Daudé <=
- [PULL 3/5] roms: Add a 'make help' target alias, Philippe Mathieu-Daudé, 2019/10/07
- [PULL 4/5] edk2 build scripts: honor external BaseTools flags with uefi-test-tools, Philippe Mathieu-Daudé, 2019/10/07
- [PULL 5/5] edk2 build scripts: work around TianoCore#1607 without forcing Python 2, Philippe Mathieu-Daudé, 2019/10/07
- Re: [PULL 0/5] edk2-next patches for 2019-10-07, Peter Maydell, 2019/10/08