[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 3/6] build: allow automatic git submodule updates
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 3/6] build: allow automatic git submodule updates to be disabled |
Date: |
Tue, 7 Nov 2017 10:16:39 +0000 |
Some people building QEMU use VPATH builds where the source directory is on a
read-only volume. In such a case 'scripts/git-submodules.sh update' will always
fail and users are required to run it manually themselves on their original
writable source directory.
While this is already supported, it is nice to give users a command line flag
to configure to permanently disable automatic submodule updates, as it means
they won't get hard to diagnose failures from git-submodules.sh at an arbitrary
later date.
This patch thus introduces a flag '--disable-git-update' which will prevent
'make' from ever running 'scripts/git-submodules.sh update'. It will still run
the 'status' command to determine if a submodule update is needed, but when it
does this it'll simply stop and print a message instructing the developer what
todo. eg
$ ./configure --target-list=x86_64-softmmu --disable-git-update
...snip...
$ make
GEN config-host.h
GEN trace/generated-tcg-tracers.h
GEN trace/generated-helpers-wrappers.h
GEN trace/generated-helpers.h
GEN trace/generated-helpers.c
GEN module_block.h
GIT submodule checkout is out of date. Please run
scripts/git-submodule.sh update ui/keycodemapdb
from the source directory checkout /home/berrange/src/virt/qemu
make: *** [Makefile:31: git-submodule-update] Error 1
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile | 11 +++++++++++
configure | 7 +++++++
scripts/git-submodule.sh | 9 +++++++++
3 files changed, 27 insertions(+)
diff --git a/Makefile b/Makefile
index d218f8f3c8..a92d7b8e14 100644
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,23 @@ ifeq (0,$(MAKELEVEL))
)
ifeq (1,$(git_module_status))
+ifeq (no,$(GIT_UPDATE))
+git-submodule-update:
+ $(call quiet-command, \
+ echo && \
+ echo "GIT submodule checkout is out of date. Please run" && \
+ echo " scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \
+ echo "from the source directory checkout $(SRC_PATH)" && \
+ echo && \
+ exit 1)
+else
git-submodule-update:
$(call quiet-command, \
(cd $(SRC_PATH) && GIT="$(GIT)" ./scripts/git-submodule.sh update
$(GIT_SUBMODULES)), \
"GIT","$(GIT_SUBMODULES)")
endif
endif
+endif
.git-submodule-status: git-submodule-update config-host.mak
diff --git a/configure b/configure
index 5af463fed6..a6055c0710 100755
--- a/configure
+++ b/configure
@@ -267,8 +267,10 @@ stack_protector=""
if test -e "$source_path/.git"
then
+ git_update=yes
git_submodules="ui/keycodemapdb"
else
+ git_update=no
git_submodules=""
fi
git="git"
@@ -1306,6 +1308,10 @@ for opt do
;;
--with-git=*) git="$optarg"
;;
+ --enable-git-update) git_update=yes
+ ;;
+ --disable-git-update) git_update=no
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -5610,6 +5616,7 @@ echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
echo "GIT=$git" >> $config_host_mak
echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
+echo "GIT_UPDATE=$git_update" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 21909ea413..63ace6fc55 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -21,6 +21,15 @@ error() {
echo
echo " $ ./configure --with-git='tsocks git'"
echo
+ echo "Alternatively you may disable automatic GIT submodule checkout"
+ echo "with:"
+ echo
+ echo " $ ./configure --disable-git-update'"
+ echo
+ echo "and then manually update submodules prior to running make, with:"
+ echo
+ echo " $ scripts/git-sbumodule.sh update $modules"
+ echo
exit 1
}
--
2.13.6
- [Qemu-devel] [PULL v1 0/6] Merge build 2017/11/07, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 3/6] build: allow automatic git submodule updates to be disabled,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 1/6] build: allow setting a custom GIT binary for transparent proxying, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 5/6] build: delay check for empty git submodule list, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 2/6] build: don't create temporary files in source dir, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 6/6] build: remove use of MAKELEVEL optimization in submodule handling, Daniel P. Berrange, 2017/11/07
- [Qemu-devel] [PULL v1 4/6] build: don't fail if given a git submodule which does not exist, Daniel P. Berrange, 2017/11/07
- Re: [Qemu-devel] [PULL v1 0/6] Merge build 2017/11/07, Peter Maydell, 2017/11/07