[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] configure: add test for docker availability
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 2/6] configure: add test for docker availability |
Date: |
Tue, 5 Jun 2018 17:05:37 +0100 |
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 <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
diff --git a/configure b/configure
index ab810d728f..db8c9d8288 100755
--- a/configure
+++ b/configure
@@ -456,6 +456,7 @@ jemalloc="no"
replication="yes"
vxhs=""
libxml2=""
+docker="no"
supported_cpu="no"
supported_os="no"
@@ -5450,6 +5451,17 @@ EOF
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
# After here, no more $cc or $ld runs
@@ -5913,6 +5925,7 @@ echo "avx2 optimization $avx2_opt"
echo "replication support $replication"
echo "VxHS block device $vxhs"
echo "capstone $capstone"
+echo "docker $docker"
if test "$sdl_too_old" = "yes"; then
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
fi
+if test "$docker" != "no"; then
+ echo "HAVE_USER_DOCKER=y" >> $config_host_mak
+fi
+
# use included Linux headers
if test "$linux" = "yes" ; then
mkdir -p linux-headers
--
2.17.0
- [Qemu-devel] [PULL 0/6] Some docker updates, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 2/6] configure: add test for docker availability,
Alex Bennée <=
- [Qemu-devel] [PULL 1/6] docker: add "probe" command for configure, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 6/6] docker: add debian/tricore image, Alex Bennée, 2018/06/05
- [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST, Alex Bennée, 2018/06/05
- Re: [Qemu-devel] [PULL 0/6] Some docker updates, Peter Maydell, 2018/06/07