From nobody Mon May 6 16:03:47 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940236345501.78379445768155; Thu, 31 Jan 2019 05:10:36 -0800 (PST) Received: from localhost ([127.0.0.1]:54512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC6o-0007fp-Rw for importer@patchew.org; Thu, 31 Jan 2019 08:10:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5H-0006vq-I5 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5F-0000AA-Ho for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:08:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5F-00009V-5l for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:08:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D13D2498C for ; Thu, 31 Jan 2019 13:08:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-190.ams2.redhat.com [10.36.117.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF354608E6; Thu, 31 Jan 2019 13:08:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A1BA5A1E9; Thu, 31 Jan 2019 14:00:16 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 14:00:16 +0100 Message-Id: <20190131130016.17337-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 31 Jan 2019 13:08:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3] scripts: use git archive in archive-source X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- scripts/archive-source.sh | 63 ++++++++++++++++++++-----------------------= ---- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 6eed2a29bd..38d53986d7 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -19,8 +19,8 @@ if test $# -lt 1; then fi =20 tar_file=3D$(realpath "$1") -list_file=3D"${tar_file}.list" -vroot_dir=3D"${tar_file}.vroot" +sub_file=3D$(mktemp "${tar_file%.tar}.sub.XXXXXXXX.tar") +sub_tdir=3D$(mktemp -d "${tar_file%.tar}.sub.XXXXXXXX") =20 # We want a predictable list of submodules for builds, that is # independent of what the developer currently has initialized @@ -28,7 +28,7 @@ vroot_dir=3D"${tar_file}.vroot" # different to the host OS. submodules=3D"dtc ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/b= erkeley-testfloat-3" =20 -trap "status=3D$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 = 1 2 3 15 +trap "status=3D$?; rm -rf \"$sub_file\" \"$sub_tdir\" ; exit \$status" 0 1= 2 3 15 =20 if git diff-index --quiet HEAD -- &>/dev/null then @@ -36,38 +36,29 @@ then else HEAD=3D$(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=3D"$(git submodule status "$sm")" + smhash=3D"${status# }" + smhash=3D"${smhash#+}" + smhash=3D"${smhash#-}" + smhash=3D"${smhash%% *}" + smdir=3D"$sm" + case "$status" in + -*) + smdir=3D"$sub_tdir/$sm" + smurl=3D"$(git config -f .gitmodules submodule.${sm}.url)" + echo "NOTICE: using temporary clone for submodule $sm" + git clone "$smurl" "$smdir" + test $? -ne 0 && error "failed to clone submodule $sm" + ;; + +*) + echo "WARNING: submodule $sm is out of sync" + ;; + esac + (cd $smdir; git archive --format tar --prefix "$sm/" $smhash) > "$sub_fil= e" + 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[*]}" !=3D "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) > "$li= st_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 --=20 2.9.3