From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5EE8CF154 for ; Thu, 28 Sep 2023 15:01:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 405DA167BE for ; Thu, 28 Sep 2023 15:00:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Sep 2023 15:00:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DA6AC48E2F for ; Thu, 28 Sep 2023 15:00:50 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 28 Sep 2023 14:59:21 +0200 Message-Id: <20230928125926.202540-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230928125926.202540-1-f.ebner@proxmox.com> References: <20230928125926.202540-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.082 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu 2/7] buildsys: fixup submodule target X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Sep 2023 13:01:22 -0000 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 --- 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