[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout |
Date: |
Fri, 29 Sep 2017 11:11:57 +0100 |
When building the tarball to pass into the docker/vm test image,
the code relies on the git submodules being checked out in the
main checkout.
ie if the developer has not run 'git submodule update --init dtc'
many of the docker tests will fail due to the libfdt package not
being present in the test images. Patchew manually checks out the
dtc submodule in the main git checkout, but this is a bad idea.
When running tests we want to have a predictable set of submodules
included in the source that's tested. The build environment is
completely independent of the developers host OS, so the submodules
the developer has checked out should not be considered relevant for
the tests.
This changes the archive-source.sh script so that it clones the
current git checkout into a temporary directory, checks out a
fixed set of submodules, builds the tarball and finally removes
the temporary git clone.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
scripts/archive-source.sh | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index c4e7d98f4d..4029de7b20 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -18,15 +18,37 @@ if test $# -lt 1; then
error "Usage: $0 <output tarball>"
fi
-tar_file="$1"
-list_file="$1.list"
-submodules=$(git submodule foreach --recursive --quiet 'echo $name')
+tar_file=`realpath "$1"`
+list_file="${tar_file}.list"
+vroot_dir="${tar_file}.vroot"
-if test $? -ne 0; then
- error "git submodule command failed"
+# We want a predictable list of submodules for builds, that is
+# independent of what the developer currently has initialized
+# in their checkout, because the build environment is completely
+# different to the host OS.
+submodules="dtc"
+
+trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3
15
+
+if git diff-index --quiet HEAD -- &>/dev/null
+then
+ HEAD=HEAD
+else
+ HEAD=`git stash create`
fi
+git clone --shared . "$vroot_dir"
+test $? -ne 0 && error "failed to clone into '$vroot_dir'"
+
+cd "$vroot_dir"
+test $? -ne 0 && error "failed to change into '$vroot_dir'"
+
+git checkout $HEAD
+test $? -ne 0 && error "failed to checkout $HEAD revision"
-trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
+for sm in $submodules; do
+ git submodule update --init $sm
+ test $? -ne 0 && error "failed to init submodule $sm"
+done
if test -n "$submodules"; then
{
--
2.13.5
- [Qemu-devel] [PATCH v8 0/6] Initial support for keycodemapdb GIT submodule, Daniel P. Berrange, 2017/09/29
- [Qemu-devel] [PATCH v8 1/6] build: automatically handle GIT submodule checkout for dtc, Daniel P. Berrange, 2017/09/29
- [Qemu-devel] [PATCH v8 3/6] ui: add keycodemapdb repository as a GIT submodule, Daniel P. Berrange, 2017/09/29
- [Qemu-devel] [PATCH v8 2/6] docker: don't rely on submodules existing in the main checkout,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v8 4/6] ui: convert common input code to keycodemapdb, Daniel P. Berrange, 2017/09/29
- [Qemu-devel] [PATCH v8 5/6] ui: convert key events to QKeyCodes immediately, Daniel P. Berrange, 2017/09/29
- [Qemu-devel] [PATCH v8 6/6] ui: don't export qemu_input_event_new_key, Daniel P. Berrange, 2017/09/29