[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] archive-source.sh: Drop submodule code
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 1/3] archive-source.sh: Drop submodule code |
Date: |
Wed, 4 Apr 2018 10:51:59 +0800 |
./configure and make now take care of submodules, we only need to clone
the top tree.
Signed-off-by: Fam Zheng <address@hidden>
---
scripts/archive-source.sh | 47 ++++-------------------------------------------
1 file changed, 4 insertions(+), 43 deletions(-)
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 4e63774f9a..d53774d507 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -18,51 +18,12 @@ if test $# -lt 1; then
error "Usage: $0 <output tarball>"
fi
-tar_file=`realpath "$1"`
-list_file="${tar_file}.list"
-vroot_dir="${tar_file}.vroot"
+tar_file="$1"
+list_file="$1.list"
-# 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 ui/keycodemapdb"
+trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
-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"
-
-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
- {
- git ls-files || error "git ls-files failed"
- for sm in $submodules; do
- (cd $sm; git ls-files) | sed "s:^:$sm/:"
- if test "${PIPESTATUS[*]}" != "0 0"; then
- error "git ls-files in submodule $sm failed"
- fi
- done
- } | grep -x -v $(for sm in $submodules; do echo "-e $sm"; done) >
"$list_file"
-else
- git ls-files > "$list_file"
-fi
+( git ls-files && echo '.git' ) > "$list_file"
if test $? -ne 0; then
error "failed to generate list file"
--
2.14.3
[Qemu-devel] [PATCH 2/3] tests: Add an option for snapshot (default: off), Fam Zheng, 2018/04/03
[Qemu-devel] [PATCH 3/3] tests: Add centos VM testing, Fam Zheng, 2018/04/03
Re: [Qemu-devel] [PATCH 0/3] Add a CentOS test image to run docker tests, no-reply, 2018/04/03
Re: [Qemu-devel] [PATCH 0/3] Add a CentOS test image to run docker tests, no-reply, 2018/04/04
Re: [Qemu-devel] [PATCH 0/3] Add a CentOS test image to run docker tests, Peter Xu, 2018/04/04