[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/26] configure: simplify assignment to GIT_SUBMODULES
From: |
Paolo Bonzini |
Subject: |
[PULL 03/26] configure: simplify assignment to GIT_SUBMODULES |
Date: |
Thu, 20 May 2021 10:22:34 +0200 |
Do not guard each assignment with a check for --with-git-submodules=ignore.
To avoid a confusing "GIT" line from the Makefile, guard the
git-submodule-update
recipe so that it is empty when --with-git-submodules=ignore.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 2 ++
configure | 20 ++++++--------------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 4cab10a2a4..30f19d33bb 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,11 @@ Makefile: .git-submodule-status
.PHONY: git-submodule-update
git-submodule-update:
+ifneq ($(GIT_SUBMODULES_ACTION),ignore)
$(call quiet-command, \
(GIT="$(GIT)" "$(SRC_PATH)/scripts/git-submodule.sh"
$(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \
"GIT","$(GIT_SUBMODULES)")
+endif
# 0. ensure the build tree is okay
diff --git a/configure b/configure
index 4681cbe2d7..55049fe930 100755
--- a/configure
+++ b/configure
@@ -256,11 +256,11 @@ gdb_bin=$(command -v "gdb-multiarch" || command -v "gdb")
if test -e "$source_path/.git"
then
git_submodules_action="update"
- git_submodules="ui/keycodemapdb"
else
git_submodules_action="ignore"
- git_submodules=""
fi
+
+git_submodules="ui/keycodemapdb"
git="git"
# Don't accept a target_list environment variable.
@@ -3617,9 +3617,7 @@ fi
case "$fdt" in
auto | enabled | internal)
# Simpler to always update submodule, even if not needed.
- if test "$git_submodules_action" != "ignore"; then
- git_submodules="${git_submodules} dtc"
- fi
+ git_submodules="${git_submodules} dtc"
;;
esac
@@ -4328,9 +4326,7 @@ fi
case "$capstone" in
auto | enabled | internal)
# Simpler to always update submodule, even if not needed.
- if test "$git_submodules_action" != "ignore"; then
- git_submodules="${git_submodules} capstone"
- fi
+ git_submodules="${git_submodules} capstone"
;;
esac
@@ -5260,9 +5256,7 @@ fi
case "$slirp" in
auto | enabled | internal)
# Simpler to always update submodule, even if not needed.
- if test "$git_submodules_action" != "ignore"; then
- git_submodules="${git_submodules} slirp"
- fi
+ git_submodules="${git_submodules} slirp"
;;
esac
@@ -5454,9 +5448,7 @@ if test "$cpu" = "s390x" ; then
roms="$roms s390-ccw"
# SLOF is required for building the s390-ccw firmware on s390x,
# since it is using the libnet code from SLOF for network booting.
- if test "$git_submodules_action" != "ignore"; then
- git_submodules="${git_submodules} roms/SLOF"
- fi
+ git_submodules="${git_submodules} roms/SLOF"
fi
fi
--
2.31.1
- [PULL 00/26] Misc patches for 2021-05-20, Paolo Bonzini, 2021/05/20
- [PULL 03/26] configure: simplify assignment to GIT_SUBMODULES,
Paolo Bonzini <=
- [PULL 01/26] configure: Only clone softfloat-3 repositories if TCG is enabled, Paolo Bonzini, 2021/05/20
- [PULL 14/26] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Paolo Bonzini, 2021/05/20
- [PULL 04/26] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on', Paolo Bonzini, 2021/05/20
- [PULL 12/26] KVM: Create the KVMSlot dirty bitmap on flag changes, Paolo Bonzini, 2021/05/20
- [PULL 02/26] configure: check for submodules if --with-git-submodules=ignore, Paolo Bonzini, 2021/05/20
- [PULL 07/26] object: add more commands to preconfig mode, Paolo Bonzini, 2021/05/20
- [PULL 05/26] i386/cpu: Expose AVX_VNNI instruction to guest, Paolo Bonzini, 2021/05/20
- [PULL 21/26] meson: Set implicit_include_directories to false, Paolo Bonzini, 2021/05/20
- [PULL 20/26] tests/qtest/fuzz: Fix build failure, Paolo Bonzini, 2021/05/20
- [PULL 08/26] qtest: add a QOM object for qtest, Paolo Bonzini, 2021/05/20