[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 02/49] configure: add test for docker availabilit
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v5 02/49] configure: add test for docker availability |
Date: |
Fri, 25 May 2018 14:38:04 +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>
---
configure | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/configure b/configure
index a8498ab393..2e10956cfc 100755
--- a/configure
+++ b/configure
@@ -456,6 +456,7 @@ jemalloc="no"
replication="yes"
vxhs=""
libxml2=""
+docker="no"
supported_cpu="no"
supported_os="no"
@@ -5444,6 +5445,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
@@ -5907,6 +5919,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"
@@ -6731,6 +6744,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] [PATCH v5 00/49] fix buildings of tests/tcg, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 01/49] docker: add "probe" command for configure, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 06/49] configure: set cross_cc_FOO for host compiler, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 02/49] configure: add test for docker availability,
Alex Bennée <=
- [Qemu-devel] [PATCH v5 05/49] configure: allow user to specify --cross-cc-cflags-foo=, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 04/49] configure: move i386_cc to cross_cc_i386, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 03/49] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 08/49] docker: Add "cc" subcommand, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 07/49] Makefile: Rename TARGET_DIRS to TARGET_LIST, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 11/49] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 10/49] docker: allow "cc" command to run in user context, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 12/49] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 16/49] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/05/25
- [Qemu-devel] [PATCH v5 09/49] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/05/25