[pve-devel] [PATCH qemu 2/7] buildsys: fixup submodule target

Fiona Ebner f.ebner at proxmox.com
Thu Sep 28 14:59:21 CEST 2023


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 <f.ebner at proxmox.com>
---
 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 \
-- 
2.39.2






More information about the pve-devel mailing list