From a6ddea7ef77fadb0d71b4fffa5d686802b577fcb Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Tue, 17 Oct 2023 14:10:07 +0200 Subject: [PATCH] buildsys: fixup submodule target It's not enough to initialize the submodules anymore, as some got replaced by wrap files, see QEMU commit 2019cabfee ("meson: subprojects: replace submodules with wrap files"). Download the subprojects during initialization of the QEMU submodule, so building (without the automagical --enable-download) can succeeed afterwards. Signed-off-by: Fiona Ebner Signed-off-by: Thomas Lamprecht --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6c62c78..e389a9c 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,10 @@ all: $(DEBS) .PHONY: submodule submodule: - test -f "$(SRCDIR)/configure" || git submodule update --init --recursive +ifeq ($(shell test -f "$(SRCDIR)/configure" && echo 1 || echo 0), 0) + git submodule update --init --recursive + cd $(SRCDIR); meson subprojects download +endif PC_BIOS_FW_PURGE_LIST_IN = \ hppa-firmware.img \