[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir b
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build |
Date: |
Wed, 18 Oct 2017 14:13:42 +0100 |
User-agent: |
Mutt/1.9.1 (2017-09-22) |
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 <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
>
> ---
> 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 <address@hidden>
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 :|