From ae48b426832f99bdae88a0da4f62e0071025b6af Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 21 Apr 2020 23:54:42 -0500 Subject: payloads/tianocore: Init submodules Recent changes to upstream edk2 necessitate ensuring that Tianocore's submodules exist and are up to date, otherwise building UefiPayloadPkg will fail. Change method used to detect a dirty tree so that initialized submodules do not taint the result. Test: build qemu with Tianocore UefiPayloadPkg option successfully. Change-Id: Ie2541f048966ec0666d8196508ccdb6c5f089de6 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/40590 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- payloads/external/tianocore/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 58eb458904..46bc2bdffa 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -70,12 +70,13 @@ update: $(project_dir) echo " $(TAG) is not a valid git reference"; \ exit 1; \ fi; \ - if git describe --all --dirty | grep -qv dirty; then \ + if git status --ignore-submodules=dirty | grep -qv clean; then \ echo " Checking out $(project_name) revision $(TAG)"; \ git checkout --detach $(TAG); \ else \ echo " Working directory not clean; will not overwrite"; \ - fi + fi; \ + git submodule update --init --recursive checktools: echo "Checking uuid-dev..." -- cgit v1.2.3