qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, Fam Zheng <famz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build
Date: Wed, 18 Oct 2017 14:13:42 +0100	[thread overview]
Message-ID: <20171018131342.GH9719@redhat.com> (raw)
In-Reply-To: <1508331989-142364-1-git-send-email-pbonzini@redhat.com>

On Wed, Oct 18, 2017 at 03:06:29PM +0200, Paolo Bonzini wrote:
> The new script uses "git submodule", which is picky about being invoked
> from the top of the git checkout.  Invoke the script from $(SRC_PATH)
> to avoid git's wrath.

I wonder if there's interest in being "evil" and flat out refusing to
ever build with srcdir==builddir. We have a never ending stream of
bugs where we forget to consider one of the two possible scenarios.

> 
> Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd
> Cc: Fam Zheng <famz@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> 
> ---
>  tests/docker/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 6f9ea19..b6d9fa3 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -18,11 +18,11 @@ TESTS ?= %
>  IMAGES ?= %
>  
>  CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
> -DOCKER_SRC_COPY := docker-src.$(CUR_TIME)
> +DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
>  
>  $(DOCKER_SRC_COPY):
>  	@mkdir $@
> -	$(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \
> +	$(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \
>  		"GEN", "$@/qemu.tar")
>  	$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \
>  		"COPY","RUNNER")

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

  reply	other threads:[~2017-10-18 13:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-18 13:06 [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build Paolo Bonzini
2017-10-18 13:13 ` Daniel P. Berrange [this message]
2017-10-18 14:10 ` Fam Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171018131342.GH9719@redhat.com \
    --to=berrange@redhat.com \
    --cc=famz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).