diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2023-02-28 19:06:46 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-03-01 12:45:11 +0000 |
| commit | 60f999b7f2890c9e8ddcd404ce8c4b89b5dee0a2 (patch) | |
| tree | 9f1e85759a504576b9da6e98138bb1d9e61d5531 | |
| parent | ae4b01b3497934849278b49f3dfd28420f75e300 (diff) | |
| download | qemu-60f999b7f2890c9e8ddcd404ce8c4b89b5dee0a2.zip qemu-60f999b7f2890c9e8ddcd404ce8c4b89b5dee0a2.tar.gz qemu-60f999b7f2890c9e8ddcd404ce8c4b89b5dee0a2.tar.bz2 | |
configure: expose the direct container command
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>
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |