mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
ae4b01b349
commit
60f999b7f2
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue