From 35e0f959b51dd8d4df0add9c01bff29ec74828ea Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 1 Jun 2016 12:25:27 +0800 Subject: [PATCH] docker: Add EXTRA_CONFIGURE_OPTS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Whatever passed in this variable will be appended to all configure commands. Signed-off-by: Fam Zheng Reviewed-by: Alex Bennée Message-id: 1464755128-32490-15-git-send-email-famz@redhat.com --- tests/docker/Makefile.include | 3 +++ tests/docker/common.rc | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ef8bcaea59..2fd2ca3057 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -87,6 +87,8 @@ docker: @echo @echo 'Special variables:' @echo ' TARGET_LIST=a,b,c Override target list in builds.' + @echo ' EXTRA_CONFIGURE_OPTS="..."' + @echo ' Extra configure options.' @echo ' IMAGES="a b c ..": Filters which images to build or run.' @echo ' TESTS="x y z .." Filters which tests to run (for docker-test).' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @@ -108,6 +110,7 @@ docker-run-%: docker-qemu-src -t \ $(if $(DEBUG),-i,--net=none) \ -e TARGET_LIST=$(TARGET_LIST) \ + -e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS) \ -e V=$V -e J=$J -e DEBUG=$(DEBUG)\ -e CCACHE_DIR=/var/tmp/ccache \ -v $$(realpath $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 74b89d6c1e..c493eebd45 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -26,6 +26,7 @@ build_qemu() $QEMU_SRC/configure \ --target-list="${TARGET_LIST}" \ --prefix="$PWD/install" \ + $EXTRA_CONFIGURE_OPTS \ "$@" make $MAKEFLAGS }