From patchwork Wed Apr 4 02:51:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 894847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40G9W55pqyz9s0b for ; Wed, 4 Apr 2018 12:53:04 +1000 (AEST) Received: from localhost ([::1]:55132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3YXl-0001VR-Lz for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2018 22:53:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3YXB-0001V3-EU for qemu-devel@nongnu.org; Tue, 03 Apr 2018 22:52:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3YX8-0003do-Cu for qemu-devel@nongnu.org; Tue, 03 Apr 2018 22:52:25 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48866 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3YX8-0003de-7a for qemu-devel@nongnu.org; Tue, 03 Apr 2018 22:52:22 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D000406E8A4; Wed, 4 Apr 2018 02:52:20 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-21.pek2.redhat.com [10.72.12.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2369B10FFE70; Wed, 4 Apr 2018 02:52:16 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 4 Apr 2018 10:51:59 +0800 Message-Id: <20180404025201.11921-2-famz@redhat.com> In-Reply-To: <20180404025201.11921-1-famz@redhat.com> References: <20180404025201.11921-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 04 Apr 2018 02:52:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 04 Apr 2018 02:52:20 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'famz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/3] archive-source.sh: Drop submodule code 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: =?utf-8?q?Alex_Benn=C3=A9e?= , pbonzini@redhat.com, Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" ./configure and make now take care of submodules, we only need to clone the top tree. Signed-off-by: Fam Zheng --- 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 " 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"