[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/28] configure: check for submodules if --with-git-submodules=ig
From: |
Paolo Bonzini |
Subject: |
[PULL 02/28] configure: check for submodules if --with-git-submodules=ignore |
Date: |
Mon, 24 May 2021 18:41:05 +0200 |
Right now --with-git-submodules=ignore has a subtle difference from
just running without a .git directory, in that it does not check
that submodule sources actually exist. Move the check for
ui/keycodemapdb/README so that it happens even if the user
specified --with-git-submodules=ignore, with a customized
error message that is more suitable for this situation.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 808874cb31..f32c6f1a26 100755
--- a/configure
+++ b/configure
@@ -260,24 +260,6 @@ then
else
git_submodules_action="ignore"
git_submodules=""
-
- if ! test -f "$source_path/ui/keycodemapdb/README"
- then
- echo
- echo "ERROR: missing file $source_path/ui/keycodemapdb/README"
- echo
- echo "This is not a GIT checkout but module content appears to"
- echo "be missing. Do not use 'git archive' or GitHub download links"
- echo "to acquire QEMU source archives. Non-GIT builds are only"
- echo "supported with source archives linked from:"
- echo
- echo " https://www.qemu.org/download/#source"
- echo
- echo "Developers working with GIT can use scripts/archive-source.sh"
- echo "if they need to create valid source archives."
- echo
- exit 1
- fi
fi
git="git"
@@ -1591,6 +1573,28 @@ case $git_submodules_action in
fi
;;
ignore)
+ if ! test -f "$source_path/ui/keycodemapdb/README"
+ then
+ echo
+ echo "ERROR: missing GIT submodules"
+ echo
+ if test -e "$source_path/.git"; then
+ echo "--with-git-submodules=ignore specified but submodules
were not"
+ echo "checked out. Please initialize and update submodules."
+ else
+ echo "This is not a GIT checkout but module content appears to"
+ echo "be missing. Do not use 'git archive' or GitHub download
links"
+ echo "to acquire QEMU source archives. Non-GIT builds are only"
+ echo "supported with source archives linked from:"
+ echo
+ echo " https://www.qemu.org/download/#source"
+ echo
+ echo "Developers working with GIT can use
scripts/archive-source.sh"
+ echo "if they need to create valid source archives."
+ fi
+ echo
+ exit 1
+ fi
;;
*)
echo "ERROR: invalid --with-git-submodules= value
'$git_submodules_action'"
--
2.31.1
- [PULL 00/28] Misc patches for 2021-05-24, Paolo Bonzini, 2021/05/24
- [PULL 08/28] KVM: do not allow setting properties at runtime, Paolo Bonzini, 2021/05/24
- [PULL 10/28] KVM: Use a big lock to replace per-kml slots_lock, Paolo Bonzini, 2021/05/24
- [PULL 03/28] configure: simplify assignment to GIT_SUBMODULES, Paolo Bonzini, 2021/05/24
- [PULL 06/28] object: add more commands to preconfig mode, Paolo Bonzini, 2021/05/24
- [PULL 04/28] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on', Paolo Bonzini, 2021/05/24
- [PULL 21/28] remove qemu-options* from root directory, Paolo Bonzini, 2021/05/24
- [PULL 11/28] KVM: Create the KVMSlot dirty bitmap on flag changes, Paolo Bonzini, 2021/05/24
- [PULL 13/28] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Paolo Bonzini, 2021/05/24
- [PULL 02/28] configure: check for submodules if --with-git-submodules=ignore,
Paolo Bonzini <=
- [PULL 09/28] memory: Introduce log_sync_global() to memory listener, Paolo Bonzini, 2021/05/24
- [PULL 01/28] configure: Only clone softfloat-3 repositories if TCG is enabled, Paolo Bonzini, 2021/05/24
- [PULL 22/28] replication: move include out of root directory, Paolo Bonzini, 2021/05/24
- [PULL 19/28] tests/qtest/fuzz: Fix build failure, Paolo Bonzini, 2021/05/24
- [PULL 18/28] KVM: Dirty ring support, Paolo Bonzini, 2021/05/24
- [PULL 20/28] meson: Set implicit_include_directories to false, Paolo Bonzini, 2021/05/24
- [PULL 25/28] doc: Add notes about -mon option mode=control argument., Paolo Bonzini, 2021/05/24
- [PULL 07/28] qtest: add a QOM object for qtest, Paolo Bonzini, 2021/05/24
- [PULL 27/28] hw/scsi: Fix sector translation bug in scsi_unmap_complete_noio, Paolo Bonzini, 2021/05/24
- [PULL 26/28] configure: Avoid error messages about missing *-config-*.h files, Paolo Bonzini, 2021/05/24