| Message ID | 1458196505-5473-13-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
Fam Zheng <famz@redhat.com> writes: > Whatever passed in this variable will be appended to all > configure commands. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > > Signed-off-by: Fam Zheng <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 033809a..4270a44 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -86,6 +86,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' > @@ -106,6 +108,7 @@ docker-run-%: docker-qemu-src > --privileged -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 $(SRC_COPY)):/var/tmp/qemu:ro \ > diff --git a/tests/docker/common.rc b/tests/docker/common.rc > index 74b89d6..c493eeb 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 > } -- Alex Bennée
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 033809a..4270a44 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -86,6 +86,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' @@ -106,6 +108,7 @@ docker-run-%: docker-qemu-src --privileged -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 $(SRC_COPY)):/var/tmp/qemu:ro \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 74b89d6..c493eeb 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 }
Whatever passed in this variable will be appended to all configure commands. Signed-off-by: Fam Zheng <famz@redhat.com> --- tests/docker/Makefile.include | 3 +++ tests/docker/common.rc | 1 + 2 files changed, 4 insertions(+)