From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu 2/7] buildsys: fixup submodule target
Date: Thu, 28 Sep 2023 14:59:21 +0200 [thread overview]
Message-ID: <20230928125926.202540-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230928125926.202540-1-f.ebner@proxmox.com>
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@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
next prev parent reply other threads:[~2023-09-28 13:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 12:59 [pve-devel] [PATCH-SERIES qemu] update to QEMU 8.1.1 Fiona Ebner
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 1/7] d/rules: use disable-download option instead of git-submodules=ignore Fiona Ebner
2023-09-28 12:59 ` Fiona Ebner [this message]
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 3/7] buildsys: use QEMU's keycodemapdb again Fiona Ebner
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 4/7] update submodule and patches to QEMU 8.1.1 Fiona Ebner
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 5/7] add patch to disable graph locking Fiona Ebner
2023-10-06 10:23 ` Fiona Ebner
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 6/7] add patch to avoid huge snapshot performance regression Fiona Ebner
2023-09-28 12:59 ` [pve-devel] [PATCH qemu 7/7] d/control: add versioned Breaks for qemu-server <= 8.0.6 Fiona Ebner
2023-09-29 9:50 ` [pve-devel] [PATCH qemu 8/8] cherry-pick stable fixes to avoid crash in IO error scenarios Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230928125926.202540-3-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox