docker: Add EXTRA_CONFIGURE_OPTS

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

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1464755128-32490-15-git-send-email-famz@redhat.com
This commit is contained in:
Fam Zheng 2016-06-01 12:25:27 +08:00
parent dc2e7eebd8
commit 35e0f959b5
2 changed files with 4 additions and 0 deletions

View File

@ -87,6 +87,8 @@ docker:
@echo @echo
@echo 'Special variables:' @echo 'Special variables:'
@echo ' TARGET_LIST=a,b,c Override target list in builds.' @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 ' 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 ' TESTS="x y z .." Filters which tests to run (for docker-test).'
@echo ' J=[0..9]* Overrides the -jN parameter for make commands' @echo ' J=[0..9]* Overrides the -jN parameter for make commands'
@ -108,6 +110,7 @@ docker-run-%: docker-qemu-src
-t \ -t \
$(if $(DEBUG),-i,--net=none) \ $(if $(DEBUG),-i,--net=none) \
-e TARGET_LIST=$(TARGET_LIST) \ -e TARGET_LIST=$(TARGET_LIST) \
-e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS) \
-e V=$V -e J=$J -e DEBUG=$(DEBUG)\ -e V=$V -e J=$J -e DEBUG=$(DEBUG)\
-e CCACHE_DIR=/var/tmp/ccache \ -e CCACHE_DIR=/var/tmp/ccache \
-v $$(realpath $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ -v $$(realpath $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \

View File

@ -26,6 +26,7 @@ build_qemu()
$QEMU_SRC/configure \ $QEMU_SRC/configure \
--target-list="${TARGET_LIST}" \ --target-list="${TARGET_LIST}" \
--prefix="$PWD/install" \ --prefix="$PWD/install" \
$EXTRA_CONFIGURE_OPTS \
"$@" "$@"
make $MAKEFLAGS make $MAKEFLAGS
} }