[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/24] configure: expose the direct container command
From: |
Alex Bennée |
Subject: |
[PATCH v3 17/24] configure: expose the direct container command |
Date: |
Tue, 28 Feb 2023 19:06:46 +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>
---
configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
index dccb5d4f96..1e36e05c37 100755
--- a/configure
+++ b/configure
@@ -1748,6 +1748,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 ;;
@@ -1756,6 +1757,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
@@ -2355,6 +2357,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
- [PATCH v3 10/24] tests: add tuxrun baseline test to avocado, (continued)
- [PATCH v3 10/24] tests: add tuxrun baseline test to avocado, Alex Bennée, 2023/02/28
- [PATCH v3 09/24] tests: skip the nios2 replay_kernel test, Alex Bennée, 2023/02/28
- [PATCH v3 15/24] gitlab: Use plain docker in container-template.yml, Alex Bennée, 2023/02/28
- [PATCH v3 13/24] cirrus.yml: Improve the windows_msys2_task, Alex Bennée, 2023/02/28
- [PATCH v3 20/24] tests/docker: use direct RUNC call to build containers, Alex Bennée, 2023/02/28
- [PATCH v3 21/24] tests/docker: use direct RUNC call to run test jobs, Alex Bennée, 2023/02/28
- [PATCH v3 24/24] tests/avocado: disable BootLinuxPPC64 test in CI, Alex Bennée, 2023/02/28
- [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM), Alex Bennée, 2023/02/28
- [PATCH v3 18/24] tests/lcitool: append user setting stanza to dockerfiles, Alex Bennée, 2023/02/28
- [PATCH v3 17/24] configure: expose the direct container command,
Alex Bennée <=
- [PATCH v3 22/24] gitlab: move the majority of artefact handling to a template, Alex Bennée, 2023/02/28