docker: Add EXTRA_CONFIGURE_OPTS

Whatever passed in this variable will be appended to all
configure commands.

Signed-off-by: Fam Zheng <[email protected]>
Reviewed-by: Alex Bennée <[email protected]>
Message-id: 1464755128[email protected]

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ef8bcaea599a56e8567863deebd132ac9e0c28b2..2fd2ca305716bc6670a260a8c11748413f2e31b9 100644 (file)
--- 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 74b89d6c1e4f49e717875b0df0c45312ce2138ef..c493eebd453714ed28ccab1dd5b0538b1a788612 100755 (executable)
--- 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
 }