From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:39905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gp78R-0004QA-MT for qemu-devel@nongnu.org; Thu, 31 Jan 2019 02:51:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gp78Q-0008OH-Od for qemu-devel@nongnu.org; Thu, 31 Jan 2019 02:51:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gp78Q-0008NT-H9 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 02:51:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8678288E5A for ; Thu, 31 Jan 2019 07:51:40 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 31 Jan 2019 08:51:32 +0100 Message-Id: <20190131075132.17706-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2] scripts: use git archive in archive-source List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, Gerd Hoffmann Use git archive to create tarballs of qemu and submodules instead of cloning the repository and the submodules. This is a order of magnitude faster because it doesn't fetch the submodules from the internet each time the script runs. Signed-off-by: Gerd Hoffmann --- Notes: v2: don't run git submodule update (except for uninitialized submodules) scripts/archive-source.sh | 58 ++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 6eed2a29bd..b9711059f9 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -19,8 +19,7 @@ if test $# -lt 1; then fi tar_file=$(realpath "$1") -list_file="${tar_file}.list" -vroot_dir="${tar_file}.vroot" +sub_file=$(mktemp "${tar_file%.tar}.sub.XXXXXXXX.tar") # We want a predictable list of submodules for builds, that is # independent of what the developer currently has initialized @@ -28,7 +27,7 @@ vroot_dir="${tar_file}.vroot" # different to the host OS. submodules="dtc ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" -trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15 +trap "status=$?; rm -rf \"$sub_file\" ; exit \$status" 0 1 2 3 15 if git diff-index --quiet HEAD -- &>/dev/null then @@ -36,38 +35,25 @@ then 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" - +git archive --format tar $HEAD > "$tar_file" +test $? -ne 0 && error "failed to archive qemu" for sm in $submodules; do - git submodule update --init $sm - test $? -ne 0 && error "failed to init submodule $sm" + status="$(git submodule status "$sm")" + smhash="${status# }" + smhash="${smhash#+}" + smhash="${smhash#-}" + smhash="${smhash%% *}" + case "$status" in + -*) + echo "NOTICE: fetching submodule $sm" + git submodule update --init "$sm" + ;; + +*) + echo "WARNING: submodule $sm is out of sync" + ;; + esac + (cd $sm; git archive --format tar --prefix "$sm/" $smhash) > "$sub_file" + test $? -ne 0 && error "failed to archive submodule $sm ($smhash)" + tar --concatenate --file "$tar_file" "$sub_file" + test $? -ne 0 && error "failed append submodule $sm to $tar_file" 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 - -if test $? -ne 0; then - error "failed to generate list file" -fi - -tar -cf "$tar_file" -T "$list_file" || error "failed to create tar file" - -exit 0 -- 2.9.3