From nobody Sun Feb 8 08:43:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506588538504579.8799880256299; Thu, 28 Sep 2017 01:48:58 -0700 (PDT) Received: from localhost ([::1]:58007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxUV7-0008QQ-QW for importer@patchew.org; Thu, 28 Sep 2017 04:48:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxUR6-0005Se-QX for qemu-devel@nongnu.org; Thu, 28 Sep 2017 04:44:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxUR5-0005sI-Cd for qemu-devel@nongnu.org; Thu, 28 Sep 2017 04:44:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50380) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxUR5-0005qZ-5q for qemu-devel@nongnu.org; Thu, 28 Sep 2017 04:44:47 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 322F4109A36; Thu, 28 Sep 2017 08:44:46 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B61386E63; Thu, 28 Sep 2017 08:44:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 322F4109A36 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 28 Sep 2017 09:44:26 +0100 Message-Id: <20170928084430.17059-3-berrange@redhat.com> In-Reply-To: <20170928084430.17059-1-berrange@redhat.com> References: <20170928084430.17059-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 28 Sep 2017 08:44:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 2/6] docker: don't rely on submodules existing in the main checkout 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: Peter Maydell , Fam Zheng , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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' most (all?) of the docker tests will fail due to the missing dtc package in the test images. Patchew manually checks out the dtc submodule in the main git checkout, but this is a bad idea. The docker tests should never mess around with the developer's main GIT checkout. When running tests we want to have a predictable set of submodules included in the source that's tested. The build environment is completely independant 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 --- scripts/archive-source.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index c4e7d98f4d..0d2046a80e 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -18,9 +18,15 @@ if test $# -lt 1; then error "Usage: $0 " fi =20 -tar_file=3D"$1" -list_file=3D"$1.list" -submodules=3D$(git submodule foreach --recursive --quiet 'echo $name') +tar_file=3D`realpath "$1"` +list_file=3D"${tar_file}.list" +vroot_dir=3D"${tar_file}.vroot" + +# We want a predictable list of submodules for builds, that is +# independant of what the developer currently has initialized +# in their checkout, because the build environment is completely +# different to the host OS. +submodules=3D"dtc" =20 if test $? -ne 0; then error "git submodule command failed" @@ -28,6 +34,14 @@ fi =20 trap "status=3D$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15 =20 +git clone --shared . "$vroot_dir" +here=3D`pwd` +cd "$vroot_dir" + +for sm in $submodules; do + git submodule update --init $sm +done + if test -n "$submodules"; then { git ls-files || error "git ls-files failed" @@ -48,4 +62,7 @@ fi =20 tar -cf "$tar_file" -T "$list_file" || error "failed to create tar file" =20 +cd "$here" +rm -rf "$vroot_dir" + exit 0 --=20 2.13.5