From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6AxY-00068p-TY for qemu-devel@nongnu.org; Fri, 27 May 2016 02:09:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6AxS-00042L-WA for qemu-devel@nongnu.org; Fri, 27 May 2016 02:09:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6AxS-00041X-RI for qemu-devel@nongnu.org; Fri, 27 May 2016 02:09:18 -0400 From: Fam Zheng Date: Fri, 27 May 2016 14:08:31 +0800 Message-Id: <1464329312-12738-14-git-send-email-famz@redhat.com> In-Reply-To: <1464329312-12738-1-git-send-email-famz@redhat.com> References: <1464329312-12738-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/14] docker: Add EXTRA_CONFIGURE_OPTS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org Whatever passed in this variable will be appended to all configure commands. Signed-off-by: Fam Zheng Reviewed-by: Alex Benn=C3=A9e Message-id: 1463986466-764-14-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.includ= e index c00f10c..c7f8c1d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -86,6 +86,8 @@ docker: @echo @echo 'Special variables:' @echo ' TARGET_LIST=3Da,b,c Override target list in builds.' + @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' + @echo ' Extra configure options.' @echo ' IMAGES=3D"a b c ..": Filters which images to build or run.= ' @echo ' TESTS=3D"x y z .." Filters which tests to run (for docke= r-test).' @echo ' J=3D[0..9]* Overrides the -jN parameter for make = commands' @@ -106,6 +108,7 @@ docker-run-%: docker-qemu-src -t \ $(if $(DEBUG),-i,--net=3Dnone) \ -e TARGET_LIST=3D$(TARGET_LIST) \ + -e EXTRA_CONFIGURE_OPTS=3D$(EXTRA_CONFIGURE_OPTS) \ -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG)\ -e CCACHE_DIR=3D/var/tmp/ccache \ -v $$(realpath $(SRC_COPY)):/var/tmp/qemu:z$(COMMA)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=3D"${TARGET_LIST}" \ --prefix=3D"$PWD/install" \ + $EXTRA_CONFIGURE_OPTS \ "$@" make $MAKEFLAGS } --=20 2.8.2