From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxVNP-0007Br-B8 for qemu-devel@nongnu.org; Thu, 28 Sep 2017 05:45:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxVNL-0006yi-Ap for qemu-devel@nongnu.org; Thu, 28 Sep 2017 05:45:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39012) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxVNL-0006yP-1v for qemu-devel@nongnu.org; Thu, 28 Sep 2017 05:44:59 -0400 Date: Thu, 28 Sep 2017 17:44:53 +0800 From: Fam Zheng Message-ID: <20170928094453.GD26066@lemon.lan> References: <20170928084430.17059-1-berrange@redhat.com> <20170928084430.17059-3-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170928084430.17059-3-berrange@redhat.com> Subject: Re: [Qemu-devel] [PATCH v6 2/6] docker: don't rely on submodules existing in the main checkout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org, Gerd Hoffmann , Peter Maydell , Paolo Bonzini , Alex =?iso-8859-1?Q?Benn=E9e?= On Thu, 09/28 09:44, Daniel P. Berrange wrote: > 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. Not all, fail only in envs/configs where libfdt devel doesn't exist. But I'm not sure about this patch (*). > 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. Or in general, scripts should not mess around with developer's GIT checkouts, which is the reason ./configure doesn't do it? How about we clone/checkout dtc into a temporary dir from ./configure automatically instead? > > 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 > > -tar_file="$1" > -list_file="$1.list" > -submodules=$(git submodule foreach --recursive --quiet 'echo $name') > +tar_file=`realpath "$1"` > +list_file="${tar_file}.list" > +vroot_dir="${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="dtc" > > if test $? -ne 0; then > error "git submodule command failed" > @@ -28,6 +34,14 @@ fi > > trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15 > > +git clone --shared . "$vroot_dir" (*) This loses the feature that uncommitted changes are also reflected in the tarball. Personally I rarely use it but since day one of docker tests we've deliberately supported that. Cc'ing Alex who originally implemented that with "git diff-index" and "git archive". Fam