* [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build
@ 2017-10-18 13:06 Paolo Bonzini
2017-10-18 13:13 ` Daniel P. Berrange
2017-10-18 14:10 ` Fam Zheng
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2017-10-18 13:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Fam Zheng
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.
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")
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build
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
2017-10-18 14:10 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Berrange @ 2017-10-18 13:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, Fam Zheng
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 :|
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build
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
@ 2017-10-18 14:10 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Fam Zheng @ 2017-10-18 14:10 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Wed, 10/18 15:06, 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.
>
> Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd
> Cc: Fam Zheng <famz@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Queued, thanks!
Fam
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-18 14:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2017-10-18 14:10 ` Fam Zheng
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).