From: Cleber Rosa <crosa@redhat.com>
To: Thomas Huth <thuth@redhat.com>
Cc: qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org,
"Christian Ehrhardt" <christian.ehrhardt@canonical.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH v2 6/7] configure: allow disable of cross compilation containers
Date: Thu, 5 Dec 2019 15:39:08 -0500 [thread overview]
Message-ID: <20191205203908.GF29262@localhost.localdomain> (raw)
In-Reply-To: <20191204154618.23560-7-thuth@redhat.com>
On Wed, Dec 04, 2019 at 04:46:17PM +0100, Thomas Huth wrote:
> From: Alex Bennée <alex.bennee@linaro.org>
>
> Our docker infrastructure isn't quite as multiarch as we would wish so
> let's allow the user to disable it if they want. This will allow us to
> use still run check-tcg on non-x86 CI setups.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> configure | 8 +++++++-
> tests/tcg/configure.sh | 6 ++++--
> 2 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 6099be1d84..fe6d0971f1 100755
> --- a/configure
> +++ b/configure
> @@ -302,6 +302,7 @@ audio_win_int=""
> libs_qga=""
> debug_info="yes"
> stack_protector=""
> +use_containers="yes"
>
> if test -e "$source_path/.git"
> then
> @@ -1539,6 +1540,10 @@ for opt do
> ;;
> --disable-plugins) plugins="no"
> ;;
> + --enable-containers) use_containers="yes"
> + ;;
> + --disable-containers) use_containers="no"
> + ;;
> *)
> echo "ERROR: unknown option $opt"
> echo "Try '$0 --help' for more information"
> @@ -1722,6 +1727,7 @@ Advanced options (experts only):
> track the maximum stack usage of stacks created by qemu_alloc_stack
> --enable-plugins
> enable plugins via shared library loading
> + --disable-containers don't use containers for cross-building
>
> Optional features, enabled with --enable-FEATURE and
> disabled with --disable-FEATURE, default is enabled if available:
> @@ -8039,7 +8045,7 @@ done
> (for i in $cross_cc_vars; do
> export $i
> done
> -export target_list source_path
> +export target_list source_path use_containers
> $source_path/tests/tcg/configure.sh)
>
> # temporary config to build submodules
> diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
> index 6c4a471aea..210e68396f 100755
> --- a/tests/tcg/configure.sh
> +++ b/tests/tcg/configure.sh
> @@ -36,8 +36,10 @@ TMPC="${TMPDIR1}/qemu-conf.c"
> TMPE="${TMPDIR1}/qemu-conf.exe"
>
> container="no"
> -if has "docker" || has "podman"; then
> - container=$($python $source_path/tests/docker/docker.py probe)
> +if test $use_containers = "yes"; then
> + if has "docker" || has "podman"; then
> + container=$($python $source_path/tests/docker/docker.py probe)
> + fi
> fi
>
> # cross compilers defaults, can be overridden with --cross-cc-ARCH
> --
> 2.18.1
>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
next prev parent reply other threads:[~2019-12-05 20:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 15:46 [PATCH v2 0/7] Enable Travis builds on arm64, ppc64le and s390x Thomas Huth
2019-12-04 15:46 ` [PATCH v2 1/7] iotests: Provide a function for checking the creation of huge files Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé
2019-12-05 1:06 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 2/7] iotests: Skip test 060 if it is not possible to create large files Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé
2019-12-05 18:41 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 3/7] iotests: Skip test 079 " Thomas Huth
2019-12-04 15:53 ` Philippe Mathieu-Daudé
2019-12-06 5:59 ` Thomas Huth
2019-12-04 15:46 ` [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created Thomas Huth
2019-12-05 20:25 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Thomas Huth
2019-12-05 20:37 ` Cleber Rosa
2019-12-04 15:46 ` [PATCH v2 6/7] configure: allow disable of cross compilation containers Thomas Huth
2019-12-05 20:39 ` Cleber Rosa [this message]
2019-12-04 15:46 ` [PATCH v2 7/7] travis.yml: Enable builds on arm64, ppc64le and s390x Thomas Huth
2019-12-04 22:09 ` David Gibson
2019-12-04 20:03 ` [PATCH v2 0/7] Enable Travis " Cleber Rosa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191205203908.GF29262@localhost.localdomain \
--to=crosa@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=christian.ehrhardt@canonical.com \
--cc=david@gibson.dropbear.id.au \
--cc=eric.auger@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).