From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049151; cv=none; d=zohomail.com; s=zohoarc; b=fFQ5rA1rvcLnlRkxIHoa+xiUsNMKivwmEaw0CjrLrVhlCyFnwGzEAfZoYWU+kj9H1hr2KRX1fCmU2qN12q6Sbwk2deBy8b/cdagdfhBZoDYGzOE07NktVD5wIgzEVGglnmbuMvWF0xRCrlP241vRNk52P8Iooo1GJ8OIpvIfnSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049151; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P/lRZdjmbM+i2Bneg/hO0ZOlO6BgKhfMQmpeyPmCGjo=; b=THMJq6BC64DsHNKBQDFwG9JutczfeGncVD3gLzxfkMKkqgZ2Qu1WYlXO72Dvvd9AXxvVwFFGhaFyfp0DF5r0fo5jNQHF5kqHNLnamS1UqveI1CIMwgSlF4gauVbJu04E4BOjrTDUqgM0BXlYuRJdgEnAvnO2czHFpqBVXKuSTzU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049151721766.3742222676924; Fri, 25 Sep 2020 08:52:31 -0700 (PDT) Received: from localhost ([::1]:42482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq1O-000587-DW for importer@patchew.org; Fri, 25 Sep 2020 11:52:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLppz-0002rK-KB for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppt-0007cv-Ia for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:43 -0400 Received: by mail-wr1-x433.google.com with SMTP id c18so4061177wrm.9 for ; Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y1sm3203232wma.36.2020.09.25.08.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4815E1FF87; Fri, 25 Sep 2020 16:40:28 +0100 (BST) 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=P/lRZdjmbM+i2Bneg/hO0ZOlO6BgKhfMQmpeyPmCGjo=; b=Fr82j0dDOxTQuZBkiobLKYO95T6lkzphWgY6qcWsQmXXUqbi9ZEjnxmyLFUnGX0BwC Ux8y3YNFdD2+vVyKgkVO7Qh8wV+lJAWygs+ykRF54WzbaGlBn5VHZ1DN7sd0U2Yac1v7 j36+KcN2rflxTUVhNnYctheFRUN5cjzun9iYr9IUn5IWHfBlD6cs/TKRETxo4AMBBx7p jZwsuNZBSPhKPPP0bymefXYGwEW4PIbJzcnPaDWV8dLZ+OjvsiM5n0bfR2zmfa3NvelU Y63MCEItTImLTc4ha3TGx+mIQCCC/1k5v0//BPxntiHEl76SdXVoQFwW8yEAWDz6vCf6 47pg== 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=P/lRZdjmbM+i2Bneg/hO0ZOlO6BgKhfMQmpeyPmCGjo=; b=gCbiVddlweM6Sgk02xJ7CirPMNq6MHBRUAJ7nxeE7/3P4oLfpqp2kZLQCgzOhTT49y 6zV2LIw2WQRxvII2/j9jLcHeIv8CLn4OjDzqA0KVTMENoafFm1KvDbf/m8ARIS8WsJU6 Byr9MVv+bD41bxB1RYYDTsAw4dK+z7Q3gqISNZvWzLuO8OiOCO5hTA2hhDzrgvDzFXp0 WVmUvohmy9KbTaFgmfDtWEnEO3wdXP0hqxEssM0fNVplrWExjn+mssFhcabnxE/1v+hL a37jvEsfcIf0P21rzMqwRvAICeV6rjlpAwGZ55E6tBv/bXWyipFVmEZsd51lx0MFiwWh u2Ug== X-Gm-Message-State: AOAM530pACGAzu1aW8cccWYUGJilUX7fAOXUjPVEQrUbvn6H+LLCpp8C nwr7aNGTexlzZat2GzJje8pEjg== X-Google-Smtp-Source: ABdhPJy4qcv7Yn8VOCy+QmK2D6gvszP+60K/lcrvtMYpW5JxoGHI9NkOMg94Vt3Bt2Nic8ejLN6Rmw== X-Received: by 2002:adf:f7d0:: with SMTP id a16mr4916953wrq.381.1601048436176; Fri, 25 Sep 2020 08:40:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/15] tests/tcg: reinstate or replace desired parts of rules.mak Date: Fri, 25 Sep 2020 16:40:13 +0100 Message-Id: <20200925154027.12672-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Paolo Bonzini Commit 660f79309303d696531ffb394719dfab3e0c42c0 was a bit overzealous with respect to tests/tcg, which needed quiet-command and $(BUILD_DIR). Reinstate quiet-command, and replace $(BUILD_DIR) with just the current directory. Reported-by: Alex Benn=C3=A9e Signed-off-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200921163425.1410280-1-pbonzini@redhat.com> --- tests/tcg/Makefile.qemu | 13 ++++++++++++- tests/tcg/configure.sh | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 0332bad10fd4..c096c611a2b4 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -11,9 +11,20 @@ # The configure script fills in extra information about # useful docker images or alternative compiler flags. =20 +# Usage: $(call quiet-command,command and args,"NAME","args to print") +# This will run "command and args", and either: +# if V=3D1 just print the whole command and args +# otherwise print the 'quiet' output in the format " NAME args to pr= int" +# NAME should be a short name of the command, 7 letters or fewer. +# If called with only a single argument, will print nothing in quiet mode. +quiet-command-run =3D $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 +quiet-@ =3D $(if $(V),,@) +quiet-command =3D $(quiet-@)$(call quiet-command-run,$1,$2,$3) + CROSS_CC_GUEST:=3D DOCKER_IMAGE:=3D --include $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak + +-include tests/tcg/config-$(TARGET).mak =20 GUEST_BUILD=3D TCG_MAKE=3D../Makefile.target diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 598a50cd4f31..be51bdb5a4a7 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -193,11 +193,11 @@ for target in $target_list; do case $target in *-linux-user | *-bsd-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D\$(BUILD_DIR)/qemu-$arch" >> $config_target_mak + echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak ;; *-softmmu) echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak - echo "QEMU=3D\$(BUILD_DIR)/qemu-system-$arch" >> $config_target_mak + echo "QEMU=3D$PWD/qemu-system-$arch" >> $config_target_mak ;; esac =20 --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049719; cv=none; d=zohomail.com; s=zohoarc; b=MPjjts4OqjUe7WV0n1sia3dpYWmYnJXE6yWJsTD/nz/CcHDu2wjVxFuey9/vVTfjJO++/DFkkfT4DIKcIN5N2f4wxOmmrI7WShlnGYIvhc5JqByN6mlnqEe2awrVUP9QMmkYiaKvj5BMs7u/jY7r2ULa7sDDpI/n2B/DmS7lg70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049719; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Eq5ug6TQ+UWKEm8ljjwiAREdUaKCvushWVwVKg/Ob2M=; b=OkbnZGt7ANyAzdD5t0KEIEtxaxda/N1zZLVJs/dxV5vSP4K36WkaSvrq15ecIAGpDPlgNaAaCkgZQaS9YA3cjz48a/4iBkmpNjCEAu5TO8Wu3KyFQuHbhEqs4CRk8q/4RYRZ5wA1nQzkhp62xu3wYGLEbzFfxxEJx9EwPBe22Vo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160104971955312.882254300422346; Fri, 25 Sep 2020 09:01:59 -0700 (PDT) Received: from localhost ([::1]:32902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqAX-0004w0-Vx for importer@patchew.org; Fri, 25 Sep 2020 12:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpps-0002ia-1t for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:36 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppp-0007am-EX for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:35 -0400 Received: by mail-wr1-x42c.google.com with SMTP id w5so4062847wrp.8 for ; Fri, 25 Sep 2020 08:40:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o4sm3155020wru.55.2020.09.25.08.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6CB4B1FF8C; Fri, 25 Sep 2020 16:40:28 +0100 (BST) 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=Eq5ug6TQ+UWKEm8ljjwiAREdUaKCvushWVwVKg/Ob2M=; b=BRVTziPRh3r1hZaLn45/uI8UP8IS0MV7348lJ87Z7216xOiuLlR+t50yDY9VtdAD/J +KkFL8yQJiDZVPZw52MVPQdnIJ45NDlz28F8xVnBARIztGi3VxhJmvAzFeauHTMXap0U x44a0AGIjVeA7SmpMtxeDyV8ugb57Eau+Z+jviot4xrVRabVvN0fddMRjcZVncMHgAnO BgS24KyFUXJhhJ0IK3aEdmKQkmDC70fCu+t+dcQ+IiwgGK/RFVyZV4qUm25Gfcz7UPv/ q2QyhCitwPUZMsEiLuLG0Km+je5YNWzy+4bsLLSeL4J7kQGBdf6ewYZiJvXVtdeQlDdE FaIg== 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=Eq5ug6TQ+UWKEm8ljjwiAREdUaKCvushWVwVKg/Ob2M=; b=r5+/+GtWdKHYPngHk9nwI1K6aauzYsWGqIW2wy8C5apdMjvHwthq/JKLzD68BBOYXl CS6Y1euscJPJ1ktMCQ5UWKGJOs81wjreYrolvag+IrBCpx+Oc+2YeuDcFyqxVDAOstWc rHOTFpE1vSrxjNZgOSBLMP7/T0M050REV0KmFFU1RLfLlYwRHKbHXV+DbYQaTrwjpwD5 BFiuX2kNuZUQxTL9xHdrbQF2WeJ5+OEasMipBOHPfUc2ci87w8s/7jDlXY+4v61dwZyW 7s07hqgAlcWisMDJUvFjVXKSPP9Uf+sPxthVfYBmEW0v0Yq9eY+7BPpjG4/UBovEB4K7 V5NQ== X-Gm-Message-State: AOAM532uXej44zCLGa6UVrmzspaW7e/5fsICDMnvb+lY8kjpNs+bNgHa /4FbYi4eih6No9jzmlVhI7yWPQ== X-Google-Smtp-Source: ABdhPJx3VDNvBieNUSpj4GcSQL/a58+tJTbC2CwqBSV1W6U0xwhMVW/bKE3pdbe2W0uJmLvKuM+I4g== X-Received: by 2002:a5d:4a0c:: with SMTP id m12mr5185502wrq.83.1601048431705; Fri, 25 Sep 2020 08:40:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/15] meson: move libudev test Date: Fri, 25 Sep 2020 16:40:14 +0100 Message-Id: <20200925154027.12672-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Thomas Huth Message-Id: <20200916162621.100141-2-pbonzini@redhat.com> Message-Id: <20200918103430.297167-2-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- configure | 14 -------------- meson.build | 7 ++++--- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/configure b/configure index e8e8e984f245..48bf437021f6 100755 --- a/configure +++ b/configure @@ -908,7 +908,6 @@ Linux) linux_user=3D"yes" kvm=3D"yes" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" - libudev=3D"yes" ;; esac =20 @@ -6283,15 +6282,6 @@ if test "$libnfs" !=3D "no" ; then fi =20 ########################################## -# Do we have libudev -if test "$libudev" !=3D "no" ; then - if $pkg_config libudev && test "$static" !=3D "yes"; then - libudev=3D"yes" - libudev_libs=3D$($pkg_config --libs libudev) - else - libudev=3D"no" - fi -fi =20 # Exclude --warn-common with TSan to suppress warnings from the TSan libra= ries. if test "$solaris" =3D "no" && test "$tsan" =3D "no"; then @@ -7460,10 +7450,6 @@ if test "$gcov" =3D "yes" ; then echo "CONFIG_GCOV=3Dy" >> $config_host_mak fi =20 -if test "$libudev" !=3D "no"; then - echo "CONFIG_LIBUDEV=3Dy" >> $config_host_mak - echo "LIBUDEV_LIBS=3D$libudev_libs" >> $config_host_mak -fi if test "$fuzzing" !=3D "no"; then echo "CONFIG_FUZZ=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index f4d1ab109680..48724988972d 100644 --- a/meson.build +++ b/meson.build @@ -252,8 +252,8 @@ if 'CONFIG_CURL' in config_host link_args: config_host['CURL_LIBS'].split()) endif libudev =3D not_found -if 'CONFIG_LIBUDEV' in config_host - libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) +if target_os =3D=3D 'linux' + libudev =3D dependency('libudev', static: enable_static) endif brlapi =3D not_found if 'CONFIG_BRLAPI' in config_host @@ -435,6 +435,7 @@ has_gettid =3D cc.has_function('gettid') =20 # Create config-host.h =20 +config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_VNC', vnc.found()) @@ -1515,7 +1516,7 @@ summary_info +=3D {'sheepdog support': config_host.h= as_key('CONFIG_SHEEPDOG')} summary_info +=3D {'capstone': config_host.has_key('CONFIG_CAPSTO= NE')} summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} -summary_info +=3D {'libudev': config_host.has_key('CONFIG_LIBUDE= V')} +summary_info +=3D {'libudev': libudev.found()} summary_info +=3D {'default devices': config_host['CONFIG_MINIKCONF_MODE= '] =3D=3D '--defconfig'} summary_info +=3D {'plugin support': config_host.has_key('CONFIG_PLUGIN= ')} summary_info +=3D {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049364; cv=none; d=zohomail.com; s=zohoarc; b=mNFeAeYC6gKvYUvTQay8dEQCZ34+5jcoxtbQJly5HpF6xG3CLiG/yMMguuk6IlxdmjErLYD8nkFTRgcXjqUPAL7/3VWYTe7wbbugpPJabVqtk/hBDJPXb27ix7w/QS19r93hYQOM0zZ87LJpnP54FI7cJjisLTqttKdFlVIqa9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049364; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OYOkhfqBvCVhEmRcsWLQjTvCk1qdHmUTfu79+E6c644=; b=IpfS2yxXalMIouvvooMVP0mTtdZ1gEl7ux2LVE0otuLurnI9WILVeHut/IXmtMyNs7Xms6CCgUTkjYOF4Ae+XALWZ/AbLvmYNnMG1UhMbky9ZRepXjDinqRwVgJeZhOFe9Ia83UWQFTmsYcn2LXbdONcZbfx7T5rLKQe7xy+MX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049364838217.23947068389077; Fri, 25 Sep 2020 08:56:04 -0700 (PDT) Received: from localhost ([::1]:50726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq4p-0000PP-D7 for importer@patchew.org; Fri, 25 Sep 2020 11:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLppz-0002r0-IN for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:45 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:39713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpps-0007cj-QT for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:38 -0400 Received: by mail-wm1-x32a.google.com with SMTP id b79so3777294wmb.4 for ; Fri, 25 Sep 2020 08:40:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k8sm3455402wma.16.2020.09.25.08.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 99DDD1FF8F; Fri, 25 Sep 2020 16:40:28 +0100 (BST) 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=OYOkhfqBvCVhEmRcsWLQjTvCk1qdHmUTfu79+E6c644=; b=f/2V055KITt+0m6Dly97XZvbzuaU4488B2iqSwdmL7qBFTsbwYjLk7Cb4EFUSB0y8m Jt6YF/uDwtmXTGlQEgpvxXGCuynbZNoBGIhPea3J85aCniVcz8yIAD4BX188gK98b0Wp dKm8wUrCQ8l3MEGsCyYnbHyzSeJkd8WtbkMmscWIUJ+Uwevsh+ZrK2/2Nsq5bvSogrCA koZ4ANHJfYnwtIPH4VnaPHp0pHfBTq0PBOnxtEr/F8w189h4B+2v9DTLqZKrFgFiBeOc uOrqYOMsqXv5WvY9f/XSYR7xBQVmEtktAiYBEYPQ/PBvfJMDX0gnZBgqyQTfeeyvMM3A S3Dw== 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=OYOkhfqBvCVhEmRcsWLQjTvCk1qdHmUTfu79+E6c644=; b=iLHdQz/uGbIfrk9DaT3nDTleTl8RbHWInDayoNvZqQBRmaJGdeZbk5/gsgHJIA3dnd Q9HngkpM/ciTH8fE3VKLO/r4uU8pQOF1qLLJ/PFlFomhq2BbfsXtfY+sUzDvpG8pvROS PTU8yZOx57Xru+daXvBrGnhD5oizD5yZMVV3KKw6l36DRWfMq++z0bSzG/c/tF+p5L4p hBnn6P2zXM1sFVTM8Qz7uA491VDMuJOw0w8QzFuYOXV6kidMOkKFrRAUzJFACU9nK7U3 mpUg9HByvL2pMkZiHuMir583JMgArBAcF1ZWUm+iUkCyqDtMHGpN7hWvwxi9v5b5dxrk j2HA== X-Gm-Message-State: AOAM532MTpr4TfWes/tsefXYS6t6wZAuQGVJ9CN7HkJu9AuhvYZEKLlF N0SnVtBhgT+Naxkh24mOLYcbbQ== X-Google-Smtp-Source: ABdhPJw3EpVECZRcN+jMhpRzl3QD2ed6YyLIdm+b0fgfB1itsjZv3w5cZV55p7V8yBe2MpWQIDVmAQ== X-Received: by 2002:a7b:c215:: with SMTP id x21mr3687140wmi.138.1601048435278; Fri, 25 Sep 2020 08:40:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/15] meson: move libmpathpersist test Date: Fri, 25 Sep 2020 16:40:15 +0100 Message-Id: <20200925154027.12672-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Paolo Bonzini This is the first compiler/linker test that has been moved to Meson. Add more section headings to keep things clearer. [thuth: Add check for mpathpersist.found() before showing mpathpersist_new_= api] Signed-off-by: Paolo Bonzini Signed-off-by: Thomas Huth Message-Id: <20200918103430.297167-3-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- configure | 77 +++----------------------------------------- meson.build | 82 ++++++++++++++++++++++++++++++++++++++++++----- meson_options.txt | 2 ++ 3 files changed, 80 insertions(+), 81 deletions(-) diff --git a/configure b/configure index 48bf437021f6..b81868cf0231 100755 --- a/configure +++ b/configure @@ -403,7 +403,7 @@ netmap=3D"no" sdl=3D"auto" sdl_image=3D"auto" virtfs=3D"" -mpath=3D"" +mpath=3D"auto" vnc=3D"enabled" sparse=3D"no" vde=3D"" @@ -1116,9 +1116,9 @@ for opt do ;; --enable-virtfs) virtfs=3D"yes" ;; - --disable-mpath) mpath=3D"no" + --disable-mpath) mpath=3D"disabled" ;; - --enable-mpath) mpath=3D"yes" + --enable-mpath) mpath=3D"enabled" ;; --disable-vnc) vnc=3D"disabled" ;; @@ -3848,57 +3848,6 @@ if test "$modules" =3D yes; then fi fi =20 -########################################## -# libmpathpersist probe - -if test "$mpath" !=3D "no" ; then - # probe for the new API - cat > $TMPC < -#include -unsigned mpath_mx_alloc_len =3D 1024; -int logsink; -static struct config *multipath_conf; -extern struct udev *udev; -extern struct config *get_multipath_config(void); -extern void put_multipath_config(struct config *conf); -struct udev *udev; -struct config *get_multipath_config(void) { return multipath_conf; } -void put_multipath_config(struct config *conf) { } - -int main(void) { - udev =3D udev_new(); - multipath_conf =3D mpath_lib_init(); - return 0; -} -EOF - if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then - mpathpersist=3Dyes - mpathpersist_new_api=3Dyes - else - # probe for the old API - cat > $TMPC < -#include -unsigned mpath_mx_alloc_len =3D 1024; -int logsink; -int main(void) { - struct udev *udev =3D udev_new(); - mpath_lib_init(udev); - return 0; -} -EOF - if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then - mpathpersist=3Dyes - mpathpersist_new_api=3Dno - else - mpathpersist=3Dno - fi - fi -else - mpathpersist=3Dno -fi - ########################################## # pthread probe PTHREADLIBS_LIST=3D"-pthread -lpthread -lpthreadGC2" @@ -6340,23 +6289,11 @@ if test "$softmmu" =3D yes ; then fi virtfs=3Dno fi - if test "$mpath" !=3D no && test "$mpathpersist" =3D yes ; then - mpath=3Dyes - else - if test "$mpath" =3D yes; then - error_exit "Multipath requires libmpathpersist devel" - fi - mpath=3Dno - fi else if test "$virtfs" =3D yes; then error_exit "VirtFS is supported only on Linux" fi virtfs=3Dno - if test "$mpath" =3D yes; then - error_exit "Multipath is supported only on Linux" - fi - mpath=3Dno fi fi =20 @@ -6897,12 +6834,6 @@ fi if test "$virtfs" =3D "yes" ; then echo "CONFIG_VIRTFS=3Dy" >> $config_host_mak fi -if test "$mpath" =3D "yes" ; then - echo "CONFIG_MPATH=3Dy" >> $config_host_mak - if test "$mpathpersist_new_api" =3D "yes"; then - echo "CONFIG_MPATH_NEW_API=3Dy" >> $config_host_mak - fi -fi if test "$vhost_scsi" =3D "yes" ; then echo "CONFIG_VHOST_SCSI=3Dy" >> $config_host_mak fi @@ -7992,7 +7923,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ - -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ + -Dmpath=3D$mpath -Dsdl=3D$sdl -Dsdl_image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f\ $cross_arg \ diff --git a/meson.build b/meson.build index 48724988972d..c09d869f9b02 100644 --- a/meson.build +++ b/meson.build @@ -81,6 +81,14 @@ if 'SPARSE_CFLAGS' in config_host 'compile_commands.json']) endif =20 +########################################### +# Target-specific checks and dependencies # +########################################### + +if targetos !=3D 'linux' and get_option('mpath').enabled() + error('Multipath is supported only on Linux') +endif + m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) winmm =3D [] @@ -112,6 +120,11 @@ elif targetos =3D=3D 'haiku' cc.find_library('network'), cc.find_library('bsd')] endif + +################ +# Dependencies # +################ + # The path to glib.h is added to all compilation commands. This was # grandfathered in from the QEMU Makefiles. add_project_arguments(config_host['GLIB_CFLAGS'].split(), @@ -218,10 +231,6 @@ if 'CONFIG_SPICE' in config_host link_args: config_host['SPICE_LIBS'].split()) endif rt =3D cc.find_library('rt', required: false) -libmpathpersist =3D not_found -if config_host.has_key('CONFIG_MPATH') - libmpathpersist =3D cc.find_library('mpathpersist') -endif libdl =3D not_found if 'CONFIG_PLUGIN' in config_host libdl =3D cc.find_library('dl', required: true) @@ -252,9 +261,62 @@ if 'CONFIG_CURL' in config_host link_args: config_host['CURL_LIBS'].split()) endif libudev =3D not_found -if target_os =3D=3D 'linux' - libudev =3D dependency('libudev', static: enable_static) +if targetos =3D=3D 'linux' + libudev =3D dependency('libudev', + required: get_option('mpath'), + static: enable_static) +endif + +mpathpersist =3D not_found +if targetos =3D=3D 'linux' and not get_option('mpath').disabled() + libmultipath =3D cc.find_library('multipath', + required: get_option('mpath'), + static: enable_static) + libmpathpersist =3D cc.find_library('mpathpersist', + required: get_option('mpath'), + static: enable_static) + if libmultipath.found() and libmpathpersist.found() and libudev.found() + if cc.links(''' + #include + #include + unsigned mpath_mx_alloc_len =3D 1024; + int logsink; + static struct config *multipath_conf; + extern struct udev *udev; + extern struct config *get_multipath_config(void); + extern void put_multipath_config(struct config *conf); + struct udev *udev; + struct config *get_multipath_config(void) { return multipath_conf; } + void put_multipath_config(struct config *conf) { } + int main(void) { + udev =3D udev_new(); + multipath_conf =3D mpath_lib_init(); + return 0; + }''', dependencies: [libmultipath, libmpathpersist, libudev]) + mpathpersist =3D declare_dependency(dependencies: [libmultipath, lib= mpathpersist, libudev]) + mpathpersist_new_api =3D true + elif cc.links(''' + #include + #include + unsigned mpath_mx_alloc_len =3D 1024; + int logsink; + int main(void) { + struct udev *udev =3D udev_new(); + mpath_lib_init(udev); + return 0; + }''', dependencies: [libmultipath, libmpathpersist, libudev]) + mpathpersist =3D declare_dependency(dependencies: [libmultipath, lib= mpathpersist, libudev]) + mpathpersist_new_api =3D false + else + if get_option('mpath').enabled() + error('Cannot detect libmpathpersist API') + else + warning('Cannot detect libmpathpersist API, disabling') + endif + endif + endif endif + brlapi =3D not_found if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) @@ -436,6 +498,10 @@ has_gettid =3D cc.has_function('gettid') # Create config-host.h =20 config_host_data.set('CONFIG_LIBUDEV', libudev.found()) +config_host_data.set('CONFIG_MPATH', mpathpersist.found()) +if mpathpersist.found() + config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) +endif config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_VNC', vnc.found()) @@ -1185,7 +1251,7 @@ if have_tools =20 executable('qemu-pr-helper', files('scsi/qemu-pr-helper.c', 'scsi/util= s.c'), dependencies: [authz, crypto, io, qom, qemuutil, - libcap_ng, libudev, libmpathpersist], + libcap_ng, mpathpersist], install: true) endif =20 @@ -1407,7 +1473,7 @@ summary_info +=3D {'Audio drivers': config_host['= CONFIG_AUDIO_DRIVERS']} summary_info +=3D {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHI= TELIST']} summary_info +=3D {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHI= TELIST']} summary_info +=3D {'VirtFS support': config_host.has_key('CONFIG_VIRTFS= ')} -summary_info +=3D {'Multipath support': config_host.has_key('CONFIG_MPATH'= )} +summary_info +=3D {'Multipath support': mpathpersist.found()} summary_info +=3D {'VNC support': vnc.found()} if vnc.found() summary_info +=3D {'VNC SASL support': sasl.found()} diff --git a/meson_options.txt b/meson_options.txt index 543cf70043a2..b38a6ae92a92 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,6 +6,8 @@ option('docdir', type : 'string', value : 'doc', option('gettext', type : 'boolean', value : true, description: 'Localization of the GTK+ user interface') =20 +option('mpath', type : 'feature', value : 'auto', + description: 'Multipath persistent reservation passthrough') option('sdl', type : 'feature', value : 'auto', description: 'SDL user interface') option('sdl_image', type : 'feature', value : 'auto', --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049120; cv=none; d=zohomail.com; s=zohoarc; b=THv48Ilhhfn/H5k3z/RA6RMSywJMsmaoaVCA8pnfZIQoH2VfABrUQF9c8TKZY7OphysJfJgan6Aa+lKbfATgXbXzQLN+z5nKUbzD0pEfqSM//M4GCRCm5ViSwPUyOzdi8uYNxnNc4yU3rNMu2nc+f5X94yZCxqlCKjaOqrT2Ta8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049120; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z2OtAFTh3+9q2/zKqbcEllbBFvpVmRkFnnE3OIbznwA=; b=W2JfOtlcN9eJra7PV+3cRKcM21AcKFw1ESShJr9UirQ2pHzWvn8AGs5rLMcoGFO3Fyh+H/rPrje+Pu8SPIi5/FwEf/UBqU7+qRmdjB6CwYURbUKOtLh+PcNcMNHrp5ASM60kybrwhUXXcX+vltaPUoLdU12TQB7o5VB03vnxWlQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049120187221.91977482742607; Fri, 25 Sep 2020 08:52:00 -0700 (PDT) Received: from localhost ([::1]:41246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq0s-0004bI-Lb for importer@patchew.org; Fri, 25 Sep 2020 11:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpps-0002jB-9u for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:36 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:40454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppq-0007ax-B2 for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:36 -0400 Received: by mail-wr1-x432.google.com with SMTP id j2so4071527wrx.7 for ; Fri, 25 Sep 2020 08:40:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o4sm3155038wru.55.2020.09.25.08.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C29881FF90; Fri, 25 Sep 2020 16:40:28 +0100 (BST) 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=z2OtAFTh3+9q2/zKqbcEllbBFvpVmRkFnnE3OIbznwA=; b=CmsIsTbzgqI2HXh1gv/izniCtpOZwttxLBTjiax52Ri6U8MMtTfaarBf0QmUiazJlO s9Ar1o2FNDwRUBd9j9QQJZhAsTmDRbp4kJS/x2kDjd/q1gywrjiRYG8FxZbowAGsMwSW Xah9w+VBFZV1z0CQ4f+Gm+bUqlWBWK/QVJD7tuJNuR8eu7leYrgFRYf2OzvNe0nwcc2/ QFdeQFCVOcQ8NDnYcXYczsW4WAHzY/pvoAq3tO421mkQzhUFW2/nRaKuNUUcNvOSpjWT AylSeYypYAsltCnWIyaDwitvJBiMfVJq9MGvqt51t02ayB8LcUdv9QOWuzrGtjFTC5RX P2NQ== 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=z2OtAFTh3+9q2/zKqbcEllbBFvpVmRkFnnE3OIbznwA=; b=KTQ0xcvqCA6WUriiLPhXRk15RvkErY15e4H7scnw9txqb7yXQjsLHatm4ZOvlX3Xpy F4Sdnw5bh6JoeV60xLEWd0qGTAACuiQOWha9r/ZI5H1IZKwIbKN7k9PRE/TBIgNRa8yN RwneVsf2dZXSfjIqo+nFzWPuW8dmvPLznaTAkA3ylRj9XhqLfqSi/m6iw9s22mDIFu8E 5RikblanLeOzZIJwB+e+N2doGH94AmzjhdWQEKq+yq3SagUAVjf3FNVsgC+xEitisE0k HuzwdNTN5CpjAHmG5Mtk7cdqX7sGxQMTfgmMIKshUjMhna4hJXd/DwL/WSWbDpmNjIdp jkDA== X-Gm-Message-State: AOAM533iAhegk6GmmytEjj4KP5+W9e9LnnwwSd9tRyaQY21UYlaehM2D N3JUy4/oSh44H/e+6eSgka1H+Q== X-Google-Smtp-Source: ABdhPJzaGlRwdGG88vPM8KeLNwNTrmjmNTykbBkHaDRQZiJGTacq7BRde0ct1GoVTHXYxFNftlgRXA== X-Received: by 2002:adf:ea0f:: with SMTP id q15mr5535670wrm.371.1601048432899; Fri, 25 Sep 2020 08:40:32 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/15] migration: Silence compiler warning in global_state_store_running() Date: Fri, 25 Sep 2020 16:40:16 +0100 Message-Id: <20200925154027.12672-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth GCC 9.3.0 on Ubuntu complains: In file included from /usr/include/string.h:495, from /home/travis/build/huth/qemu/include/qemu/osdep.h:87, from ../migration/global_state.c:13: In function =E2=80=98strncpy=E2=80=99, inlined from =E2=80=98global_state_store_running=E2=80=99 at ../migrati= on/global_state.c:47:5: /usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: =E2=80=98__builtin_strncpy=E2=80=99 specified bound 100 equals destination= size [-Werror=3Dstringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__de= st)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~~ ... but we apparently really want to do a strncpy here - the size is already checked with the assert() statement right in front of it. To silence the warning, simply replace it with our strpadcpy() function. Suggested-by: Philippe Mathieu-Daud=C3=A9 (two years ag= o) Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200918103430.297167-4-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- migration/global_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/global_state.c b/migration/global_state.c index 25311479a4bd..a33947ca32b5 100644 --- a/migration/global_state.c +++ b/migration/global_state.c @@ -44,8 +44,8 @@ void global_state_store_running(void) { const char *state =3D RunState_str(RUN_STATE_RUNNING); assert(strlen(state) < sizeof(global_state.runstate)); - strncpy((char *)global_state.runstate, - state, sizeof(global_state.runstate)); + strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate), + state, '\0'); } =20 bool global_state_received(void) --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049898; cv=none; d=zohomail.com; s=zohoarc; b=DCYswUOdZwuNJePtQ909BdRdkXUwOnQr77PfXu7cG4ZHbty+mSVn/lO2YpZ9kHU+sWW1f1X0z8Ew4wO2U3vUNQM9PTW7JV1Rli7LU/BuDe3ev4IuxKg5gaZiPxvnsGE6s/+QYLqkjNdunQroVZAG7UME0fKTdh96wBQBaVKUvNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049898; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X7bddl+nfV1LEnfasUkpHrBmJA8Qf82YzRcmiRjcnEs=; b=f9o6DqcFiduYOrLEp4vqFWGHabXHXkPOdxJpqBiiQ7+NOAUXz27A/lV6+6d0Bm0ctZoPiWB6pDyO+pQWWEA9mw1agHbmVSzo/LOpec5rOnLjva/PXdWUNvGxTdmaO+af4DVNO0WYMBTSoTTle6tp0X6Q5rWbeaaIZBqLSG1evfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049898258618.2812545310458; Fri, 25 Sep 2020 09:04:58 -0700 (PDT) Received: from localhost ([::1]:41358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqDR-0000hP-EE for importer@patchew.org; Fri, 25 Sep 2020 12:04:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq1-0002sS-0r for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:45 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:33559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppz-0007dC-C1 for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:44 -0400 Received: by mail-wm1-x336.google.com with SMTP id e11so2152525wme.0 for ; Fri, 25 Sep 2020 08:40:39 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 9sm3189318wmf.7.2020.09.25.08.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB4941FF91; Fri, 25 Sep 2020 16:40:28 +0100 (BST) 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=X7bddl+nfV1LEnfasUkpHrBmJA8Qf82YzRcmiRjcnEs=; b=Fvv0fb6QVcj+/2IYYwI2Tqv7vEMUecaGZYgEjmZgE0MopFbf+D5ZRTwcDF2W+8B/Mm SQiB5YujpQ/Cqqhri4/jJH2puoFFdfie5AtOqjJI85NOSdJee8Vicewin6iTJ0Jv6WFs +Bupkim+rc2QldbJpPMYo7zARPgP5AWZgHKMK2upApcJjWhFi1cWcuEfnAbbE3kW2YRN //VwJaGnZK2ZNiDHntABn4rpbwFVd9+sy/rqPzsVrrPrQDliOr9djz3l8XyZytGvnphk Cc/IlNtxBGXYzVo4HNgdBN4nYuUmeHzEXpmACoaES/fCPwcsEZlMsGIta0QSQCtKUXL5 miaA== 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=X7bddl+nfV1LEnfasUkpHrBmJA8Qf82YzRcmiRjcnEs=; b=ruqyshyV/KYFlD80LOO9DKrArwzpPGeGvIHyf3CCoMcFfTHTxIoF3PmrFAHVyAw+ch eHz+QG1BhbyQyE/esumJafwZkztrZpKE+fIhuTkk6OtbupKIueuFCzIYpcpXSsc10W5X JE2Bdv1lgMXID3HD4iyGRexHrtzMHgjsWjYCfMRjq6sMFOy4m2HNaivrtWRkNFkGJgoA aRlfpokH4+WmwSXEKS6UScRvld5Z9WGRPLKcgZBSsw996CyJlCaQ4/vQwkqON4cGNl6v 2wXCalVwNzPVctLMAow9I+gDHRmKl+RdIaBR5esrwdiyPpcTl6HwKMT4xoy0swmgdClQ APsw== X-Gm-Message-State: AOAM531rctNDnAURoto3s9FsoDXnnYDoBlA/dMfC7k3KiDNsICLJbnFv qJBHj2h69bxsSYLhBC16TlQpxg== X-Google-Smtp-Source: ABdhPJxHsVtqjERGlj5OZEyi3Iu0MdVdm+94pbD6Uro6koH8k7XQn9Fli34wJj6tjFRACQ4CXXmuiQ== X-Received: by 2002:a7b:cd88:: with SMTP id y8mr3728495wmj.24.1601048438811; Fri, 25 Sep 2020 08:40:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/15] travis.yml: Drop the default softmmu builds Date: Fri, 25 Sep 2020 16:40:17 +0100 Message-Id: <20200925154027.12672-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth The total runtime of all Travis jobs is very long and we are testing all softmmu targets in the gitlab-CI already - so we can speed up the Travis testing a little bit by not testing the softmmu targets here anymore. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Alex Benn=C3=A9e Acked-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200918103430.297167-5-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Cleber Rosa --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c75221dca3e7..1fc49b07464d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,20 +123,6 @@ jobs: - CONFIG=3D"--disable-system --static" - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" =20 - - # we split the system builds as it takes a while to build them all - - name: "GCC (main-softmmu)" - env: - - CONFIG=3D"--disable-user --target-list=3D${MAIN_SOFTMMU_TARGETS}" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" - - - - name: "GCC (other-softmmu)" - env: - - CONFIG=3D"--disable-user --target-list-exclude=3D${MAIN_SOFTMMU_T= ARGETS}" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" - - # Just build tools and run minimal unit and softfloat checks - name: "GCC check-unit and check-softfloat" env: --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049544; cv=none; d=zohomail.com; s=zohoarc; b=RZZSGbDcKnWUo4fpOus/JM0L/WuReKTithxN+d+LRfzNzmbbS9v3Ne/ep0MSzbttVKQT4rYiuBg+6b5EY/Q8ZWUSlQk68oHEfLOqDSNqQLvXs1CT5skWUESkbHvvhKJTfPPW6Gxx2RTbMF78PATr6RoGE4/fcqlrohupmSVtUAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049544; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qNevELBFUrx1/zkHkvDIKUavrcR36IpGOTSGaduJWAw=; b=n9OipSEh3gfmj5JA5CsjG0wD94i5fjIdZ9Jm5vxVqZEy2NTjUq6TU3jazno83IodWvDr/iDNFYMgkBnSrEdFVCHXCXruvho+X0GOmygwFaDNjZpi75ftBWZJxTucUPQPaZXhFfGStg3NKN5h9Kg3QODdulE0+og720HI5jJIjCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049544620194.42206652273308; Fri, 25 Sep 2020 08:59:04 -0700 (PDT) Received: from localhost ([::1]:57740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq7j-0003Vd-4i for importer@patchew.org; Fri, 25 Sep 2020 11:59:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq3-0002vI-Em for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:49 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:42148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpq0-0007di-QC for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:47 -0400 Received: by mail-wr1-x435.google.com with SMTP id c18so4061595wrm.9 for ; Fri, 25 Sep 2020 08:40:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q12sm3245681wrp.17.2020.09.25.08.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BDA01FF92; Fri, 25 Sep 2020 16:40:29 +0100 (BST) 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=qNevELBFUrx1/zkHkvDIKUavrcR36IpGOTSGaduJWAw=; b=Y4ock7aVUNpat4nASkxJfdebG0EijZM32uHLiryI9VqmcnwbB/+TyDCU5iVmuEi6hR FD8CEBb7gjC8+bAjCfZYL3SSWM1c652H1eDr7H5lSHhwxmTDt4SYUhaERLSEt8LQYQIa C+Ws1d6aiLVAW9QtzfIDN1JvGZI4RX4qhKQltwCAyoFB5x4X6w7dWCVv4OJ2dwZXU3vx yYvkg/+7qribN7PDSouHRUqLVoR78/gjwW0PQK0fKrRkU76Och+Q9ZcW1x2BvWWZqUws xnMAy+osBT3qwMNpKMtMzkfmlckUlVYBdZMWM4rpcwEjzE8Hgr+goEsJBmPa6/EmCnK5 YV3A== 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=qNevELBFUrx1/zkHkvDIKUavrcR36IpGOTSGaduJWAw=; b=ZS9FvZbOcgyX7nCy754IQieA047XciXOYacbgbrKfdcdfnLl+c+G7BzaUWM9Q0jpBN Rg2now/0da6Fhp1m5fcXGyulEkCqZpA6nWtWr4x3chC6d7BRxWc3JAzFjVR0AcGicQu4 sQVyX3gq9ymXLgxIh4QfTTofohDOPGyvyFJyzGIft4lPAeqtJXrXQvtWS6riq96st2oj ZSzoAZcboXbKkQQ5TnlRGTXpfxq7tdONyRW0e6NRHXiASO2jLiF6+PWBUotYj9ZzAHrz sbWSDLmzI2gLHwlb3DwIpq+JffDCCNq66Mav/4atph1ol3DypHOftrBa0LdDg9+wXbNZ GlZw== X-Gm-Message-State: AOAM5334GCFLbH+qdp/opL/hk9NbJoC0AbkjzS/gtDvW8gebnqU7uwzG f40/9IgKExS0e6q1/8CGZNGdXg== X-Google-Smtp-Source: ABdhPJwXHtx1n8nSysJ/vhAlnqXUYZ+JhShZurmCJkL+ro5UsVAZ0Dg9+vbOpM55XmWo3CFQIUaM/A== X-Received: by 2002:adf:90a2:: with SMTP id i31mr5651404wri.276.1601048443416; Fri, 25 Sep 2020 08:40:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/15] travis.yml: Update Travis to use Bionic and Focal instead of Xenial Date: Fri, 25 Sep 2020 16:40:18 +0100 Message-Id: <20200925154027.12672-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth According to our support policy, we do not support Xenial anymore. Time to switch the bigger parts of the builds to Focal instead. Some few jobs have to be updated to Bionic instead, since they are currently still failing on Focal otherwise. Also "--disable-pie" is causing linker problems with newer versions of Ubuntu ... so remove that switch from the jobs now (we still test it in a gitlab CI job, so we don't lose much test coverage here). Signed-off-by: Thomas Huth Message-Id: <20200918103430.297167-6-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa --- .travis.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fc49b07464d..80da4ebc8ea8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # Additional builds with specific requirements for a full VM need to # be added as additional matrix: entries later on os: linux -dist: xenial +dist: focal language: c compiler: - gcc @@ -10,7 +10,7 @@ cache: # There is one cache per branch and compiler version. # characteristics of each job are used to identify the cache: # - OS name (currently only linux) - # - OS distribution (for Linux, xenial, trusty, or precise) + # - OS distribution (for Linux, bionic or focal) # - Names and values of visible environment variables set in .travis.yml= or Settings panel timeout: 1200 ccache: true @@ -27,7 +27,7 @@ addons: - libattr1-dev - libbrlapi-dev - libcap-ng-dev - - libgcc-4.8-dev + - libgcc-7-dev - libgnutls28-dev - libgtk-3-dev - libiscsi-dev @@ -211,8 +211,10 @@ jobs: =20 # gprof/gcov are GCC features - name: "GCC gprof/gcov" + dist: bionic env: - - CONFIG=3D"--enable-gprof --enable-gcov --disable-pie --target-li= st=3D${MAIN_SOFTMMU_TARGETS}" + - CONFIG=3D"--enable-gprof --enable-gcov --disable-libssh + --target-list=3D${MAIN_SOFTMMU_TARGETS}" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh =20 @@ -271,6 +273,7 @@ jobs: =20 # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" + dist: bionic addons: apt: update: true @@ -286,7 +289,7 @@ jobs: - libattr1-dev - libbrlapi-dev - libcap-ng-dev - - libgnutls-dev + - libgnutls28-dev - libgtk-3-dev - libiscsi-dev - liblttng-ust-dev @@ -294,14 +297,13 @@ jobs: - libncurses5-dev - libnss3-dev - libpixman-1-dev - - libpng12-dev + - libpng-dev - librados-dev - libsdl2-dev - libsdl2-image-dev - libseccomp-dev - libspice-protocol-dev - libspice-server-dev - - libssh-dev - liburcu-dev - libusb-1.0-0-dev - libvte-2.91-dev @@ -311,11 +313,11 @@ jobs: compiler: none env: - COMPILER_NAME=3Dgcc CXX=3Dg++-9 CC=3Dgcc-9 - - CONFIG=3D"--cc=3Dgcc-9 --cxx=3Dg++-9 --disable-pie --disable-lin= ux-user" + - CONFIG=3D"--cc=3Dgcc-9 --cxx=3Dg++-9 --disable-linux-user" - TEST_CMD=3D"" before_script: - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - - ${SRC_DIR}/configure ${CONFIG} --extra-cflags=3D"-g3 -O0 -Wno-er= ror=3Dstringop-truncation -fsanitize=3Dthread" --extra-ldflags=3D"-fuse-ld= =3Dgold" || { cat config.log && exit 1; } + - ${SRC_DIR}/configure ${CONFIG} --extra-cflags=3D"-g3 -O0 -fsanit= ize=3Dthread" || { cat config.log && exit 1; } =20 =20 # Run check-tcg against linux-user @@ -357,7 +359,7 @@ jobs: =20 - name: "[aarch64] GCC check-tcg" arch: arm64 - dist: xenial + dist: focal addons: apt_packages: - libaio-dev @@ -390,7 +392,7 @@ jobs: =20 - name: "[ppc64] GCC check-tcg" arch: ppc64le - dist: xenial + dist: focal addons: apt_packages: - libaio-dev --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601048593; cv=none; d=zohomail.com; s=zohoarc; b=OnakyvQIUC/LYMRZScUXWCcHS8oulONWxCQeQI1RF/zCWFtkbY9dGypdeAWflew2OKtBo4m+/TW87RKbOIpStT+578VhZJ0ukscWf9nxtDY1nbEj4FwFAWk3eq2loIwVbXIrQT4ZJsAK+/zcLT60GXHZLSJfHF0HVLPhAkfHINE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601048593; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3x5PcaA6AWZdD4AuM7M28/4PeqHLmPGilZe5KYRdCFE=; b=KKo+StYd40LzxH/gHtbYLp/8TpRxtS6BRAH2/blYVzxABjH1DEy6L0L2UOL2VcNpzDdMR9h9BF/DZat3lgJmAac7TJWzMUi3v9cOs6BBZa0A8pTT0d6OISb3/CmKzvwuOkDKIBc3InBurxQaCqnwAnkDLbvXUuS8kyYTuAPa+9c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601048593251519.9577020134957; Fri, 25 Sep 2020 08:43:13 -0700 (PDT) Received: from localhost ([::1]:51856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLpsO-0004u1-0p for importer@patchew.org; Fri, 25 Sep 2020 11:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq1-0002u6-Op for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:47 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppz-0007dP-BY for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:45 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w5so4063388wrp.8 for ; Fri, 25 Sep 2020 08:40:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m4sm3567484wro.18.2020.09.25.08.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FB1E1FF93; Fri, 25 Sep 2020 16:40:29 +0100 (BST) 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=3x5PcaA6AWZdD4AuM7M28/4PeqHLmPGilZe5KYRdCFE=; b=Ou/yZ/XMN+Aq4KvP6SeFI9e+Y8nlh8wk1kHq0WhIs2lceqK7ljSEqSHvu5erWk3a/j HD662YawxlDiEdPZ1Y3AgJgc9alqeW/m4NivaoMTc4MFhmxtZUBVL/u6KEL4VsTv/YV0 8XUAkuT0RjY2iKnSKX4KrFZ41Fj/dbH4AyQqGeIw6EZD3o7zaMlmahVmsD7G7vMsd8+B IDdqQLk5xq0eYrgMfGoPMC7An+SORK4pzXiJt69ycAivaEQ1pSWPhlPWSwyt5wy51Glr fySh4Jdgp1jOOq0NNPAzK8hBnTPhHa4bXEaF4cRQlk2METz9wxLNX+MmR/xp/dDM16ru L0Yg== 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=3x5PcaA6AWZdD4AuM7M28/4PeqHLmPGilZe5KYRdCFE=; b=S+qEb/CIXkldjQkUOqTMrw0ouUqvhk2CqYsF/1PZS+VBQEh8CwFyZ94kfWkpBcjF+j SO2jgdO57v1pYr/h9EIN3uFVzYrFBpumhMR4FIiHbjbhWN4LwcduBVKJtz6InB2Ga0mi PED69ZahNCOt1L0wgsjdfv+/PVrsG2WHBbZWbEz/Ir8z8DW15v7oILzzSx1Y2HAqR+2Y N6bJzgH3wbqN9bX0GMmrSzhSEv7dnp5kWGGPxFECRCwp84lZG2eCb55BqAbuXZuIAXwS p2lGBvZ6fE/MrZRApYSNwqkibB45bM+XXGUb2rarAkTZ8uqjgsbYNfZZnvylY+ox3nHi foqA== X-Gm-Message-State: AOAM530qndhuwf38zslHxNHBA0Yskt4zr+lu8BI3BlwHNYus4rxd6+73 gqCppjSozdyJcawI3WSeOkpTkrNhf7gXVg== X-Google-Smtp-Source: ABdhPJxOa+p56mXjaHG83TmP7xzIL71/Js7TKzmufvzfSYvluy2tjgGpguclPc9AiIoBb1bki/XWUA== X-Received: by 2002:adf:f44d:: with SMTP id f13mr5133821wrp.224.1601048441516; Fri, 25 Sep 2020 08:40:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/15] travis.yml: Drop the superfluous Python 3.6 build Date: Fri, 25 Sep 2020 16:40:19 +0100 Message-Id: <20200925154027.12672-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Python 3.6 is already the default Python in the jobs that are based on Ubuntu Bionic, so it does not make much sense to test this again separately. Signed-off-by: Thomas Huth Message-Id: <20200918103430.297167-7-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80da4ebc8ea8..023fcf71190c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -263,14 +263,6 @@ jobs: python: 3.5 =20 =20 - - name: "GCC Python 3.6 (x86_64-softmmu)" - env: - - CONFIG=3D"--target-list=3Dx86_64-softmmu" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" - language: python - python: 3.6 - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" dist: bionic --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049597; cv=none; d=zohomail.com; s=zohoarc; b=Zzv+WwgJjFeg/DjcDZ9iRpdDCOeGxZy+yFF9Cih/5pK4zQgpGttNcZCAayDSdYdLIePJugv+DPM2S2g1WRDcUKnlbujabEhqJ4zyC3k9xU58OZcq7Pvv13ZRBGOO15gfVSedWeVF+axbg42maCLkt99kN+2OfDnFZDDWOK5gOLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049597; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7uJYNbe5lkb51q2+AyPUZmp3kp5cS3cpbQny1Ymo9K0=; b=UAc5uNiBSCb/8hdSwMbMiF4m5rx/WavW6U7IcXHTmt3l8gjIYnDoY4KZkxZ75mgrn3sHsT7o5Ht0hmW8NaQh1EunR8e6Wdfo+nGSXG5rKrObNbWgBa28YfqXNQls9FzhFwvrCf+iJkO5S7ixfZ0g6wMFIQUEZ6FFvRWaey/tvBA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16010495979211011.0589520597979; Fri, 25 Sep 2020 08:59:57 -0700 (PDT) Received: from localhost ([::1]:59268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq8a-00047T-IM for importer@patchew.org; Fri, 25 Sep 2020 11:59:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq5-0002wJ-0V for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:49 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpq3-0007eG-FB for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id e17so3502815wme.0 for ; Fri, 25 Sep 2020 08:40:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k84sm3353801wmf.6.2020.09.25.08.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6362B1FF96; Fri, 25 Sep 2020 16:40:29 +0100 (BST) 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=7uJYNbe5lkb51q2+AyPUZmp3kp5cS3cpbQny1Ymo9K0=; b=wjwB3VAgAU77vyL2OTnMzaRayFuCaZ0kCBfL1J9jDeWLtAxCjSTNYf9FWUMuI5ExGB ifRciv4oeeMQe1Gh84AIC8MfEeBKHrzaroLSdRd/wE+I6KLF+bnX+TXSZWOs3lnkXiMm Z89IW9w7AnrFSdSwYrDKdo7SzzIpxsa4XYSL+OLdgDh6nLoRglVkz2NYXPIWJygWsa+D F1DFVRq4N8xNVDMWHxh/jdzSlHzwq6jk5dFPLMdTQ8D7ynZKBrqt3K5OG7aoq2pQ7fpu lnn2dJ/e5rLOVG4kBNFVgkmkhlgbNWiaBjSPBZuxTaT5SF8f/r1RnbA9o0TVMleKV1Ef c7Tg== 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=7uJYNbe5lkb51q2+AyPUZmp3kp5cS3cpbQny1Ymo9K0=; b=tXivXqY1chtmct40ZqCeWmC1mvEDbS+3IVPrrHXHgnGEca0oZ0nSzpw4Ck4xM4uXhZ Ir4Np94EEfSXY+2npQ7n16K1dftro3UaBtvrvbaxxz6h5PHlweE0h9bAdfAC2g1AkVV/ zdUG8kGhuOKGamX6Jaut52w3kBe6h6I7/DocSj1C5H+/DCZF99GFDTsmq3xILhgCq0RU AqUSq306p9NNrKgkGP25CniZY5FmryTJU3ZLdcUVBWGMjVzLaTA7e8gsts4yl5wr2R71 IFhEoamxVG3knZok9WmvT0pzplOj05MOsAwRgUcEHO4YXNLV0oVdJxu19QfLRUMSveU9 zZ8w== X-Gm-Message-State: AOAM531cO2g2GbpRBsnimtT7qD2f4/2BT1+WZL8qAqwiKSd/I82W0nSw 93RYiTxff+6+uvikGnsTKecn0NoLaY7BOQ== X-Google-Smtp-Source: ABdhPJykRqXnarAjkd2p7nIp/t2a9UE+Xqm1ELOXvi8hr6LDT64Cvxym2O0inPPaJp2TVckiXkMTag== X-Received: by 2002:a7b:cf27:: with SMTP id m7mr3784148wmg.74.1601048445823; Fri, 25 Sep 2020 08:40:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/15] travis.yml: Drop the Python 3.5 build Date: Fri, 25 Sep 2020 16:40:20 +0100 Message-Id: <20200925154027.12672-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth We are soon going to remove the support for Python 3.5. So remove the CI job now. Signed-off-by: Thomas Huth Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200922070441.48844-1-thuth@redhat.com> --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 023fcf71190c..b6fee288bec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -254,15 +254,6 @@ jobs: - TEST_CMD=3D"" =20 =20 - # Python builds - - name: "GCC Python 3.5 (x86_64-softmmu)" - env: - - CONFIG=3D"--target-list=3Dx86_64-softmmu" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" - language: python - python: 3.5 - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" dist: bionic --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049340; cv=none; d=zohomail.com; s=zohoarc; b=OGN8L5JNY4N18xU6qJK28CH/PT+dYIarIZxxi/hNoh4nsAS64c+X78a1HQrKNS/OGlwC0dDMKE+ePlPiDUbdiqxsh1idK/6HAyY1WVRmJHCjtQLD38dr+mtZEyk0komXNxSgl6KZ6YjV0PgqG4O2fcqSy8KBLYWC4iAY+V6cPDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eh9l4eDfafTGoYLxQ+GPB5ox68P4ojNb8oAcdbH5jGQ=; b=b8zPnyNGa7HskAzYjN0yUwzKjfiknF9pGPYFmHMBO5ee8JV5qWmjOsYvNvMJlzbr/BIsgd1cSjuYEcYBj1Ho/2h6dqL+JaB2AYqMvJxBUfMLuwx+bg8oh13oX3VEskcSGlsQpCEnFHbDUDs/5m1B7NzP8LRTqNZYSipTb7wzYh4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049340361800.6349658318637; Fri, 25 Sep 2020 08:55:40 -0700 (PDT) Received: from localhost ([::1]:49344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq4Q-0008E4-Sh for importer@patchew.org; Fri, 25 Sep 2020 11:55:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq2-0002uR-L7 for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:47 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLppz-0007dL-Dr for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:46 -0400 Received: by mail-wr1-x430.google.com with SMTP id e16so4118022wrm.2 for ; Fri, 25 Sep 2020 08:40:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l126sm3353271wmf.39.2020.09.25.08.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 965AF1FF98; Fri, 25 Sep 2020 16:40:29 +0100 (BST) 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=eh9l4eDfafTGoYLxQ+GPB5ox68P4ojNb8oAcdbH5jGQ=; b=WDlysb+gMfo6mFegX0NjYWcuQjoByML5H+/+QymSgKjCgidxBlW2M5iIrI7XajJ/MC wEEqfPBrjpNHjmRWHgzPUmNU7J5Zvt24hhGnh+5yoS2zTLPoXQOm6NohkdEeJrtGc7i9 xWyEw1ftc8F7Dya72p0/2Yx1NDVmd7SuoNCnRCCM7JtzJXP5XmGSRhHCc3bZHmw7WXf4 +Ny7ca07Pmcm61kxRHDVGLWejvuBszNWyI8vFkaRjOoWHKUnrLOj2LLDcDo71wlaHkan Ci4qBSLOKEzUJffm5HD2lLeZpyy1QcQkhWwPnBms1/5Ze0bcvwJ5hsPltLBfdmZUhZNu 0LzA== 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=eh9l4eDfafTGoYLxQ+GPB5ox68P4ojNb8oAcdbH5jGQ=; b=LaKPu84ETOXQF4zy+BzzFSv6C7GYwfiTbM389JqLv/GBg2IBGgySV93YELr9QYMUzG FM2w21JNgtue5e2snUa2Ajr+XW3l5C0rceQBiUNtIvmfRbBHmClnmC+nfnQIns+Bimta 8Rph4+PIHbvRVGqVaqENr9j/RozT0o9GjvJS/25WJabStYjCxWMwLTvRcIMixd6WsP0x d3jpSCVuupjnkh2mvv9TUvL5/iwDMZ8EIMiOWt5F5m2x6huU+8KDHQGG8Y/OTFdfzVHd wakZHpD9Cicn7wN41S55Z3eC6WILty3m2Y5crEG9JFmVghrmLdI23ZHQ64GoBwq+hMVW paAg== X-Gm-Message-State: AOAM532SSk8aNSwTDJeok2qR6ewUSFm/2maiEnL7wXfg/nKUOmTCCZVF UV7VjGrNd5lZq5fdFco0WkVLLw== X-Google-Smtp-Source: ABdhPJxIIfCXiY8Dz+M0BV01+Jl8OpnnUrgCpzaqx9tiLONLK9MzKB9+QeJbkCM0hqAWrQWetynSUg== X-Received: by 2002:a5d:4d51:: with SMTP id a17mr5143400wru.248.1601048440682; Fri, 25 Sep 2020 08:40:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/15] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI Date: Fri, 25 Sep 2020 16:40:21 +0100 Message-Id: <20200925154027.12672-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth According to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the QEMU_CONFIGURE_OPTS environment variable. Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time. Signed-off-by: Thomas Huth Message-Id: <20200921174320.46062-2-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/containers.yml | 10 +++++ .gitlab-ci.d/crossbuilds.yml | 4 +- .../dockerfiles/fedora-win32-cross.docker | 42 +++++++++++++++++++ .../dockerfiles/fedora-win64-cross.docker | 38 +++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker create mode 100644 tests/docker/dockerfiles/fedora-win64-cross.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 8c89efeb6d4b..15e7b564f91f 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -248,6 +248,16 @@ i386-fedora-cross-container: variables: NAME: fedora-i386-cross =20 +win32-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win32-cross + +win64-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-win64-cross + amd64-ubuntu1804-container: <<: *container_job_definition variables: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 4ec7226b5c3c..510cfec03bb7 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -105,9 +105,9 @@ cross-s390x-user: cross-win32-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win32-cross + IMAGE: fedora-win32-cross =20 cross-win64-system: <<: *cross_system_build_job_definition variables: - IMAGE: debian-win64-cross + IMAGE: fedora-win64-cross diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker new file mode 100644 index 000000000000..5903e1b0b44b --- /dev/null +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -0,0 +1,42 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-glib2 \ + mingw32-gmp \ + mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \ + mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config \ + mingw32-SDL2 \ + perl \ + perl-Test-Harness \ + python3 \ + python3-PyYAML \ + python3-setuptools \ + tar \ + which + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt +ENV FEATURES mingw + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-w64-mingw32- diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker new file mode 100644 index 000000000000..7f03cd8ffca6 --- /dev/null +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -0,0 +1,38 @@ +FROM fedora:32 + +# Please keep this list sorted alphabetically +ENV PACKAGES \ + bc \ + bzip2 \ + diffutils \ + findutils \ + gcc \ + gettext \ + git \ + hostname \ + make \ + meson \ + mingw64-bzip2 \ + mingw64-curl \ + mingw64-glib2 \ + mingw64-gmp \ + mingw64-gtk3 \ + mingw64-libjpeg-turbo \ + mingw64-libpng \ + mingw64-libtasn1 \ + mingw64-pixman \ + mingw64-pkg-config \ + perl \ + perl-Test-Harness \ + python3 \ + python3-PyYAML \ + python3-setuptools \ + tar \ + which + +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt +ENV FEATURES mingw + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32- --disable-cap= stone --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601050091; cv=none; d=zohomail.com; s=zohoarc; b=RzSpMOzBwgawU0zxyCsd1WczjeQTVc0KJSTdHeqSBYWYyRkmUfK6xCjEqUqHCtlVeNACTO1n8a9u9Wio2y50DhrF2Nrf5qHxVRzzHJWeQosWQ5il1L/bjVj8rRYvTlbL7U0yKMrcYwv0vGabbqlNe9ot1QNNRwUy2dxBH3+M0RY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601050091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WKSNg6dxCEDR+YSvlaoe9ShT7s8QEV1fUXWqUzLTCNA=; b=nUSKhVKq9o3+C5CsTVNqgLY+QZmJgICIgGfKk2g+sz5DgwhsLf8NZ9mevXHF2e4pD6bwDZKsIdjXUxxu2GYuLwtlzlvxhf8L7sNs/azDmyzOt3REWfqBDrET8Nz0u2QqMXOjvagR0KYah1TKeDmJR1pEz6mJr/vMdGXPjaVgyG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601050091973963.0362028421351; Fri, 25 Sep 2020 09:08:11 -0700 (PDT) Received: from localhost ([::1]:49892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqGZ-0004jl-8p for importer@patchew.org; Fri, 25 Sep 2020 12:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpq3-0002vo-NQ for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:40008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpq1-0007dy-Q0 for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:47 -0400 Received: by mail-wm1-x32c.google.com with SMTP id k18so3774653wmj.5 for ; Fri, 25 Sep 2020 08:40:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p1sm3161957wma.0.2020.09.25.08.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CD5A21FF99; Fri, 25 Sep 2020 16:40:29 +0100 (BST) 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=WKSNg6dxCEDR+YSvlaoe9ShT7s8QEV1fUXWqUzLTCNA=; b=lBxErtcqO/0cldm5pArSsDPO3PLK+xEuwGy2CsJhJwhI6bL+C/TyjEEKGwhksatvfV h045P1GjK3dCLq9fkUaes3yyDR/YtDH9mjKcfAPShNZwvFMVjtOnioiTfDNputoTmNnA repW+uKEssIC7a5F2RM5s1COGPERYPU9lSB3x3HjXhJiOy4YHq4NmPJfLZCP0b7P/FZF fXa7M91cg/OdHNwlZMJHovWiXQc8Y6pfsd8GIi4VqdZ5c7MwU/qs1h8Dea4pUqNbnjO8 lr6qfr3xXqpyeCLlHGTz+KTvTMiObhLzYDVRaheWUsx6nXBLXHd5QAJB5abkcWc5nit/ F+vQ== 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=WKSNg6dxCEDR+YSvlaoe9ShT7s8QEV1fUXWqUzLTCNA=; b=faYjQ7LdTMxTvAxn6VLKXnCkro4AnmSd/vVNByJf3xz3nebaF8iT/VAcywMPoMbCbP kg2KtR/mJdt57XYMmc4Crd7aZnn13oLiT2QANRJpkWw/x1IY/1QV8FjVDWpojP3Y41Pm y86yArsH59treq2BJodvyha8lqHA5XnZnIp5Ao3Zdz1LveLNLPXS1So3X3E2j00x0T8A j8OsUI/g4s19KYSqNsO1Wrtt/Q+rrbyntWvUzEz43ounczAZnw/X3YpvHJ8+QxUml3HI wjSQLB1moqbVYqbl+/ASoQ8cg75Dr4ewFdjxY+yYlbVR2zv2l49SFuvwT0D4L1zoPusa NaTg== X-Gm-Message-State: AOAM530rGEE/gT8na4ucleKOTLM8H1wcGWw4Hc0vcKR4sbCPkXT8e/Bp 5gP77mArlPQVRgMOHNDKqBXL0X8eZElSzg== X-Google-Smtp-Source: ABdhPJyOVqNBkJUB+3lboBjNFPMsagYHP59K7YCDBfNq4COAHpoQLyBpz2GM5s0T7hKhkhFDf35Ogw== X-Received: by 2002:a1c:7c13:: with SMTP id x19mr3899144wmc.45.1601048444423; Fri, 25 Sep 2020 08:40:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/15] gitlab-ci: Remove the Debian9-based containers and containers-layer3 Date: Fri, 25 Sep 2020 16:40:22 +0100 Message-Id: <20200925154027.12672-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth According to our support policy, Debian 9 is not supported by the QEMU project anymore. Since we now switched the MinGW cross-compiler builds to Fedora, we do not need these Debian9-based containers in the gitlab-CI anymore, and can now also get rid of the "layer3" container build stage this way. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200921174320.46062-3-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/containers.yml | 14 -------------- .gitlab-ci.yml | 1 - 2 files changed, 15 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 15e7b564f91f..6769eef0ff0d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -214,20 +214,6 @@ tricore-debian-cross-container: variables: NAME: debian-tricore-cross =20 -win32-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win32-cross - -win64-debian-cross-container: - <<: *container_job_definition - stage: containers-layer3 - needs: ['amd64-debian9-mxe-container'] - variables: - NAME: debian-win64-cross - xtensa-debian-cross-container: <<: *container_job_definition variables: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a18e18b57e54..c265e7f8ab0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ stages: - containers - containers-layer2 - - containers-layer3 - build - test =20 --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049868; cv=none; d=zohomail.com; s=zohoarc; b=M9UM8s8ZMuUgujQE+8nKAEPiTZRQLuB/Rxr+PHT+Q2qEn+qadEBELrMjCziwpbZG8GKn+tff3fh6Y+Zlef7WMRng/Uu23DKxHO4e3tG5aNbIIKhiQhC0wqYiWx6xNktzZoKcsGINVOGAVRerGMfiHxrZ0TtF0sj/kr41bvjCdl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049868; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9nPyMT1X5QmnyF+DhIV8Y2gJFsLW/DPqQWHOVMTnoaA=; b=ILbCrToebCpAGEbEmUrLHZG6HM3fMNpfuohDMgt2UK0rorCcV1vwciTuXTnQNo1V3BVTUMwkOxWGhBCxfbkzka+9KFJVVVYlUxVbFxnjecO7xBGBRdrYntg5twrOr+acS0B5PGw1A3JEU9LzASgXw4rTwFZfLlFSwCIHFgaU4z0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049868867107.27336620489984; Fri, 25 Sep 2020 09:04:28 -0700 (PDT) Received: from localhost ([::1]:39470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqCx-0008Ji-UW for importer@patchew.org; Fri, 25 Sep 2020 12:04:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpqB-0002yH-Gh for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:55 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpq5-0007eb-8u for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:55 -0400 Received: by mail-wr1-x42d.google.com with SMTP id w5so4063727wrp.8 for ; Fri, 25 Sep 2020 08:40:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s17sm3524196wrr.40.2020.09.25.08.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 076601FF9A; Fri, 25 Sep 2020 16:40:30 +0100 (BST) 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=9nPyMT1X5QmnyF+DhIV8Y2gJFsLW/DPqQWHOVMTnoaA=; b=C8IlginxXjUunqjy6NE2/BOeWdP8hOrx0pxC4WrMWeQTiKp5ZcIZRzfhguwPLR+Czm EmaLlR30VokM+edUTHM3MbHwGY8OdyluheB2PiXFZ4Q/7bKroEkMEnQpIzXuenZSM0eE VfpaCjdfRSXa3w08Z0WYouWWIV3960cyqPRNnMI1sTM0RP4454ZH8CFXY1DTm0M6YcN3 45qGVscMRYEL8aS+SiWAKiEevCsc9jL0JTRKgrTCYNw96LhV8Vf1YsO0WHrS6iehKkMs 2/PFeiwAW2uphKMBckddTtyK0iNwdPw6f4cZJkf/GNlfXsPRGWIV6oCCSLdQQKe4nIqL GrRA== 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=9nPyMT1X5QmnyF+DhIV8Y2gJFsLW/DPqQWHOVMTnoaA=; b=BTv8VTnAmEkg7+8eNOV2ejdrg9Zp2bFniXe9n36rRvplsjLjbRmoh9IyCmUA8E8F+6 bWyqQYDgpQ/w5qtvnY1BtgSr1fd3qPaGNoQulzukNLbsjJ4FjXSr105BiLJBtIWYN/Ro b+kQ5ja8ClTP2nJ/Pns3kefruGfV+ioaxlh02/WPAXLJzzpQpE7jgv+7k5mJteijasRr acXnDkTa/neBZpgprpurDkip1LnQE0jLMo42dWkc9XWSpDKfsT1o7Z6C6GdELyjthzZD 91p9DSUsBVpJj15XF6c+7BmGgbG7vIQgGkstfASswHBaeTQTqVTAwTL2MohiepkdEniK eq6g== X-Gm-Message-State: AOAM531Yf9xXXx3lnfSQRwxCDXCfS+bFrmmWqJHlSc2ilzZtIDrTRAFP AboV6A2Up0xMNxdAl/xCjNlnMQ== X-Google-Smtp-Source: ABdhPJzFkFhSI9n+Mskmz3dUbGSUs2z0+z2WCh1jXRnXNb2f5wfiJfk6dIrRCwg4XoWvHPWTt5QVQA== X-Received: by 2002:adf:ab54:: with SMTP id r20mr1672274wrc.293.1601048447687; Fri, 25 Sep 2020 08:40:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/15] tests/docker: Update the tricore container to debian 10 Date: Fri, 25 Sep 2020 16:40:23 +0100 Message-Id: <20200925154027.12672-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth We do not support Debian 9 anymore, thus update the Tricore container to Debian 10 now. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200921174320.46062-4-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 2 +- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 6769eef0ff0d..089cea7c14c1 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -210,7 +210,7 @@ sparc64-debian-cross-container: tricore-debian-cross-container: <<: *container_job_definition stage: containers-layer2 - needs: ['amd64-debian9-container'] + needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 75704268ff0a..02ec92830b83 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -137,7 +137,7 @@ docker-image-debian-sparc64-cross: docker-image-debian10 docker-image-travis: NOUSER=3D1 =20 # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian9 +docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 =20 diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 769d95c77bb2..985925134c67 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu/debian9 +FROM qemu/debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049385; cv=none; d=zohomail.com; s=zohoarc; b=RouormRjA5/ZbjNgN8D1aaWcYUfHMT9Sqx4YICocKEALQppLpAi9ELFNlQId7zmmPZ7OK0GtyF0BJ2+YdwtYAm/PM9QgVO2KYZP/XdSMsq4uEzVm6U67k2DFiipFIGdevfrEeeytJb7QrWxekY5yuTREsOfubzSTfC6mSt8nSsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a1oClsqC0Jus89g3hfrBaMyM4864X7tFULVIlVAmDEU=; b=Mz91yRFPr+oxvLeLgnR+tzF15TBv93u08n8oCM8Nrd4f3rYPGet0EjJRy6CgIhKHa6Dd9PfqvtE6fuUFo2UMoDZmMUa8FawHs/23iJcw5hyr4TWcSiJpYvNuSXEqCizgz4J5yDGkQ/BEFomXSc8e8Pm+tH1tT+uv5BWq2Dm2KHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049385174726.3647686892376; Fri, 25 Sep 2020 08:56:25 -0700 (PDT) Received: from localhost ([::1]:51856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq59-0000yH-RZ for importer@patchew.org; Fri, 25 Sep 2020 11:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpyA-0002Y0-0s for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:13 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpy7-0000VM-TZ for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:09 -0400 Received: by mail-wr1-x42a.google.com with SMTP id j2so4101310wrx.7 for ; Fri, 25 Sep 2020 08:49:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l18sm3226507wrp.84.2020.09.25.08.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:49:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 298481FF9B; Fri, 25 Sep 2020 16:40:30 +0100 (BST) 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=a1oClsqC0Jus89g3hfrBaMyM4864X7tFULVIlVAmDEU=; b=g9ki3RXU4kaHJ0pqVY+OckCldjvK0wP3mRFn8kstX1401P8jhS7jgWNK4x6xCE9gOg okN0F2bWrmAbmBMsjmDjWIDCvfuELqKXPssIrL32nyUMk+i8TvWE9XTW3qRoNVKH+1s4 LwfqJ6jJCQM9cCSDAlcWZPMNCH5oPXJSlKFuM42nMMu/zcLrrUy2lnsW0vhEuA5vwKgf ajEUfNnbN5i7dVR3FzOjM1xW3GFv5f20bUg4GAxnApvxrLCZyoyypGVuTz8ndpdafPwd 8ioLBh2RSrHqs0fKGXUks5EZ1P0BqtDE0jB170dRPqHs54C7kBsZbhXpY6BqEwVy7bZl FlJA== 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=a1oClsqC0Jus89g3hfrBaMyM4864X7tFULVIlVAmDEU=; b=UvW9R7AalcXvVRvvMApjhAb+PtPY71VMGCDL6oeoyris0J5JeC+9Zkju/JQnrUrLb3 jXdqFFUx4MhlIMjipgc2ib0csKsOrK5oKBvp3WwEiqCgtWbJ0i4MFwGzm431ls8Fbpn5 IjmNsN7/ahjHi+zP1cXJsfMVfkTXxj75aBl2BwAMe5ZsYO3rsWoLpLPCwB0Abx1iZTBG SAaQ1IHQYWM65YOpFH1Pkdepw+fNHhAWq/Ceog0q1F7nyBlFUWVSTcff/kVXkNE7mKLX IqW7jOY+W9FVfMghiPaL8mwdVZVrglXJopDt7aE+8FMpjU07GH68LLPeWJEmXLTYS/Zz OLUw== X-Gm-Message-State: AOAM530zB7q42uVy5g8zU6QUzWrCZh/i0vFmp1EX766+eN23o07CiVgi KlQkBtlB6RUNVxdRhDj0iemtlA== X-Google-Smtp-Source: ABdhPJyaKy24ARcDo2jKflNE1sBSIehz6uIXj+vxFIgr+bb8Aw9gcWUKYoD885DgMg330ClYWTc1YQ== X-Received: by 2002:a5d:56cd:: with SMTP id m13mr5026148wrw.261.1601048946237; Fri, 25 Sep 2020 08:49:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/15] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests Date: Fri, 25 Sep 2020 16:40:24 +0100 Message-Id: <20200925154027.12672-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth We're not supporting Debian 9 anymore, and we are now testing MinGW cross-compiler builds in the gitlab-CI, too, so we do not really need these jobs in the shippable.yml anymore. Signed-off-by: Thomas Huth Message-Id: <20200921174320.46062-5-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .shippable.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 0b4fd6df1d81..14350e6de8a1 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -7,10 +7,6 @@ env: matrix: - IMAGE=3Ddebian-amd64 TARGET_LIST=3Dx86_64-softmmu,x86_64-linux-user - - IMAGE=3Ddebian-win32-cross - TARGET_LIST=3Darm-softmmu,i386-softmmu - - IMAGE=3Ddebian-win64-cross - TARGET_LIST=3Daarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=3Ddebian-armel-cross TARGET_LIST=3Darm-softmmu,arm-linux-user,armeb-linux-user - IMAGE=3Ddebian-armhf-cross --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601049737; cv=none; d=zohomail.com; s=zohoarc; b=WRow/9ZmNMv0e8/KE7tvac9MhmDkz+VVzdvSVFOquabAGusbLaxaGgmgTVzb6COs2se/6S6xntS2GPXW5wH6S2P4dR3p6GUPCbsjWMGYxgoQQdkqSXTEnx9ThSpmH+fg5QnXyEQdYNvK/KaS5LuZsKyAsQ1G+OTbvLAgX02IAyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601049737; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GEgAIy3Gb432FQIIBfbH6rEBsgGzghVjuElpT6S9p1E=; b=fZJ/yznztSy9WIFw8hkp4NBFY+HTNY5jbDevZzBfIfeSAV8zBK6lsQxdx4duVgjVaMwg9H9jJYnFmuARPUc8fku3yAP39U8mcmxKl0gWNskV47loamFgSh6pppKh8T+JZy/n5oDEv5ulHM/bIOu8DxDWd1FUwl0jpowIPWxMLco= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601049737055579.1716367461477; Fri, 25 Sep 2020 09:02:17 -0700 (PDT) Received: from localhost ([::1]:60308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLq9P-0004Zu-4i for importer@patchew.org; Fri, 25 Sep 2020 12:00:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpyD-0002Yn-QF for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:19 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpy9-0000VV-JR for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:11 -0400 Received: by mail-wm1-x332.google.com with SMTP id k18so3807712wmj.5 for ; Fri, 25 Sep 2020 08:49:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r206sm3342155wma.47.2020.09.25.08.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:49:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 563291FF9C; Fri, 25 Sep 2020 16:40:30 +0100 (BST) 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=GEgAIy3Gb432FQIIBfbH6rEBsgGzghVjuElpT6S9p1E=; b=DU35PRZL5dZiqMF1B5UlZK99Fkrw15w545/K7aWYWGwvjXcOj/ucLUwUZIX4u+4H7b labIFr+ZDoLZqO6+8w9zf3DWWng/b8d2iBviW5COT8blcuAJxBqxzCcg+bWEns6pURCC h9ppNxkHIgV4pA7IlC3LBeJiWnQDqPUn2TgNBGCR4Cv4AeVuKtalcoyUy567KDMpfiBt uiAcuTpBCeFoFwZAdkqk46xGSnKTsh4RAxKxoYTq8NUyyTUp6bsJwZ9Q7x4ABYHK6MJh +y6srtpGxzhR6ibN7o3F3DgeXkS0M+ByTsvgMW/5PTX1BMLRHGbKMopA8l+q9Ktsu/1I GnXg== 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=GEgAIy3Gb432FQIIBfbH6rEBsgGzghVjuElpT6S9p1E=; b=DTnizRETIn9Djzs8GzPm3DH4e3pXVcAxWefLTNDK/a4XRB1WnnuLpry9GcnDaD6sRu PzV+OOhoVozAnjLL5kxW1BBMtOUMPkLt+EUE6KRtmvFmVCpZAjcIHNW94HgxCbQ9O0Lc 4CZQaJs1uC3US4gvWK73w2viZj80ILpBUm6RJN5Nds3kfpDqdhTrj8iqsz98hV/OvDoE g8CCxGB5a0RJCJLoiat7We/7FvwQlJxLBytj2PN3TcZBVhSXZyI1TW5PGG3pE4rT3J6D 7og9CUrGEhMU2mw33ahqYC412Mo3Nbwhb7zfOgYS6OhZgX0IGkuNwCeNR868rP1rh0Rj pAwg== X-Gm-Message-State: AOAM531gPbwYxEftUGAkJ85zfG6voBB2KvmqALnjA+m5/ozPhJlCrTCX wISinDjfPzf6oCct3hr5DcxpfdZrTdVBdQ== X-Google-Smtp-Source: ABdhPJylLb16ToRfVowy12faH0FAJN7HDj/sGxNMyizaqMtLtuq2BhkdxuTT8zknjNfbgNQHJiiJnQ== X-Received: by 2002:a7b:c1d4:: with SMTP id a20mr3835065wmj.30.1601048947951; Fri, 25 Sep 2020 08:49:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/15] tests/docker: Remove old Debian 9 containers Date: Fri, 25 Sep 2020 16:40:25 +0100 Message-Id: <20200925154027.12672-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth We do not support Debian 9 in QEMU anymore, and the Debian 9 containers are now no longer used in the gitlab-CI. Time to remove them. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200921174320.46062-6-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 12 ----- .../dockerfiles/debian-win32-cross.docker | 38 ---------------- .../dockerfiles/debian-win64-cross.docker | 45 ------------------- tests/docker/dockerfiles/debian9-mxe.docker | 21 --------- tests/docker/dockerfiles/debian9.docker | 32 ------------- 5 files changed, 148 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker delete mode 100644 tests/docker/dockerfiles/debian9.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 089cea7c14c1..11d079ea5810 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -48,18 +48,6 @@ amd64-debian11-container: variables: NAME: debian11 =20 -amd64-debian9-container: - <<: *container_job_definition - variables: - NAME: debian9 - -amd64-debian9-mxe-container: - <<: *container_job_definition - stage: containers-layer2 - needs: ['amd64-debian9-container'] - variables: - NAME: debian9-mxe - alpha-debian-cross-container: <<: *container_job_definition stage: containers-layer2 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/dockerfiles/debian-win32-cross.docker deleted file mode 100644 index b045e821b910..000000000000 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ /dev/null @@ -1,38 +0,0 @@ -# -# Docker mingw32 cross-compiler target -# -# This docker target builds on the debian Stretch MXE base image. -# -FROM qemu/debian9-mxe - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -ENV TARGET i686 - -ENV PATH $PATH:/usr/lib/mxe/usr/bin:/usr/lib/mxe/usr/$TARGET-w64-mingw32.s= hared/bin - -ENV PKG_CONFIG_PATH \ - $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig - -RUN apt-get update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - mxe-$TARGET-w64-mingw32.shared-bzip2 \ - mxe-$TARGET-w64-mingw32.shared-curl \ - mxe-$TARGET-w64-mingw32.shared-glib \ - mxe-$TARGET-w64-mingw32.shared-libgcrypt \ - mxe-$TARGET-w64-mingw32.shared-libusb1 \ - mxe-$TARGET-w64-mingw32.shared-lzo \ - mxe-$TARGET-w64-mingw32.shared-nettle \ - mxe-$TARGET-w64-mingw32.shared-ncurses \ - mxe-$TARGET-w64-mingw32.shared-nsis \ - mxe-$TARGET-w64-mingw32.shared-pixman \ - mxe-$TARGET-w64-mingw32.shared-pkgconf \ - mxe-$TARGET-w64-mingw32.shared-pthreads \ - mxe-$TARGET-w64-mingw32.shared-sdl2 \ - mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ - mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ - mxe-$TARGET-w64-mingw32.shared-zlib - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3D$TARGET-w64-mingw32.shared- diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/doc= ker/dockerfiles/debian-win64-cross.docker deleted file mode 100644 index 4cc4a3f3657f..000000000000 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ /dev/null @@ -1,45 +0,0 @@ -# -# Docker mingw64 cross-compiler target -# -# This docker target builds on the debian Stretch MXE base image. -# -FROM qemu/debian9-mxe - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -ENV TARGET x86-64 - -ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin - -ENV PKG_CONFIG_PATH \ - $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgco= nfig - -RUN apt-get update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - mxe-$TARGET-w64-mingw32.shared-bzip2 \ - mxe-$TARGET-w64-mingw32.shared-curl \ - mxe-$TARGET-w64-mingw32.shared-glib \ - mxe-$TARGET-w64-mingw32.shared-libgcrypt \ - mxe-$TARGET-w64-mingw32.shared-libusb1 \ - mxe-$TARGET-w64-mingw32.shared-lzo \ - mxe-$TARGET-w64-mingw32.shared-nettle \ - mxe-$TARGET-w64-mingw32.shared-ncurses \ - mxe-$TARGET-w64-mingw32.shared-nsis \ - mxe-$TARGET-w64-mingw32.shared-pixman \ - mxe-$TARGET-w64-mingw32.shared-pkgconf \ - mxe-$TARGET-w64-mingw32.shared-pthreads \ - mxe-$TARGET-w64-mingw32.shared-sdl2 \ - mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ - mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ - mxe-$TARGET-w64-mingw32.shared-zlib \ - curl && \ - curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHv= Emulation.h \ - "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/ming= w-w64-headers/include/winhvemulation.h?format=3Draw" && \ - curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHv= Platform.h \ - "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/ming= w-w64-headers/include/winhvplatform.h?format=3Draw" && \ - curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winhv= platformdefs.h \ - "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/ming= w-w64-headers/include/winhvplatformdefs.h?format=3Draw" - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32.shared- diff --git a/tests/docker/dockerfiles/debian9-mxe.docker b/tests/docker/doc= kerfiles/debian9-mxe.docker deleted file mode 100644 index ae2c222a6f08..000000000000 --- a/tests/docker/dockerfiles/debian9-mxe.docker +++ /dev/null @@ -1,21 +0,0 @@ -# -# Docker mingw cross-compiler target -# -# This docker target builds on the debian Stretch base image. -# -FROM qemu/debian9 - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends gnupg dirmngr - -# Add the foreign architecture we want and install dependencies -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A= 276 && \ - echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources= .list.d/mxeapt.list -RUN apt-get update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-= w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) - -ENV PATH $PATH:/usr/lib/mxe/usr/bin/ diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerf= iles/debian9.docker deleted file mode 100644 index 3edb5147ef3e..000000000000 --- a/tests/docker/dockerfiles/debian9.docker +++ /dev/null @@ -1,32 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian cross compiler targets to build d= istro -# with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:stretch-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - bc \ - build-essential \ - ca-certificates \ - clang \ - gdb-multiarch \ - gettext \ - git \ - libncurses5-dev \ - pkg-config \ - psmisc \ - python3 \ - python3-setuptools \ - $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601050459; cv=none; d=zohomail.com; s=zohoarc; b=F+QWnvuxiIp7uFhbDgqjfldVDcnrUQlAAZ9U6xWSaGZj1k3Zpgaj2o29pq75Zm2GzGL+Giw7rNUr/qEp/pEkM+J4tFzTZ/5VUXBwo9c4itU5hz9lWIb8Y7y7NJ0dBNrhz91Om1x5Au4WL8IQXhKR/0EbGYL/SrzB4c1VP8SdR+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601050459; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=onYubvnZAptV0g3qVhyvCNtLG7BSB07qR8hJW0/fGsI=; b=MLwsLxDi8IL0Cmv7z2eWCTB91VdC+aQgWsGXXMmYAYqtOwCRFNL6luCdOJzOlFDkmm1fWLmFxIHSe2ZVC7Cv4W/ca0EW+eyTQThhqztdxuTArHiWKaTjxs5kW1Fuqowzun9vBaLXKYmoLynlyncQ81xW+fl7nbX1D6FF+0jCse0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601050459355353.557758446575; Fri, 25 Sep 2020 09:14:19 -0700 (PDT) Received: from localhost ([::1]:40156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqMU-00049v-LL for importer@patchew.org; Fri, 25 Sep 2020 12:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpy8-0002Xs-Tb for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:11 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:38201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpy6-0000V9-Se for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:49:08 -0400 Received: by mail-wm1-x333.google.com with SMTP id v12so3815210wmh.3 for ; Fri, 25 Sep 2020 08:49:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m23sm3108366wmi.19.2020.09.25.08.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:49:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B10D1FF7E; Fri, 25 Sep 2020 16:40:30 +0100 (BST) 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=onYubvnZAptV0g3qVhyvCNtLG7BSB07qR8hJW0/fGsI=; b=RuHTMNDqG5bAGY9kkcDg9HN8S0pLpMdgWdNDi89GQlrXY/C6RMnKoJxlasuVzz6psr pxxLmv3zf308pqTiyeghIIaKTVhMBxe/SO7BrEgt/+2QgntHTM0X2powvD9eflkSC0RN Jwec8oZTyVyjMJmkdQKN8YSDZEs9HvWg1M4nS8a5Uw6EnpUiVbkfxUR0mlQ8JDJ37YIk aJ4Sc5sX+cnVs6CxuovqkBXggatOT/58jwSFfcHQjH+ixbxLu60kuqhks/epSKJhlpV4 oJ8/zxLtbyrIfUMzNCMG7y4F725p6XW+qLV5pntOxJwzIfJt/GaOTbWnMmbv1hlKdlZU WFfA== 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=onYubvnZAptV0g3qVhyvCNtLG7BSB07qR8hJW0/fGsI=; b=LKc0RvJYqFS4YYv7BAgDz2rgRZd1InMtct7lzby+JmE2ndpmz6PDFsoYiwuD67Wvcw qg+Vu077wNpIMdnU3xm+jq5WES9wvGHk9aNJQQzu2HNBM6WMQl6+fcURPh5kFqZAXOqP 0nlpwXXSTLzWD3RbECZSyjOQ7CzNpjEsAVzY9NUxIGiyTKTzbbgFEbTNPEBpTqfVQhTV Lrso1elkVrmOnnP9+QyKcBvPKcNVqV9HI5Dzj2Xd7+KHw1aOAvjOnnDz67Mb54RDEjj+ dcahUSlHoAzQ42c7tKr41bAVq6+lhw1CqTziPsm1A5vP14WOX6PB+AzAQN44DyNWc1nw aqEw== X-Gm-Message-State: AOAM530imTEfGZfjDqIj97nU+i/qZwPe+NkJV0uQKLbCMF/ZzelDaFxI ga/MiiPjnnEuSThg/1xjTnptQA== X-Google-Smtp-Source: ABdhPJwg3Qt6FTfBMMepdqKtHeZx02g88WW7I1hYbCO9+P/hVvrwwG5YONeteBig8cwFL5mjB7pMxg== X-Received: by 2002:a1c:2e17:: with SMTP id u23mr4063399wmu.73.1601048945110; Fri, 25 Sep 2020 08:49:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/15] gitlab-ci: Increase the timeout for the cross-compiler builds Date: Fri, 25 Sep 2020 16:40:26 +0100 Message-Id: <20200925154027.12672-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Some of the cross-compiler builds (the mips build and the win64 build for example) are quite slow and sometimes hit the 1h time limit. Increase the limit a little bit to make sure that we do not get failures in the CI runs just because of some few minutes. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200921174320.46062-7-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/crossbuilds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 510cfec03bb7..03ebfabb3fac 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -2,6 +2,7 @@ .cross_system_build_job_template: &cross_system_build_job_definition stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + timeout: 80m script: - mkdir build - cd build --=20 2.20.1 From nobody Wed May 15 14:44:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1601050238; cv=none; d=zohomail.com; s=zohoarc; b=SEMuNmdymppbc2WfLJTnUYeGith/3l7e9JN9Kutni2/0OBeMeQSoAEFbhan7M9ILQlBl10rAB0xsC8dJ3vvHNnzYw+w0ZPUXWraTDv1+NrV4jIXDNHW3UCkZC+UEXoIuKXDQtz41b5Gjg906EkTdTEL3gCnBhOPhVFaORD/ZRCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601050238; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WnevfPJLXP7m95u6O9UpOEscgzjFPYFrMEzimyFwfY0=; b=RioQplwlFKeg7B27ry+InD1qWZgYibW/9mtauYio3bH0gbYxVj07h50FsFcUacU9xB/hM8jjEZ7ALD0K8hEOEHoNvCTEiP8jxKsFlNahJ8AiewuuLJBk3F0wNloxr71KPrkcphb8eEmJe9IhBVhw+QpnjZwLfyxX0jrFeCaTycY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1601050238051182.48018855747898; Fri, 25 Sep 2020 09:10:38 -0700 (PDT) Received: from localhost ([::1]:58542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLqIv-0008L7-9C for importer@patchew.org; Fri, 25 Sep 2020 12:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLpqD-00035L-NG for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:57 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLpqB-0007et-58 for qemu-devel@nongnu.org; Fri, 25 Sep 2020 11:40:57 -0400 Received: by mail-wm1-x330.google.com with SMTP id w2so3504376wmi.1 for ; Fri, 25 Sep 2020 08:40:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i16sm3224939wrq.73.2020.09.25.08.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 08:40:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC4961FF9D; Fri, 25 Sep 2020 16:40:30 +0100 (BST) 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=WnevfPJLXP7m95u6O9UpOEscgzjFPYFrMEzimyFwfY0=; b=n6FYUc+9TPWnJtB2aGSCJ7mnRLITgNklB3GSj7Yac5DQTjKL8RI1+7BICn/bt8MOPY 2osJvDtKhqjh7m0xtci6MKkbDrL1l0mried6uC04Cp5YRN3HUr48TpvhKeCk86q2mRXz OIxz8kI53GGjSXILjUjK32nx9QeCcO4fpNuv+SbyvkEQdR9oPfQYAQ3+2aZwXAiO7jun Calpvv6uD8KotGjnGd32x3xnBv7GcXZuHZhDKbkTA++45Ow5rnTmDq/OrYcNrBsAP+nr hFUL6zQvm/VbnGfcYCbhWuH2InIglNwRXJcnq9WCjLRwzdaZE7KRXZX1xP5ZHlNt2Zl5 kQZw== 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=WnevfPJLXP7m95u6O9UpOEscgzjFPYFrMEzimyFwfY0=; b=nkzwu0E3noXIVpZfYuvoCiT8m1l/Ho/2JAZlGEjVjfeBfchTuUAcprKXy3GZVCzUE2 hk1+KoGPnA1e8qU6wHPrPfPP1aXkdQRbxGAtMgCQS1t9poMRAQ0aR4wKMGip435D+fJk JbRlOxUgJVbvX8IzH6AqcyiIrd2IG3Wg6qXkpCVoTsl++hjc19O8ms1k3I9NTr72ftm3 ++ZUlbfa9UWAluIqI0+MnVVcHEK5FzLS4CJrHbLFyOVXtsKKhF08ZMaSaMpzLYtU3rTP pjVhFfVSdiFUF/oxuMW7XNdQCbTVAXkgWTU/u9KQSmorBQ1cS3FKIa9iiv56us4VCmEl ltsQ== X-Gm-Message-State: AOAM533CMIulAocWiTeYNGWkfOVmNg9jG2Ky41EWj3KWdNf8jGzxnWyr wyUeS/eABU9bo9rAhzMjYnxlLQ== X-Google-Smtp-Source: ABdhPJzZkmb4rlGjBdr7zvycOh5FN8xpes/tFxqnZ7/9swIYC2TVuUj1T5o/EN/bMtFin+1QgP3C9g== X-Received: by 2002:a1c:59c3:: with SMTP id n186mr3819118wmb.32.1601048448935; Fri, 25 Sep 2020 08:40:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 15/15] configure: Bump the minimum required Python version to 3.6 Date: Fri, 25 Sep 2020 16:40:27 +0100 Message-Id: <20200925154027.12672-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org> References: <20200925154027.12672-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Thomas Huth , "open list:Block layer core" , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth All our supported build platforms have Python 3.6 or newer nowadays, and there are some useful features in Python 3.6 which are not available in 3.5 yet (e.g. the type hint annotations which will allow us to statically type the QAPI parser), so let's bump the minimum Python version to 3.6 now. Signed-off-by: Thomas Huth Message-Id: <20200923162908.95372-1-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- docs/conf.py | 4 ++-- configure | 4 ++-- tests/qemu-iotests/iotests.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 0dbd90dc1124..8aeac40124cb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,9 +36,9 @@ from sphinx.errors import ConfigError # In newer versions of Sphinx this will display nicely; in older versions # Sphinx will also produce a Python backtrace but at least the information # gets printed... -if sys.version_info < (3,5): +if sys.version_info < (3,6): raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.5 or better\n") + "QEMU requires a Sphinx that uses Python 3.6 or better\n") =20 # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build. diff --git a/configure b/configure index b81868cf0231..c5f1b3bec6a8 100755 --- a/configure +++ b/configure @@ -1964,8 +1964,8 @@ fi =20 # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (3,5))'; then - error_exit "Cannot use '$python', Python >=3D 3.5 is required." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (3,6))'; then + error_exit "Cannot use '$python', Python >=3D 3.6 is required." \ "Use --python=3D/path/to/python to specify a supported Python." fi =20 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 91e4a5712609..f48460480a99 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -40,8 +40,6 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '= ..', '..', 'python')) from qemu import qtest from qemu.qmp import QMPMessage =20 -assert sys.version_info >=3D (3, 6) - # Use this logger for logging messages directly from the iotests module logger =3D logging.getLogger('qemu.iotests') logger.addHandler(logging.NullHandler()) --=20 2.20.1