[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 17/24] configure: expose the direct container command
From: |
Alex Bennée |
Subject: |
[PULL v2 17/24] configure: expose the direct container command |
Date: |
Wed, 1 Mar 2023 15:15:57 +0000 |
In the process of migrating away from using docker.py to build our
containers we need to expose the command to the build environment. The
script is still a useful way to probe which command works though.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230228190653.1602033-18-alex.bennee@linaro.org>
diff --git a/configure b/configure
index 2a8a9be8a1..f5cfcd566e 100755
--- a/configure
+++ b/configure
@@ -1790,6 +1790,7 @@ fi
# functions to probe cross compilers
container="no"
+runc=""
if test $use_containers = "yes" && (has "docker" || has "podman"); then
case $($python "$source_path"/tests/docker/docker.py probe) in
*docker) container=docker ;;
@@ -1798,6 +1799,7 @@ if test $use_containers = "yes" && (has "docker" || has
"podman"); then
esac
if test "$container" != "no"; then
docker_py="$python $source_path/tests/docker/docker.py --engine
$container"
+ runc=$($python "$source_path"/tests/docker/docker.py probe)
fi
fi
@@ -2397,6 +2399,7 @@ fi
if test "$container" != no; then
echo "ENGINE=$container" >> $config_host_mak
+ echo "RUNC=$runc" >> $config_host_mak
fi
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
--
2.39.2
- [PULL v2 01/24] tests: don't run socat tests on MacOS as well, (continued)
- [PULL v2 01/24] tests: don't run socat tests on MacOS as well, Alex Bennée, 2023/03/01
- [PULL v2 03/24] tests: be a bit more strict cleaning up fifos, Alex Bennée, 2023/03/01
- [PULL v2 11/24] tests/docker: Use binaries for debian-tricore-cross, Alex Bennée, 2023/03/01
- [PULL v2 18/24] tests/lcitool: append user setting stanza to dockerfiles, Alex Bennée, 2023/03/01
- [PULL v2 14/24] tests/dockerfiles: unify debian-toolchain references, Alex Bennée, 2023/03/01
- [PULL v2 20/24] tests/docker: use direct RUNC call to build containers, Alex Bennée, 2023/03/01
- [PULL v2 19/24] tests/docker: add USER stanzas to non-lci images, Alex Bennée, 2023/03/01
- [PULL v2 24/24] tests/avocado: disable BootLinuxPPC64 test in CI, Alex Bennée, 2023/03/01
- [PULL v2 23/24] tests/docker: add zstdtools to the images, Alex Bennée, 2023/03/01
- [PULL v2 13/24] cirrus.yml: Improve the windows_msys2_task, Alex Bennée, 2023/03/01
- [PULL v2 17/24] configure: expose the direct container command,
Alex Bennée <=
- [PULL v2 16/24] tests: Ensure TAP version is printed before other messages, Alex Bennée, 2023/03/01
- [PULL v2 12/24] tests: ensure we export job results for some cross builds, Alex Bennée, 2023/03/01
- [PULL v2 22/24] gitlab: move the majority of artefact handling to a template, Alex Bennée, 2023/03/01
- [PULL v2 21/24] tests/docker: use direct RUNC call to run test jobs, Alex Bennée, 2023/03/01
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Peter Maydell, 2023/03/01
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Alex Bennée, 2023/03/01
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Peter Maydell, 2023/03/01
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Alex Bennée, 2023/03/01
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Peter Maydell, 2023/03/02
- Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows), Philippe Mathieu-Daudé, 2023/03/02