[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 4/6] build: don't fail if given a git submodule wh
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 4/6] build: don't fail if given a git submodule which does not exist |
Date: |
Tue, 7 Nov 2017 10:16:40 +0000 |
If going back in time in git history, across a commit that introduces a new
submodule, the 'git-submodule.sh' script will fail, causing rebuild to fail.
This is because config-host.mak contains a GIT_SUBMODULES variable that lists
a submodule that only exists in the later commit. config-host.mak won't get
repopulated until config.status is invoked, but make won't get this far due to
the submodule error.
This change makes 'git-submodule.sh' check whether each module is known to git
and drops any which are not present. A warning message will be printed when any
submodule is dropped in this manner.
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
scripts/git-submodule.sh | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 63ace6fc55..3683bc9a04 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -7,7 +7,7 @@ substat=".git-submodule-status"
command=$1
shift
-modules="$@"
+maybe_modules="$@"
test -z "$GIT" && GIT=git
@@ -33,12 +33,24 @@ error() {
exit 1
}
-if test -z "$modules"
+if test -z "$maybe_modules"
then
test -e $substat || touch $substat
exit 0
fi
+modules=""
+for m in $maybe_modules
+do
+ $GIT submodule status $m 1> /dev/null 2>&1
+ if test $? = 0
+ then
+ modules="$modules $m"
+ else
+ echo "warn: ignoring non-existent submodule $m"
+ fi
+done
+
if ! test -e ".git"
then
echo "$0: unexpectedly called with submodules but no git checkout exists"
--
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, 2017/11/07
- [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 <=
- Re: [Qemu-devel] [PULL v1 0/6] Merge build 2017/11/07, Peter Maydell, 2017/11/07