mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: expose the direct container command

Browse Source 
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.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221011113417.794841-5-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée
2022-10-11 12:34:17 +01:00
committed by Stefan Hajnoczi
parent 6659f2dc43
commit be1cb19335
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -1778,6 +1778,7 @@ fi
# functions to probe cross compilers # functions to probe cross compilers
container="no" container="no"
runc=""
if test $use_containers = "yes"; then if test $use_containers = "yes"; then
case $($python "$source_path"/tests/docker/docker.py probe) in case $($python "$source_path"/tests/docker/docker.py probe) in
*docker) container=docker ;; *docker) container=docker ;;
@ -1786,6 +1787,7 @@ if test $use_containers = "yes"; then
esac esac
if test "$container" != "no"; then if test "$container" != "no"; then
docker_py="$python $source_path/tests/docker/docker.py --engine $container" docker_py="$python $source_path/tests/docker/docker.py --engine $container"
runc=$($python "$source_path"/tests/docker/docker.py probe)
fi fi
fi fi
@ -2380,6 +2382,7 @@ fi
if test "$container" != no; then if test "$container" != no; then
echo "ENGINE=$container" >> $config_host_mak echo "ENGINE=$container" >> $config_host_mak
echo "RUNC=$runc" >> $config_host_mak
fi fi
echo "ROMS=$roms" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak