From patchwork Tue Jun 5 16:05:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="kmQSxZQJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cF66hLRz9s1B for ; Wed, 6 Jun 2018 02:09:14 +1000 (AEST) Received: from localhost ([::1]:47861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEWG-0000yB-Gj for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:09:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVH-0000vF-7G for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESy-0004MU-DF for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:11 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:39835) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESy-0004Lj-2g for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:48 -0400 Received: by mail-wm0-x22a.google.com with SMTP id p11-v6so6150184wmc.4 for ; Tue, 05 Jun 2018 09:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3UBREHrNsD1DXMCYuGsDGuAm/4zUftbbmdLfpCh+N/k=; b=kmQSxZQJo7Sxj9CGFE0VjVuLpXTNi+ilUIJbdmi27XlKqJFyCgH8ZCO9Q/YVENwpFX vshV8OclZzg3VSgioqpj6WwpUw937flAFeagBcpb5OQkuhPsjGBxJBOkgQyxbsXirC+R YxFbL2RmD+kBHAYLPCbVWtaqs3uzMZLRl+LEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3UBREHrNsD1DXMCYuGsDGuAm/4zUftbbmdLfpCh+N/k=; b=AJZGbBEBIhP3UE/3inVHi2Ehq/Fo9PiiHsL6M8XRktoEJhF9MZPA8TaQ5CF4lrTqEN ERu8SIysrqwj4ZnYNkmmIcafjxayii6pUQ7wlqTKEbOS+3Xa/CMWRuAtPU+tP0UoacEN kt5SV9ZRpVaUdg6vURNghiB0wzADtq3Dh4IdnA9P2sRjpwJlARGOZCxevHzjlUeqsgbm UxsNMtbry9lKN3wp8H2qZkdLljz2iuap1/GYUAVFUQl0IvaYDRsWCMOVjsw6WHeBJTAy YYBECZmkddz3ISmmK/Wo1b486N+vDCKGOQzalmet6o67W5S6qP2zuwCooGIsTA0JuZIH PA9Q== X-Gm-Message-State: APt69E24ZIsOz7O3doRqk0yrvzTIPOnj+/PD8/YIymmaGoyKoI7Ej846 Lf6WP6wdBTyen8ctb5IBWuECWw== X-Google-Smtp-Source: ADUXVKKYmuTqfWHFV4Y83ftm/HuiItWY5P3qz9B+BawcMsXqwQK5wZeq3DcNXq/z3L0GVreaAXB/sQ== X-Received: by 2002:a1c:d884:: with SMTP id p126-v6mr7801607wmg.110.1528214747037; Tue, 05 Jun 2018 09:05:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j13-v6sm48524651wre.38.2018.06.05.09.05.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BD3C13E09EB; Tue, 5 Jun 2018 17:05:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:37 +0100 Message-Id: <20180605160541.10664-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22a Subject: [Qemu-devel] [PULL 2/6] configure: add test for docker availability X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Richard Henderson 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 From patchwork Tue Jun 5 16:05:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DTP5sETU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cMy75hcz9s0W for ; Wed, 6 Jun 2018 02:15:09 +1000 (AEST) Received: from localhost ([::1]:47899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEbx-0006NB-0h for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:15:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVE-0000v6-Kw for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESw-0004Kj-11 for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:08 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:40300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESv-0004Jv-Ks for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:45 -0400 Received: by mail-wm0-x22f.google.com with SMTP id n5-v6so6140923wmc.5 for ; Tue, 05 Jun 2018 09:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jgjltl47xPy+3+jIHw8dBiWvAEsxbuKQzVYZhZalN2Q=; b=DTP5sETUUlxKCDKPhycN8bv/tZE69TWSe/Yqi7II2kIzM8Wq07X4tSfPwSKL9qiAcs 7FJK3LuOKQrLunpJh5zf76tjogrpo9cvn6O4Caa1YNxQwQF4P81nBqWVgSSj0Vd1139X jrtBMrgH8V6cguRDAZmPwLQeHY3P3xo7L6jpk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jgjltl47xPy+3+jIHw8dBiWvAEsxbuKQzVYZhZalN2Q=; b=gFtXiH3pMJlikzL8PKpca98/J1Ftt4z3f5knDl6yq+1Dib5FeA6iBOZ4Fmdj8Cpxtn ruQi0VF9DU+u1LEvf8J/lNVhEnLYRZ59vlbpBmpbBbIUHhzzZHakdW4YQxm5khdAW8Bq F8LLEKpTgopVeJICC19mfXvs05BW6E7GL6fdsoJt5OaDeW5kFEm+94n/T65/If7XY2eq 8AGAhURxtbedQtZNgUE3e2vDfQ4RIu17JtObHPOVw/gz2Zdm+Wd2fNvO1tiPk8+IP/om LJrOiCCuEwEjXmNqd/0/OYWB6/bhuXMaenjdcZJ4zyl8xRZmskuAbXn9BjFOEGd7f420 IpkQ== X-Gm-Message-State: ALKqPwepuoTLik5hODRZri3pJuUWaRlhuWa4RIQI8MdIryzx9374MNcY DN5wdu1DvAlXD05yVOedLG5jotpJbFU= X-Google-Smtp-Source: ADUXVKJC62l/JTw1Kz+iidPjFY0Tqy9EYKg78JG9nHoaXcjzJLos2QLL+FY4eSQ6MzB9DhAq30rjAA== X-Received: by 2002:a1c:e388:: with SMTP id a130-v6mr12318174wmh.27.1528214744406; Tue, 05 Jun 2018 09:05:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c131-v6sm2132995wma.41.2018.06.05.09.05.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D292B3E09FC; Tue, 5 Jun 2018 17:05:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:38 +0100 Message-Id: <20180605160541.10664-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng To be more accurate on its purpose and make code that looks for a certain target out of this variable more readable. Signed-off-by: Fam Zheng Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée diff --git a/Makefile b/Makefile index 6d588d1f71..023b3437ec 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -366,8 +366,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -470,7 +470,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -514,7 +514,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -772,7 +772,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -873,7 +873,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1071,9 +1071,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_DIRS), \ + @$(if $(TARGET_LIST), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ + $(foreach t, $(TARGET_LIST), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index db8c9d8288..14b11130a7 100755 --- a/configure +++ b/configure @@ -6128,7 +6128,7 @@ qemu_version=$(head $source_path/VERSION) echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -echo "TARGET_DIRS=$target_list" >> $config_host_mak +echo "TARGET_LIST=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak fi diff --git a/scripts/create_config b/scripts/create_config index d727e5e36e..58948a67a4 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_DIRS=*) + TARGET_LIST=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 86f90c0cb0..9854e7794b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -858,7 +858,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) From patchwork Tue Jun 5 16:05:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="M/3XDZj7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cF56CvRz9s0W for ; Wed, 6 Jun 2018 02:09:12 +1000 (AEST) Received: from localhost ([::1]:47860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEWD-0000xB-Mx for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:09:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVD-0000v2-8P for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESw-0004L5-LR for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:07 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36021) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESw-0004KQ-Ak for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:46 -0400 Received: by mail-wm0-x243.google.com with SMTP id v131-v6so6186056wma.1 for ; Tue, 05 Jun 2018 09:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jMJ7UnonTvICh94hzGHaO2zm7CZtkOWcDq9HjXExOis=; b=M/3XDZj7ntBDnB0e+404M/iFjzBRP6sDedjatwo6zq2HeoMiwjRx30aBVxWXcngwHo kuz+qTwkLqJvT22ICXqEMCyqOCrDrdHgIAR2xOXy199UJL4utIL4NU6iibYF7n/BzvMX bItxBlgNr+khwKxj3SsaDcKWjLX+Qfz8k5fQ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jMJ7UnonTvICh94hzGHaO2zm7CZtkOWcDq9HjXExOis=; b=lK8bN1KSVfCv3BgbpDSI+twhkVMXT3VMQJjbh73XtTWnSGeEuSv+xfJf4NvzYKP+VD QVGQiOlilGww2/PK/BLf1omrBMvcUYSeWNjUXoYxnxd2jOeg9O5LC/l0D6FKKlCUR5Q5 qgTDGMFmjXepta7+hir8KTavtrPXCS45MvqF5TtMSFCANh3wOHN3VkhLcBGn2Su2Xesx dc+xRipOi7sBnLLCvh5oTjmaxtPmzwENx0efqo4wAlITYlk7zubreC6+pTjfnAJ1+wiD CR8a1Kczj+6yODWsTlWkOdRerjkAvxEm0DOQcHQYviS/jhQON/lWjcBByz53FsDRl+xM zAOQ== X-Gm-Message-State: APt69E3EvSHaZlLcwcctJIc08ze2TXX7DzP/OAo8EZl/w6ZBbh4wC7RS iC505MJKCiy8A0z6A/VH7g4W6g== X-Google-Smtp-Source: ADUXVKJenBidGGSV07AVug2McYPTAi8ut9TZbEuo7IsgxKKiduXL6SamXnwvjARNXYQIfQAcq9zw6A== X-Received: by 2002:a1c:8ec1:: with SMTP id q184-v6mr11939091wmd.48.1528214745210; Tue, 05 Jun 2018 09:05:45 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u11-v6sm2578207wmd.7.2018.06.05.09.05.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E5C193E0A0B; Tue, 5 Jun 2018 17:05:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:39 +0100 Message-Id: <20180605160541.10664-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng It has some basic *-devel.i686 packages to be used with "gcc -m32" as a 32 bit cross build environment. Signed-off-by: Fam Zheng [AJB: add glibc-static] Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker new file mode 100644 index 0000000000..8fbef2fa53 --- /dev/null +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -0,0 +1,14 @@ +FROM fedora:latest +ENV PACKAGES \ + gcc \ + glibc-static.i686 \ + glibc-devel.i686 \ + glib2-devel.i686 \ + zlib-devel.i686 \ + glib2-devel.i686 \ + nettle-devel.i686 \ + pixman-devel.i686 \ + gnutls-devel.i686 + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt From patchwork Tue Jun 5 16:05:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Pr8ngk2H"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cJd2rr4z9s01 for ; Wed, 6 Jun 2018 02:12:17 +1000 (AEST) Received: from localhost ([::1]:47886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEZD-0003x7-2N for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:12:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVG-0000vB-Ke for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESz-0004N3-Eq for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:10 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:52857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESz-0004MY-3J for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:49 -0400 Received: by mail-wm0-x236.google.com with SMTP id p126-v6so6010396wmb.2 for ; Tue, 05 Jun 2018 09:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gZJdSwuJp6NdScm9/QvDPKdtIjVvPNu1zaSAitr2bmk=; b=Pr8ngk2Hy51E+f+BJbaxMPpS/KrQTfZYpJK4HXOsASa4Dh8oCnXEB8ib2BWG/YTUUP GGXQGO56p/jddd4slmW2LLKe0uz+RdqfbDvfoQ/plubT7SvF+YSUFjUKQfflpQpy07J2 9tv3Frw856Uj/vLvaQ/XSiFCx6Xzj7svOJmNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gZJdSwuJp6NdScm9/QvDPKdtIjVvPNu1zaSAitr2bmk=; b=Epk8wYTGxUjSe1iDwFtWt4E1exgyE6GYYbQwaqqDkHmH2C6pFXCjPT9YVuz6MH2cb0 KrwPKkazLOQ2f8vYi+7zORMiGzM9HA+oV9YDwWdOqWckutY5vlNHX22akF9ntTkDR9Zg 1O/z7/KMnMzDkLH+zUWeJ+XhHIjZkMbq1qKN35tB9C3D0BCV4Lj2XXWjzC3/cbDP81rO pOfhsveWxvLMn5u6zSrrRoOmkqddShgTk7o3AK98WLyZR0Kz2gGD1mBqDL8ta/7WTCqz Ob5/yf8oOyXFUJ0Pvwd4Qys4fdevBMMbeb09Zc2Vrc/BBEfSzLadWL+R/nrbwKtj95rb YwAw== X-Gm-Message-State: APt69E33sSNyMWdI4+COQTLar59ixunmaOLW1hluvILYKwS9fmtZSFvn dYXZmMfrTwB9fCrxlM4/6RwGSA== X-Google-Smtp-Source: ADUXVKKhCftGUDlkH1+MgxcHF6R2gYSv4dVwzqVBKKlefeL0MRMbLhn4yrgtZgaU+FlZ7qTvulOPvg== X-Received: by 2002:a1c:1815:: with SMTP id 21-v6mr4917294wmy.72.1528214748019; Tue, 05 Jun 2018 09:05:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u16-v6sm5794594wrq.2.2018.06.05.09.05.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 04F5C3E0A0C; Tue, 5 Jun 2018 17:05:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:40 +0100 Message-Id: <20180605160541.10664-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Do not test the deprecated API versions. debian-win32-cross and debian-win64-cross are already using SDL2 (they do not cover GTK+ at all). Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrangé [AJB: fix merge conflicts] Signed-off-by: Alex Bennée diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 65d7761cf5..7d1d008002 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -11,12 +11,12 @@ ENV PACKAGES \ numactl-devel SDL2-devel snappy-devel spice-server-devel \ systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \ xen-devel \ - mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ - mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \ + mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ mingw32-bzip2 \ - mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ - mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \ + mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ mingw64-bzip2 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 503a6bc6f7..7cca7e16a6 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-vnc \ --enable-bzip2 \ --enable-guest-agent \ - --with-sdlabi=1.2 \ - --with-gtkabi=2.0 + --with-sdlabi=2.0 \ + --with-gtkabi=3.0 install_qemu make clean From patchwork Tue Jun 5 16:05:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 925544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eMRkxCRL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 410cJZ5X4sz9s01 for ; Wed, 6 Jun 2018 02:12:14 +1000 (AEST) Received: from localhost ([::1]:47885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEZA-0003vP-Dx for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2018 12:12:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQEVG-0000v7-4Y for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQESx-0004Ll-Hh for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:08:10 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:38387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQESx-0004Kx-5M for qemu-devel@nongnu.org; Tue, 05 Jun 2018 12:05:47 -0400 Received: by mail-wr0-x235.google.com with SMTP id 94-v6so3030849wrf.5 for ; Tue, 05 Jun 2018 09:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OGpFyjcgVIZChLMxqJQLbygV+FvJ2VIx0W9zOzdAHC4=; b=eMRkxCRLVRRpfHYKqdlLi+sbIAOJDOQiuL3USG1y7rcoeY6aC/OnSwwhG5eW+1r4bd vVBo6Dl5ZWe3kjuhA00qviG/p//sFZNj3E87ncBOBTyLju+IccZgq7sg+xD32I3BC08V W0Kg6awWo1dF2aCj+cFJ8DYEDg4vT6e1dJd/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OGpFyjcgVIZChLMxqJQLbygV+FvJ2VIx0W9zOzdAHC4=; b=nFraRnGmQVnSpBo8SZy6pDIEROaK7cB79CI5RPMB/B7h3Xy2GzDsLxdMw96bvLR9lV 2vARFDbZD9BtnNh4huMnYzUdfjYDazm8AY5jkkwty8zFVDWpMG49Vrfou3Q3qMh/mOzo DK1qConUjHEyB8FJfDA54nH1OinnbRLPl9qv6gTuZwYwtjs+XaGo3aHWQSLeYEC+Ua/G ZICcG54JKN22If20I5AI4BM68Hh0qALy0f24ijE7Slm9XHZtO5v+86lYDeWslC4e0EPb 0Q1YI6oFDR/Iy1UiFt9P3K6jaoEVkIN68YVYl+6gPsTzxgoSXi0JwvAvN0RDJOEAzu6S 0Z6A== X-Gm-Message-State: ALKqPwfWrifi52ppUzZqcQLJla1R0b3nIZm016AxL+YGh+THzAUk7oIa tPW8vjC1AKXhXdtcj82PC/LzbQ== X-Google-Smtp-Source: ADUXVKJ5fQsx4Hh7jTFs94lQAwDwpUkzrKlydQX1MiPtFUsxOEiDFp0Wdrc++cC+PPN1sCi5tLXsLQ== X-Received: by 2002:adf:a949:: with SMTP id u67-v6mr19071901wrc.71.1528214746032; Tue, 05 Jun 2018 09:05:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g75-v6sm2703475wmd.15.2018.06.05.09.05.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 09:05:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 18AB23E0A51; Tue, 5 Jun 2018 17:05:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 5 Jun 2018 17:05:41 +0100 Message-Id: <20180605160541.10664-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org> References: <20180605160541.10664-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::235 Subject: [Qemu-devel] [PULL 6/6] docker: add debian/tricore image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé TriCore binutils is built from Bastian Koppelmann repository. Note: There is no TriCore compiler in this image (only assembler/linker). Signed-off-by: Philippe Mathieu-Daudé [AJB: base of Debian9, add to Makefile.include] Signed-off-by: Alex Bennée diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9d5749887a..74fd51c22c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -63,6 +63,9 @@ docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe docker-image-travis: NOUSER=1 +# Specialist build images, sometimes very limited tools +docker-image-tricore-cross: docker-image-debian9 + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker new file mode 100644 index 0000000000..898b8dd511 --- /dev/null +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -0,0 +1,23 @@ +# +# Docker TriCore cross-compiler target +# +# This docker target builds on the debian Stretch base image. +# +# Copyright (c) 2018 Philippe Mathieu-Daudé +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +FROM debian:9 + +MAINTAINER Philippe Mathieu-Daudé + +RUN git clone --single-branch \ + https://github.com/bkoppelmann/tricore-binutils.git \ + /usr/src/binutils && \ + cd /usr/src/binutils && chmod +x missing && \ + CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \ + make && make install && \ + rm -rf /usr/src/binutils + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=tricore-