[v2,6/7] configure: allow disable of cross compilation containers

Message ID 20191204154618.23560-7-thuth@redhat.com
State New
Headers show
Series
  • Untitled series #25407
Related show

Commit Message

Thomas Huth Dec. 4, 2019, 3:46 p.m.
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(-)

-- 
2.18.1

Comments

Cleber Rosa Dec. 5, 2019, 8:39 p.m. | #1
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>

Patch

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