mirror of https://gitee.com/openkylin/qemu.git
configure: add test for docker availability
This tests for a working docker installation without sudo and sets up config-host.mak accordingly. This will be useful from cross compiling things in the future. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
15df9d3783
commit
51a12b51fd
|
@ -456,6 +456,7 @@ jemalloc="no"
|
||||||
replication="yes"
|
replication="yes"
|
||||||
vxhs=""
|
vxhs=""
|
||||||
libxml2=""
|
libxml2=""
|
||||||
|
docker="no"
|
||||||
|
|
||||||
supported_cpu="no"
|
supported_cpu="no"
|
||||||
supported_os="no"
|
supported_os="no"
|
||||||
|
@ -5450,6 +5451,17 @@ EOF
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
##########################################
|
||||||
|
# Docker and cross-compiler support
|
||||||
|
#
|
||||||
|
# This is specifically for building test
|
||||||
|
# cases for foreign architectures, not
|
||||||
|
# cross-compiling QEMU itself.
|
||||||
|
|
||||||
|
if has "docker"; then
|
||||||
|
docker=$($python $source_path/tests/docker/docker.py probe)
|
||||||
|
fi
|
||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# End of CC checks
|
# End of CC checks
|
||||||
# After here, no more $cc or $ld runs
|
# After here, no more $cc or $ld runs
|
||||||
|
@ -5913,6 +5925,7 @@ echo "avx2 optimization $avx2_opt"
|
||||||
echo "replication support $replication"
|
echo "replication support $replication"
|
||||||
echo "VxHS block device $vxhs"
|
echo "VxHS block device $vxhs"
|
||||||
echo "capstone $capstone"
|
echo "capstone $capstone"
|
||||||
|
echo "docker $docker"
|
||||||
|
|
||||||
if test "$sdl_too_old" = "yes"; then
|
if test "$sdl_too_old" = "yes"; then
|
||||||
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
||||||
|
@ -6740,6 +6753,10 @@ if test "$gcov" = "yes" ; then
|
||||||
echo "GCOV=$gcov_tool" >> $config_host_mak
|
echo "GCOV=$gcov_tool" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$docker" != "no"; then
|
||||||
|
echo "HAVE_USER_DOCKER=y" >> $config_host_mak
|
||||||
|
fi
|
||||||
|
|
||||||
# use included Linux headers
|
# use included Linux headers
|
||||||
if test "$linux" = "yes" ; then
|
if test "$linux" = "yes" ; then
|
||||||
mkdir -p linux-headers
|
mkdir -p linux-headers
|
||||||
|
|
Loading…
Reference in New Issue