From patchwork Wed Sep 4 20:29:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173043 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp430242ilq; Wed, 4 Sep 2019 13:58:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVioznz8wScA7FTxFQPOxERM8nBUhy5pJl9+GFoQc78OO/HIrLCeNAPYSn7WA0+JAh6goF X-Received: by 2002:aa7:dc56:: with SMTP id g22mr274781edu.212.1567630684003; Wed, 04 Sep 2019 13:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630683; cv=none; d=google.com; s=arc-20160816; b=OD2DO+ZZXbHl7ewxZFipYtpF8yXEPsvumCloXvzcMRvVp/KjErhofr9BbYT8Q5I1i4 FP/idlvbkbKVjISIsmQAnVpoOLQVepIhBW6TDJvVatgOvaWvupO2UwUhvVwp3gJ6efPU kYev22HrNr7fibHA/Lpqfwh3CtMZpuI3fERmVp/7vurk52i6coF6Gpn+/6+PPJmx4FI8 mEaVYN6YIpxbNWyL2HtmeyTkPem46X/UWD6bjRZtUrdvuTtZdLyqTZ+w4u9YCFMbT/LO jPHceDDKJNkm5O1Y4Hr2zaQ/5S/G3UKi0QgbnvDNUGeoELm6qK04Pk+p+ZxbTY3Rc0y8 HolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=xETLZAwStJiPTA1iTveb1EK9m8PyaZc484o5SN7kXzM=; b=odVtYlMdXq1CUrCaa3Ckrl/bvURkWTVGmUEdAwwpxlV0ESa1UT1DfUw22495B2ZmJs kGeS6go07Ln2FmTSOGjw5yHkJO6B3FNHvSCkDDnUaUXb8g/CP1CLHoX5NK8QCA22uzPW 0xNVdidLkfXgJbpuFpyaibDZLGAJydLiEMZ8e/X9J95NHOzqeUysx9fblyRavUFXw+Aj 0l3+lu64RfqMv3Z0bgSPdbpxcfOWpTxjRUwna7y3WpPhY4b+9qoSCzwMkYfamaQbM9iv syJi5Ctvbbpohwb6Tgj959J8aNcT87we86FYoYAwV94aN5lxqzOajqblB1ibHXZpdC7c WJKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rcuIgzP3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a30si11921025eda.39.2019.09.04.13.58.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:58:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rcuIgzP3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cLq-0002pB-Bs for patch@linaro.org; Wed, 04 Sep 2019 16:58:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49670) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bv7-00087O-DP for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv2-0006W1-Vr for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:24 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv0-0006UG-BN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:19 -0400 Received: by mail-wm1-x342.google.com with SMTP id k1so204945wmi.1 for ; Wed, 04 Sep 2019 13:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xETLZAwStJiPTA1iTveb1EK9m8PyaZc484o5SN7kXzM=; b=rcuIgzP3lIG1kEuTPD29MnJojHabum3zRstwD98/oHz8ZAsi6TuXSQ2rfOUeD1F1gA rOe8weNH7MCOBt2Tqo/aX1Xml65w7gN8tRrYfJWSJUdh+o4zwRkx0kMWNCes2fuDdc7M ANaod76clnGMYmLZgVlrW75xUJEtM/XkOcP7a+6S2U9eo8oBDoRwSav9XmDxehwT93/H Shv3Pz//ZKSPZENypmcyFbD9sNf4gC3HEhY+Eotuv66EL532mScT3fVzRCEKCq6QqfHS ZXyuzVnnqAzMdZV4JiNeQanxiQDhWwMLdno30vIoLDFjnGM18H3DXy1D6Fzf6vb4XgTd LV8A== 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=xETLZAwStJiPTA1iTveb1EK9m8PyaZc484o5SN7kXzM=; b=T0+hHlkVxwki0PoZ26rpHWrnGo1F7WRNZXB7paQpJjqr4Iwvr/6ipZoMUbz6jg7lGB MK955uU8Rypy6UWuWvGsMWVhXkB/kUcmsoyvM5oqj+aGmutLNkh4EBf/aeFCojUa6tam i5CDgC2TgtD/nS8ZdYg+Fsz4GAehDJngqxLwoqe9xnLweb40x4z3oQtWrHN2D9LZGgPh FKmMloF7v2A/Wa4YWRmYHoZCh/smIFw/BBLjjjG+Yv6zAIOU4IVVqEIqK36eYL90coSg M0rxOF4lEi0QQDAdr9v4LplHpfZAlOyBlSsBKQeUkBnOvQ2N6odBJS2GobZ5Nni0gGwI wa7w== X-Gm-Message-State: APjAAAVlptHM0+cGL20z3ezqrv+VxzkCUQJG/KfAXXRlezYgehMaCkRU aLgQ1qA7/kuVu/SacHLwBm0wswt3pmg= X-Received: by 2002:a7b:cd97:: with SMTP id y23mr101486wmj.74.1567629015796; Wed, 04 Sep 2019 13:30:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u68sm251105wmu.12.2019.09.04.13.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6E63A1FF8C; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:32 +0100 Message-Id: <20190904203013.9028-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 01/42] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit 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@euphon.net, Thomas Huth , berrange@redhat.com, stefanb@linux.vnet.ibm.com, richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Most of the code in hw/misc/ does not directly depend on CPU-specific code. Mark it as "common" so that the code can be shared between e.g. qemu-system-arm and qemu-system-aarch64, or between the various mips flavours, instead of recompiling it for each and every target again and again. Signed-off-by: Thomas Huth Message-Id: <20190902162638.28142-1-thuth@redhat.com> --- hw/misc/Makefile.objs | 90 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) -- 2.20.1 diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index e4aad707fb4..a1506809660 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -26,57 +26,57 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o common-obj-$(CONFIG_MACIO) += macio/ -obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o +common-obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o -obj-$(CONFIG_REALVIEW) += arm_sysctl.o -obj-$(CONFIG_NSERIES) += cbus.o -obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o -obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o exynos4210_rng.o -obj-$(CONFIG_IMX) += imx_ccm.o -obj-$(CONFIG_IMX) += imx31_ccm.o -obj-$(CONFIG_IMX) += imx25_ccm.o -obj-$(CONFIG_IMX) += imx6_ccm.o -obj-$(CONFIG_IMX) += imx6ul_ccm.o +common-obj-$(CONFIG_REALVIEW) += arm_sysctl.o +common-obj-$(CONFIG_NSERIES) += cbus.o +common-obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o +common-obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o exynos4210_rng.o +common-obj-$(CONFIG_IMX) += imx_ccm.o +common-obj-$(CONFIG_IMX) += imx31_ccm.o +common-obj-$(CONFIG_IMX) += imx25_ccm.o +common-obj-$(CONFIG_IMX) += imx6_ccm.o +common-obj-$(CONFIG_IMX) += imx6ul_ccm.o obj-$(CONFIG_IMX) += imx6_src.o -obj-$(CONFIG_IMX) += imx7_ccm.o -obj-$(CONFIG_IMX) += imx2_wdt.o -obj-$(CONFIG_IMX) += imx7_snvs.o -obj-$(CONFIG_IMX) += imx7_gpr.o -obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o -obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o -obj-$(CONFIG_MAINSTONE) += mst_fpga.o -obj-$(CONFIG_OMAP) += omap_clk.o -obj-$(CONFIG_OMAP) += omap_gpmc.o -obj-$(CONFIG_OMAP) += omap_l4.o -obj-$(CONFIG_OMAP) += omap_sdrc.o -obj-$(CONFIG_OMAP) += omap_tap.o -obj-$(CONFIG_RASPI) += bcm2835_mbox.o -obj-$(CONFIG_RASPI) += bcm2835_property.o -obj-$(CONFIG_RASPI) += bcm2835_rng.o -obj-$(CONFIG_SLAVIO) += slavio_misc.o -obj-$(CONFIG_ZYNQ) += zynq_slcr.o -obj-$(CONFIG_ZYNQ) += zynq-xadc.o -obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o +common-obj-$(CONFIG_IMX) += imx7_ccm.o +common-obj-$(CONFIG_IMX) += imx2_wdt.o +common-obj-$(CONFIG_IMX) += imx7_snvs.o +common-obj-$(CONFIG_IMX) += imx7_gpr.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o +common-obj-$(CONFIG_MAINSTONE) += mst_fpga.o +common-obj-$(CONFIG_OMAP) += omap_clk.o +common-obj-$(CONFIG_OMAP) += omap_gpmc.o +common-obj-$(CONFIG_OMAP) += omap_l4.o +common-obj-$(CONFIG_OMAP) += omap_sdrc.o +common-obj-$(CONFIG_OMAP) += omap_tap.o +common-obj-$(CONFIG_RASPI) += bcm2835_mbox.o +common-obj-$(CONFIG_RASPI) += bcm2835_property.o +common-obj-$(CONFIG_RASPI) += bcm2835_rng.o +common-obj-$(CONFIG_SLAVIO) += slavio_misc.o +common-obj-$(CONFIG_ZYNQ) += zynq_slcr.o +common-obj-$(CONFIG_ZYNQ) += zynq-xadc.o +common-obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o obj-$(CONFIG_MIPS_CPS) += mips_cpc.o obj-$(CONFIG_MIPS_ITU) += mips_itu.o -obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o -obj-$(CONFIG_MPS2_SCC) += mps2-scc.o +common-obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o +common-obj-$(CONFIG_MPS2_SCC) += mps2-scc.o -obj-$(CONFIG_TZ_MPC) += tz-mpc.o -obj-$(CONFIG_TZ_MSC) += tz-msc.o -obj-$(CONFIG_TZ_PPC) += tz-ppc.o -obj-$(CONFIG_IOTKIT_SECCTL) += iotkit-secctl.o +common-obj-$(CONFIG_TZ_MPC) += tz-mpc.o +common-obj-$(CONFIG_TZ_MSC) += tz-msc.o +common-obj-$(CONFIG_TZ_PPC) += tz-ppc.o +common-obj-$(CONFIG_IOTKIT_SECCTL) += iotkit-secctl.o obj-$(CONFIG_IOTKIT_SYSCTL) += iotkit-sysctl.o -obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o -obj-$(CONFIG_ARMSSE_CPUID) += armsse-cpuid.o -obj-$(CONFIG_ARMSSE_MHU) += armsse-mhu.o +common-obj-$(CONFIG_IOTKIT_SYSINFO) += iotkit-sysinfo.o +common-obj-$(CONFIG_ARMSSE_CPUID) += armsse-cpuid.o +common-obj-$(CONFIG_ARMSSE_MHU) += armsse-mhu.o -obj-$(CONFIG_PVPANIC) += pvpanic.o -obj-$(CONFIG_AUX) += auxbus.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_xdma.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o -obj-$(CONFIG_MSF2) += msf2-sysreg.o -obj-$(CONFIG_NRF51_SOC) += nrf51_rng.o +common-obj-$(CONFIG_PVPANIC) += pvpanic.o +common-obj-$(CONFIG_AUX) += auxbus.o +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_xdma.o +common-obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o aspeed_sdmc.o +common-obj-$(CONFIG_MSF2) += msf2-sysreg.o +common-obj-$(CONFIG_NRF51_SOC) += nrf51_rng.o -obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o +common-obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o From patchwork Wed Sep 4 20:29:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173028 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp414837ilq; Wed, 4 Sep 2019 13:39:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqx0WvdOXhitvZcMgksbLNF/+ojgFmIQlaG45Kka2/YiZS3FMZaxuZHp6eVSe1+32Ywjqb5/ X-Received: by 2002:a37:8ec7:: with SMTP id q190mr40385672qkd.157.1567629567511; Wed, 04 Sep 2019 13:39:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629567; cv=none; d=google.com; s=arc-20160816; b=iRP64nc/HHskwCUbMErTXGhuqmcFZMoYNULdMgFo8/hkGySgw8VMBlL/1NzbXcVxXw HOLr3CvAEzwfeoLmX1iJog9XUGwMZjmK0idODlI/pZ4F/su5h+DfjxK5Afz+aIaiNc1S e8MtLDG4JRIIYe6tyKd92Gl848B+nhtnns7MCMG0ljvPAmdLV6iNolcKcSE5X7FmS+mB 0pE6kLfHX71Cl+TKaZ+XcKm/TdHkNC0Tg/LzEkM2hTyymrsCsD0fjx/5mVRC1+LHyC9R /NdFO2tglH+ZThX6AZoN7RgmNdXaoVqdpvSDyJDnY72Ko0bzTBlw3nuznjJMZNEex8z4 r5lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=u58ehgz0JBotdrn+M2L4E07UYdb8cr8TNaqjNzHqhZQemh4ATb3L1jMzCnf5rzWI9t 851BH4mwwW6yN8+e8DmmyCV/mVfiwAkw0CTupFp8/BSyWNHwBbL7bujafHNw5NF2tAPX s6OocgvB6/OkNS7ibxGMQIikZbTUX8uCH7nUyA18ZNW7BbI1WsDk0qlu+uQmGz8ALPgi odzpEC6lfocvlOAzK6SPVdm1QM/WiI0MVtQcA1M8MjmrSGUBHv0/IknzwFtHnKiPoaZ0 bFkTKdN7td8QqWai6dK+51m20GaRKn5W0lKaOTrc0oR9h55DQPjTWp+AwhjygoIv7547 bhpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PHKa70Go; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c8si17358qve.209.2019.09.04.13.39.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:39:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PHKa70Go; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3q-0000OI-Dk for patch@linaro.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bv7-00087P-Dq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv3-0006WD-5N for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:24 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv0-0006Tq-Bq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:19 -0400 Received: by mail-wm1-x32a.google.com with SMTP id p13so219948wmh.1 for ; Wed, 04 Sep 2019 13:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=PHKa70GoOt1ksj6K7Pm57YYEZXh2NY+KMfCeGOCxUuEC1KsBWhso8V3imC1lo5/it2 3L0IPQiDaTjjo6ommUF5i40l+Y5+cAw8WUzDK4MCpGDq+h4v616oy/uaOmi7rJLuovVz y8TET4QanafUn7EpUAknlA2/noDqzuQJj4pSHC8ZRFZnKHnSnBUWp0H49NYNnXXNkJYj ReUyo/FZfNBe/vMl3omHAcRTsM2edX/P1l49B67UMQ7PeaekBG097Z8ZmC17fGpBtLg1 6dO7tWMCNdYKWbkU2AyAxbMPwc8LZIYSEUzhcvxJI5vzP5bWFO9snYUvssh/fj7BzVAk c9hA== 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=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=B+QqNN58y53RKv/EVhuu80e6x++XEaKOzHXtdlVkT+MPzslNOUAaHIjko/xy3V34OJ 0GJyrlxYa+UI9vjOh1BP5Wb24yVj8YxmnGIScYK+rMo+7JQDoDVIhTKhruzhpUiVKURX J7JH4zf9uZRAVwmW/ph2SYRUrdpHFENpH4Uwg1QYSAaKsLCsrux2ZMgkCuxDE9Ct0Q09 K97pfhWNwdu25F/jZ/4gJ/onSUL2kcQIIKudCd4bedHu+Gp+cvrRr4TBEQfbyaEW6Jm0 26b8UYUnxo3c0kItNcxxv++9q/jfL6rz9JEH+gxkK6FWV0mapY1CgzScxrxdi2C5dvlF 3ENg== X-Gm-Message-State: APjAAAUehuQxrmekPMm2nVUOzzx7jF8ogk2zFlgPzyXxogz5DW02XA2S HJSKi+nxI/ziK0EfqCEzZC5ZGw== X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr82931wme.105.1567629015091; Wed, 04 Sep 2019 13:30:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j1sm16570133wrg.24.2019.09.04.13.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8408C1FF8F; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:33 +0100 Message-Id: <20190904203013.9028-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PATCH v1 02/42] configure: clean-up container cross compile detect 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The introduction of podman support inadvertently broke configure's detect of the container support as the configure probe didn't specify an engine type. To fix this in docker.py: - only (re)set USE_ENGINE if --engine is specified - enhance the output so docker is no longer just yes In the configure script we can at least start cleaning up the detecting and naming of variables. To avoid too much churn the conversion of the various make DOCKER_foo variables has been left for future clean-ups. Signed-off-by: Alex Bennée --- configure | 10 +++++----- tests/docker/docker.py | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) -- 2.20.1 Tested-by: David Hildenbrand diff --git a/configure b/configure index 95134c0180b..94845fc5101 100755 --- a/configure +++ b/configure @@ -495,7 +495,7 @@ qed="yes" parallels="yes" sheepdog="yes" libxml2="" -docker="no" +container="no" debug_mutex="no" libpmem="" default_devices="yes" @@ -5894,14 +5894,14 @@ EOF fi ########################################## -# Docker and cross-compiler support +# Container based cross-compiler support # # This is specifically for building test # cases for foreign architectures, not # cross-compiling QEMU itself. -if has "docker"; then - docker=$($python $source_path/tests/docker/docker.py probe) +if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) fi ########################################## @@ -6474,7 +6474,7 @@ echo "qed support $qed" echo "parallels support $parallels" echo "sheepdog support $sheepdog" echo "capstone $capstone" -echo "docker $docker" +echo "container support $container" echo "libpmem support $libpmem" echo "libudev $libudev" echo "default devices $default_devices" diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4bba29e104e..e23209f71ee 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -536,9 +536,9 @@ class ProbeCommand(SubCommand): try: docker = Docker() if docker._command[0] == "docker": - print("yes") + print("docker") elif docker._command[0] == "sudo": - print("sudo") + print("sudo docker") elif docker._command[0] == "podman": print("podman") except Exception: @@ -651,7 +651,8 @@ def main(): cmd.args(subp) subp.set_defaults(cmdobj=cmd) args, argv = parser.parse_known_args() - USE_ENGINE = args.engine + if args.engine: + USE_ENGINE = args.engine return args.cmdobj.run(args, argv) From patchwork Wed Sep 4 20:29:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173033 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp419874ilq; Wed, 4 Sep 2019 13:45:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtueWyta4yE4/aToYfPCtF4oB1BEHsbK1sxMz1alSewcXZf1p2KkA6KETqmBae1j9KObCj X-Received: by 2002:a0c:afa1:: with SMTP id s30mr9937299qvc.23.1567629915168; Wed, 04 Sep 2019 13:45:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629915; cv=none; d=google.com; s=arc-20160816; b=YuXODM9YUSVZ7A2Ef7oRHfjMfgD8+0g/coVZiJap3yk7g9jhoj1aj33T9ToW9YoHye LATaK06oioReTzS0OgRm/MwJbg7CSvEgJe3BuEywN8dEQOU8QBeN8cJdS/ssEFRisW8m 1MHl7HWhNE+DEBKMP9hdLqTm0CA2dHD0DxIe3oJtKf5LDgpANKQP5PipVLlrnsAm4vQ2 qJ+WiS0E7vjG4hAwGVJ6/3/u3garFQ6Wldnyd2NFjo9uAOQbIdtmD4FwhX/+id0jkzLp yQIApCg/X0QyImVlpBsDnDOAeoAKxFZN+nx8S9IfIm4XLV4WXpuKU6uRXQ0aXSrmVOWM yfcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=yYE0JvmioF/SVJQvbt4Vg7Xaut4G5ofPLByE28uKiMg=; b=j/afcuAvpwEusU/ijUTmfjB7uQtpuoOqput7AuOxZLCRFb25Qsz3/0nUexPQTKI8Ul 8bTI/CFbM/PhAr4kfOiatzZmvHkIsn8xgncXvwY1geQw5jGeXYcWUV/OidJLJ/btDuL2 AKUmUUwgkHmH4JUh5V9hhmGB9R0p9cxS0oiEoJI/7TLCkWgbv+kueyrHjYtgru39kmoa Ejg7lUO2dqM6kgbKvFbXPCQAeINgWdthhUSG3IlJYLzhzJvwYThA2KLHsc99s2YSrYZe QB/bC4mQpj9dhLfcaYvnyd88CIiktCjTWu4AN7T0eWOXzh8aqPiY+IkLuclC3CIEQG/B hVbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zsdavo1p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p184si102641qkd.119.2019.09.04.13.45.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:45:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zsdavo1p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c9R-0005RW-QO for patch@linaro.org; Wed, 04 Sep 2019 16:45:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49735) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvA-00088U-GW for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv7-0006cV-Mn for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:28 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006Uz-9M for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:25 -0400 Received: by mail-wr1-x434.google.com with SMTP id j16so172866wrr.8 for ; Wed, 04 Sep 2019 13:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yYE0JvmioF/SVJQvbt4Vg7Xaut4G5ofPLByE28uKiMg=; b=Zsdavo1pSxDtO+V87pEQHBL1uCkXkXPP1Sz8C2qM6aXk7Hj7ZwdgBEjFK02nNGNmi8 8UbYRtsCt539rtsgVBPpHpUDonpKYzOxF+BPaSn/s5ES2SUKkJU6BLstV9ERHo1drR6u O7KeRZyw3IlyI2UyzvK8fB+AgLX+JCjO3mL5Jj29+4s/JoHCuM5G2BsV1/743g1Q0Bsi qWMBdKTEhImqy4Gbiny3Z2iMYAz+bQzvObhwMaD+0GLPxcSzgrrcYBUyH4i/gwxFPMEr MaziW9g85Ja3WpJdXv31Fef3vYDATnfsGhslScaRaJPaV59l/3kj49fhhtmjX14vQrFw xyEQ== 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=yYE0JvmioF/SVJQvbt4Vg7Xaut4G5ofPLByE28uKiMg=; b=PrpX3gmtayyNpznIhJuMlDXwUbpG3Ql+Wzn4ioW7l6YQ0AqfpHet2qmEsXLt8sZjGC zXL+VtcDx0+zlY16pnKvcf9dkAauiB2/HqkSacyXEzQoBzFMNGWPP04zlK1qTgZEGC1T rYR9RQkItNdLGbhEiLa+VR0AD11TzuaUWWeUnTfwjNtxgW/zLlgJcRpN/o2GYg+o6Qqz 25pF5ocfcuMnzFf0sISeM9waTFGAEsiZq/UBx7pReDl/qiXAvp6qHdF3kBOMsIud2Iza KGpp/QUcErSghxEGGjzSqWWoaEsjBJV1qGkeMbosFkJVA94wB9jX2wNMP5FnlcXxwEE2 z4vw== X-Gm-Message-State: APjAAAXIVRrlwTKJRAWXWmhQUmxutlj62szlo4myCBxzEPZO4NvKJTAk ZXDOKdtQEnxr4LXAN/L6Q5MTQg== X-Received: by 2002:a5d:6911:: with SMTP id t17mr49479318wru.255.1567629017296; Wed, 04 Sep 2019 13:30:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm4891101wrg.65.2019.09.04.13.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9A9C81FF90; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:34 +0100 Message-Id: <20190904203013.9028-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH v1 03/42] tests/docker: fix "cc" command to work with podman 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Podman requires a little bit of additional magic to the uid mapping which was already done for the normal RunCommand. We simplify the logic by pushing it directly into the Docker::run method to avoid instantiating an extra Docker() object and ensure the CC command always runs as the current user. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 30 +++++++++++++++--------------- tests/tcg/Makefile.include | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e23209f71ee..8f391eb278b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -318,10 +318,20 @@ class Docker(object): return False return checksum == _text_checksum(_dockerfile_preprocess(dockerfile)) - def run(self, cmd, keep, quiet): + def run(self, cmd, keep, quiet, as_user=False): label = uuid.uuid1().hex if not keep: self._instances.append(label) + + if as_user: + uid = os.getuid() + cmd = [ "-u", str(uid) ] + cmd + # podman requires a bit more fiddling + if self._command[0] == "podman": + cmd = [ "--uidmap", "%d:0:1" % uid, + "--uidmap", "0:1:%d" % uid, + "--uidmap", "%d:%d:64536" % (uid + 1, uid + 1)] + cmd + ret = self._do_check(["run", "--label", "com.qemu.instance.uuid=" + label] + cmd, quiet=quiet) @@ -364,15 +374,8 @@ class RunCommand(SubCommand): help="Run container using the current user's uid") def run(self, args, argv): - if args.run_as_current_user: - uid = os.getuid() - argv = [ "-u", str(uid) ] + argv - docker = Docker() - if docker._command[0] == "podman": - argv = [ "--uidmap", "%d:0:1" % uid, - "--uidmap", "0:1:%d" % uid, - "--uidmap", "%d:%d:64536" % (uid + 1, uid + 1)] + argv - return Docker().run(argv, args.keep, quiet=args.quiet) + return Docker().run(argv, args.keep, quiet=args.quiet, + as_user=args.run_as_current_user) class BuildCommand(SubCommand): @@ -556,8 +559,6 @@ class CcCommand(SubCommand): help="The docker image in which to run cc") parser.add_argument("--cc", default="cc", help="The compiler executable to call") - parser.add_argument("--user", - help="The user-id to run under") parser.add_argument("--source-path", "-s", nargs="*", dest="paths", help="""Extra paths to (ro) mount into container for reading sources""") @@ -571,11 +572,10 @@ class CcCommand(SubCommand): if args.paths: for p in args.paths: cmd += ["-v", "%s:%s:ro,z" % (p, p)] - if args.user: - cmd += ["-u", args.user] cmd += [args.image, args.cc] cmd += argv - return Docker().command("run", cmd, args.quiet) + return Docker().run(cmd, False, quiet=args.quiet, + as_user=True) class CheckCommand(SubCommand): diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 73b5626fc5f..210f8428237 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -41,7 +41,7 @@ ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on include $(SRC_PATH)/tests/docker/Makefile.include -DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ +DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " From patchwork Wed Sep 4 20:29:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173040 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp428021ilq; Wed, 4 Sep 2019 13:55:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmMGvK8UWPXnagKpIWFSErCuVcv5iyKIu3v+ufTYM2EqvIpYIvKnlC8EAAqmZH5TDBMAbT X-Received: by 2002:a17:906:5915:: with SMTP id h21mr43054ejq.28.1567630517579; Wed, 04 Sep 2019 13:55:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630517; cv=none; d=google.com; s=arc-20160816; b=m3Q7QM+ZCiCmm0qbf0IJ2/dqfeC0YosLCZ850B/SqHb/wwvhABs3PwwEKYy6dx17Gv YJ9HFGoHKh96IA8B6eQbYPkA/I4LU46guTYGxTTIXcj9f24J17M3fv/G+DwY0ukpCgZC aTtEzDVx7cXsyNNXwDI4LvoOl7l3M1AgP4EB96Gu0UPsdb3U4zKEe8f+hplTMFtY1hGi ZB8EIY0wuGCMZGYFRMZDoFzKLZZyEowm9eygi5q4zdkVtv8X+xfiH0VM1p5JWQkCsOYy f4ngJN8lx1dsCYBNFwAYOCdhmYzLXKRJwWohzXGUFK8GRL0CFZSI+4ws/YewJpKNnOeG LJ2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HEMOxdR8sWTXFxNsuCTbT1Ih44COKmCRkMbmTbJ7YXE=; b=sRNlAt2zLeq99EE5WddBsMVKKwbMQ5AN3hmiiKRNY+tpxEYLUUMaiCwTXeClwKQFJ4 p4Xkf3PQXchoh0QX9iRH1Czt0ahApMA28W3QYWTMjA69yCyCJDHzUw4nUuX6c9r0UmnT ukBNVgDYYYIY0HA3RRBXOlmtPI/KQXl+sN8ZFuTUa+Kacy9dz64P/wmpv0RAydfpKYOX eKXlT6RZNigKUVjp80JtCOaCkrsinvzQ805go2gvxEEk3fPygyCi/h/5jEF5bEx5eZX9 UVP/QDWKtCCmE6Cdw7dHn2EkjATtR0/8JW2bFEX9NOrfxiQ4lXjld/m7GN9N5+/XEkpO jNrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FhUaeGM7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k55si2413076edd.179.2019.09.04.13.55.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:55:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FhUaeGM7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cJ9-0006e0-Py for patch@linaro.org; Wed, 04 Sep 2019 16:55:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49739) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvA-00088V-Kh for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv7-0006cM-GM for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:28 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50207) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006VL-7f for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id c10so210720wmc.0 for ; Wed, 04 Sep 2019 13:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HEMOxdR8sWTXFxNsuCTbT1Ih44COKmCRkMbmTbJ7YXE=; b=FhUaeGM70uKRCvJLf4PhrNgTkqs2nipOly7UYdwyjkAKeuzv86wo5aGXjXzwzPz/tR xF/9BHsi3cPDex9iQKN1b6ZVdlQcld2eNoY3nd7sTE6xfdoKzmvjGbW8uD2WJuG44UyN tPkPtDWo0/FKfOZonEiyCCtZ27GeWi6fknWvzFumkM7ZZRgZjNrQD9q6vjTeBhkNcClr wVrpPdOlzMjm0O1rE09ShrqvW/ntbIEZZ57mNqYTokjbGSsuzBOpY5JzWKQ4O0BN7jEe 85xijmYf7JYJV+XBcbtkNR3f+PeTyY9Pu5ZHt0kGZsolb81D9KPzGq8oXOHR2pJuyCRb BLZg== 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=HEMOxdR8sWTXFxNsuCTbT1Ih44COKmCRkMbmTbJ7YXE=; b=nVxKYRiQZNFrKLdE9OxggX0V0sfZtyTUb7a46y3SkGdC8GEe+P0s+gN0q8Nlbjsn5J E29Gu/inMyGYfmMusU+xDd3HRtfhyS6Jx70mEJ984rMjia+XOBAfyQOYcqUmeZinGQEj kI4EOe5TeQtGXncFe0xX9U3Se4w5rcvPNmQA5m0MZqG27loBUzVa+gYDmm1zp+XNn+FW GnDgtE3F25ISDUDW1a5WqMHJwEvQCVNDv5jOSlIOyn6yQDNnRn/DJt90ikNjjSLWlo2f +CPR3hV3sWGpTosG5NKYbPhqjiCGqPluf3waXP2BrYdzWk0v+EE6O0HUIV27+mCMjRqS trHA== X-Gm-Message-State: APjAAAV2D1GHshwN8caTBOaDDAVslgHB5ERXLGOkpmJQx7Exc3qo4Mgw bQ00z0bB1hjcZ90fqxS0y30M1Q== X-Received: by 2002:a7b:cc94:: with SMTP id p20mr69074wma.171.1567629017945; Wed, 04 Sep 2019 13:30:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 74sm165778wma.15.2019.09.04.13.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B799D1FF91; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:35 +0100 Message-Id: <20190904203013.9028-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere 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@euphon.net, Peter Maydell , berrange@redhat.com, Eduardo Habkost , stefanb@linux.vnet.ibm.com, richard.henderson@linaro.org, f4bug@amsat.org, Max Filippov , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, "open list:ARM TCG CPUs" , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini For i386 specifically, this allows using the host GCC to compile the i386 tests. But, it should really be done for all targets, unless we want to pass $(EXTRA_CFLAGS) directly as part of $(CC). Signed-off-by: Paolo Bonzini Message-Id: <20190807143523.15917-2-pbonzini@redhat.com> --- tests/tcg/aarch64/Makefile.softmmu-target | 4 ++-- tests/tcg/alpha/Makefile.softmmu-target | 4 ++-- tests/tcg/arm/Makefile.softmmu-target | 2 +- tests/tcg/i386/Makefile.softmmu-target | 4 ++-- tests/tcg/minilib/Makefile.target | 2 +- tests/tcg/xtensa/Makefile.softmmu-target | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index 2e560e4d08e..4c4aaf61dd3 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=1 diff --git a/tests/tcg/alpha/Makefile.softmmu-target b/tests/tcg/alpha/Makefile.softmmu-target index 3c0f34cc692..09193a62d68 100644 --- a/tests/tcg/alpha/Makefile.softmmu-target +++ b/tests/tcg/alpha/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=0 diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target index 49d48d8a1c3..2deb06e6e46 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -18,7 +18,7 @@ CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp LDFLAGS+=-nostdlib -N -static %: %.S %.ld - $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld + $(CC) $(CFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld # Specific Test Rules diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index 0a4364868ce..cee342017e5 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -32,11 +32,11 @@ TESTS+=$(MULTIARCH_TESTS) .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=1 diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile.target index 3ed8077d0f9..c821d2806a9 100644 --- a/tests/tcg/minilib/Makefile.target +++ b/tests/tcg/minilib/Makefile.target @@ -18,4 +18,4 @@ MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC) .PRECIOUS: $(MINILIB_OBJS) %.o: $(SYSTEM_MINILIB_SRC)/%.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target index 8212d96b81d..9530cac2ad9 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -34,9 +34,9 @@ $(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target # special rule for common blobs %.o: %.S - $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@ + $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ %: %.S - $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + $(CC) $(XTENSA_INC) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) endif From patchwork Wed Sep 4 20:29:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173053 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp439580ilq; Wed, 4 Sep 2019 14:07:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbr2IORWiikAS1Wr1grW/1mykc75pAP5jphgTVQOgKD9dBGUURyZizCO2cufiaYk/a3Vvt X-Received: by 2002:ae9:ef44:: with SMTP id d65mr37658345qkg.241.1567631228306; Wed, 04 Sep 2019 14:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631228; cv=none; d=google.com; s=arc-20160816; b=WziPtZv7okChKCyhEU2LKmCsEAJvI/iedqskOC9Fkr76EITRR85XtHm3MaJcz8UfBc uVo/a1CMZf7XFgPrtffACzumsrhNMYrFDpDNt21E+jtn0r04dJ/Ov1q6WP7kb50vsMrP OWkJTdoio4aeI3gc2KBjKCspMCFYTMr7KnLwfxsCRsTyseOMDSd7EiwZJql5kFhKzaPZ JJb2UhxVc6DOFmahfsXmvMRsAYi5gNVFJcmUqtPEujOHrwHD8fjNOQ+G+t8k0OU2lI92 g8mrZ95MKyk+prIQ4eQwVADVEuAv9f7Knf8+4N/tX4/vhMAZE0IdcpFNAjnIG2oMchtG YPDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=uo3CQprxe8q4X3ZzYJLMBNWCw2qLX31vStWZ3+3dlw55Yk6E41DNAcq1GnUajGan8N PYCIIBjIIJqN9f9/FRJAWaSjqX9poP0NlGM9rYS3pCZA2709vwKm8fH7D4JCJ6x/octp i4cY4asxfsVdAMfqXPN4v+G21FIAwW/C+C2Vpma/UdvzQ6XsOj9GzqAuOL42p0FfcQQ4 A0Ud1K9A1l9crbQdqBYK94OgixbE3FsSjus5k3o9dvKmICutKgLJJ00xOyU/1W6RxxMf YwRbCcWkGQ9xyNBg98lv94LMUB9frwzk/TuJNSsm7J24b1OY/R1GGWopjRIYvPykwVVm +vTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OVP3wva9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p57si10556960qtj.251.2019.09.04.14.07.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:07:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OVP3wva9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cUd-0002Xb-3z for patch@linaro.org; Wed, 04 Sep 2019 17:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008CD-RD for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006dr-EG for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006a6-JL for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t16so182509wra.6 for ; Wed, 04 Sep 2019 13:30:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=OVP3wva9bR2vV66E8RVzSY7NYpmJTsi6K1D3L7Mz09nk0M46aNd7L1KzRLv6et2n/x UF2s/S67ygCcrgYNqCP86t6Hf+Eyto/MNdvPmvy1Y+FH5gVl1DfmaRxs/GZJ0kBZaNLk 2K0TsHg121+aFmeD9Y7U6CKL39RB3DIKx653SfKMjQpm995NupcPOkw2t1N5Z1Epbrhl ypREV9M4rdlz/6TC4jUT9h9lRLcQdOvWTJVpz0jveflDDZBgE3xZHGuunegVRXGcSTWM zX1MRF7iW1IflGV2kzqAdzytShYwS7vlTdrP4csdXi8nyQn26LVpbgBcozk83VCL5jZq wxKg== 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=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=nGBumpclwSAYfqAT8sfzQD/Mx81MTgM23ppd1rDIXeii6waOv2ogRWmf47GZG2Wj+c 8BwNqJB1UDE1EIIr6nQddxZTclcxTN/0Xiyy0xci5BwGx1vfJVmLhbW/Cqy6bIIrj31X sZ5GsYmfI0MTfYf/UO37S050VwA6dVaoOp5q+oC0Sb/GN4nPWFrJJu3ebTUx55lD18Xo JK899LIa4axyq54GErLPXf7XptxoONtIyhK/UpuDZNxn9qVAh/MzhLf3xlBpiXvtDBhf lBOGgyo0HmxseHI0GEefuyBZ6CeyImWdRH9teFyGN1LDDy+Zu6YDYTXx97ta5Ut2alkR YsuQ== X-Gm-Message-State: APjAAAVkz6sYMAI/XCuU1t5TfUqb+IlYZd/JbFlcdHJBLUMAmUbxbckL +0o/Pvrl0bSpw/6sgxy3kg/elw== X-Received: by 2002:adf:e30e:: with SMTP id b14mr50437707wrj.168.1567629022880; Wed, 04 Sep 2019 13:30:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm39461709wrv.54.2019.09.04.13.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DC12F1FF92; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:36 +0100 Message-Id: <20190904203013.9028-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions 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@euphon.net, Peter Maydell , berrange@redhat.com, Eduardo Habkost , stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, "open list:ARM TCG CPUs" , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Rename Makefile.probe to Makefile.prereqs and make it actually define rules for the tests. Rename Makefile to Makefile.target, since it is not a toplevel makefile. Rename Makefile.include to Makefile.qemu and disentangle it from the QEMU Makefile.target, so that it is invoked recursively by tests/Makefile.include. Tests are now placed in tests/tcg/$(TARGET). Drop the usage of TARGET_BASE_ARCH, which is ignored by everything except x86_64 and aarch64. Fix x86 tests by using -cpu max and, while at it, standardize on QEMU_OPTS for aarch64 tests too. Signed-off-by: Paolo Bonzini Message-Id: <20190807143523.15917-3-pbonzini@redhat.com> --- Makefile.target | 3 -- tests/Makefile.include | 23 +++++---- .../tcg/{Makefile.probe => Makefile.prereqs} | 5 +- tests/tcg/{Makefile.include => Makefile.qemu} | 48 +++++++++++-------- tests/tcg/{Makefile => Makefile.target} | 13 ++--- tests/tcg/aarch64/Makefile.target | 12 +++-- tests/tcg/arm/Makefile.softmmu-target | 4 -- tests/tcg/i386/Makefile.softmmu-target | 8 ---- tests/tcg/i386/Makefile.target | 13 ++--- tests/tcg/x86_64/Makefile.softmmu-target | 36 ++++++++++++++ tests/tcg/x86_64/Makefile.target | 7 +-- 11 files changed, 100 insertions(+), 72 deletions(-) rename tests/tcg/{Makefile.probe => Makefile.prereqs} (92%) rename tests/tcg/{Makefile.include => Makefile.qemu} (52%) rename tests/tcg/{Makefile => Makefile.target} (92%) create mode 100644 tests/tcg/x86_64/Makefile.softmmu-target -- 2.20.1 diff --git a/Makefile.target b/Makefile.target index 933b27453a1..5e916230c43 100644 --- a/Makefile.target +++ b/Makefile.target @@ -39,9 +39,6 @@ endif PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= -# Makefile Tests -include $(SRC_PATH)/tests/tcg/Makefile.include - config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index f5ac09549ca..8400656b9d3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1062,23 +1062,28 @@ RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ - $(eval -include $(SRC_PATH)/tests/tcg/Makefile.probe) \ - $(if $(DOCKER_PREREQ), \ - $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ)))) + $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) endif build-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \ - SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" guest-tests, \ + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=$(SRC_PATH) \ + V="$(V)" TARGET_DIR="$*/" guest-tests, \ "BUILD", "TCG tests for $*") -run-tcg-tests-%: % build-tcg-tests-% - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" \ - SKIP_DOCKER_BUILD=1 TARGET_DIR="$*/" run-guest-tests, \ +run-tcg-tests-%: build-tcg-tests-% %/all + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=$(SRC_PATH) SPEED="$(SPEED)" \ + V="$(V)" TARGET_DIR="$*/" run-guest-tests, \ "RUN", "TCG tests for $*") clean-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" clean-guest-tests,) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=$(SRC_PATH) TARGET_DIR="$*/" clean-guest-tests, \ + "RUN", "TCG tests for $*") .PHONY: build-tcg build-tcg: $(BUILD_TCG_TARGET_RULES) diff --git a/tests/tcg/Makefile.probe b/tests/tcg/Makefile.prereqs similarity index 92% rename from tests/tcg/Makefile.probe rename to tests/tcg/Makefile.prereqs index 9dc654663d6..53b01962e1d 100644 --- a/tests/tcg/Makefile.probe +++ b/tests/tcg/Makefile.prereqs @@ -8,20 +8,19 @@ # each target. # First we need the target makefile which tells us the target architecture +CROSS_CC_GUEST:= -include $(BUILD_DIR)/$(PROBE_TARGET)/config-target.mak # Then we load up the target architecture makefiles which tell us # about the compilers -CROSS_CC_GUEST:= DOCKER_IMAGE:= -DOCKER_PREREQ:= -include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include ifndef CROSS_CC_GUEST ifneq ($(DOCKER_IMAGE),) -DOCKER_PREREQ:=docker-image-$(DOCKER_IMAGE) +build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) endif endif diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.qemu similarity index 52% rename from tests/tcg/Makefile.include rename to tests/tcg/Makefile.qemu index 210f8428237..7eff11d434e 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.qemu @@ -2,20 +2,23 @@ # # TCG tests (per-target rules) # -# This Makefile fragment is included from the per-target -# Makefile.target so will be invoked for each linux-user program we -# build. We have two options for compiling, either using a configured -# guest compiler or calling one of our docker images to do it for us. +# This Makefile fragment is included from the build-tcg target, once +# for each target we build. We have two options for compiling, either +# using a configured guest compiler or calling one of our docker images +# to do it for us. # # The per ARCH makefile, if it exists, holds extra information about # useful docker images or alternative compiler flags. --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include --include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include +include $(TARGET_DIR)config-target.mak +include $(SRC_PATH)/rules.mak +include $(wildcard \ + $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include \ + $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include) GUEST_BUILD= -TCG_MAKE=$(SRC_PATH)/tests/tcg/Makefile +TCG_MAKE=../Makefile.target # Support installed Cross Compilers ifdef CROSS_CC_GUEST @@ -23,9 +26,9 @@ ifdef CROSS_CC_GUEST .PHONY: cross-build-guest-tests cross-build-guest-tests: $(call quiet-command, \ - (mkdir -p tests && cd tests && \ - $(MAKE) -f $(TCG_MAKE) CC=$(CROSS_CC_GUEST) \ - BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \ + (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" CC="$(CROSS_CC_GUEST)" \ + SRC_PATH="$(SRC_PATH)" BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \ EXTRA_CFLAGS=$(CROSS_CC_GUEST_CFLAGS)), \ "BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)") @@ -39,20 +42,20 @@ ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y) ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on +SKIP_DOCKER_BUILD=1 include $(SRC_PATH)/tests/docker/Makefile.include DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " -DOCKER_PREREQ=docker-image-$(DOCKER_IMAGE) .PHONY: docker-build-guest-tests -docker-build-guest-tests: $(DOCKER_PREREQ) +docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(call quiet-command, \ - (mkdir -p tests && cd tests && \ - $(MAKE) -f $(TCG_MAKE) CC=$(DOCKER_COMPILE_CMD) \ - BUILD_STATIC=y \ + (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" CC=$(DOCKER_COMPILE_CMD) \ + SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \ EXTRA_CFLAGS=$(DOCKER_CROSS_COMPILER_CFLAGS)), \ "BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)") @@ -62,27 +65,32 @@ endif endif # Final targets +all: + @echo "Do not invoke this Makefile directly"; exit 1 + .PHONY: guest-tests ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) -run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TARGET_NAME) +run-guest-tests: guest-tests $(call quiet-command, \ - (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \ + (cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" \ + SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") else guest-tests: $(call quiet-command, /bin/true, "BUILD", \ - "$(TARGET_NAME) guest-tests SKIPPED") + "$(TARGET_DIR) guest-tests SKIPPED") run-guest-tests: $(call quiet-command, /bin/true, "RUN", \ - "tests for $(TARGET_NAME) SKIPPED") + "tests for $(TARGET_DIR) SKIPPED") endif # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: - rm -rf tests || echo "no $(TARGET_NAME) tests to remove" + rm -rf tests/tcg/$(TARGET_DIR) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile.target similarity index 92% rename from tests/tcg/Makefile rename to tests/tcg/Makefile.target index 9f567686240..8dbcba4474f 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile.target @@ -29,8 +29,9 @@ # We also expect to be in the tests build dir for the FOO-(linux-user|softmmu). # +all: -include ../../config-host.mak --include ../config-target.mak +-include ../../../$(TARGET_DIR)/config-target.mak # for including , in command strings COMMA := , @@ -64,9 +65,9 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY -QEMU=../qemu-$(TARGET_NAME) +QEMU=../../../$(TARGET_DIR)/qemu-$(TARGET_NAME) else -QEMU=../qemu-system-$(TARGET_NAME) +QEMU=../../../$(TARGET_DIR)/qemu-system-$(TARGET_NAME) endif QEMU_OPTS= @@ -82,10 +83,7 @@ ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch, base arch # and finally arch if it's not the same as base arch. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target -ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target -endif # Add the common build options CFLAGS+=-Wall -O0 -g -fno-strict-aliasing @@ -101,10 +99,7 @@ else # are expected to provide their own build recipes. -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target -ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target -endif endif diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 31ba9cfcaa1..e763dd9da37 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -2,12 +2,14 @@ # # AArch64 specific tweaks +ARM_SRC=$(SRC_PATH)/tests/tcg/arm +VPATH += $(ARM_SRC) + AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64 VPATH += $(AARCH64_SRC) -# we don't build any of the ARM tests -AARCH64_TESTS=$(filter-out $(ARM_TESTS), $(TESTS)) -AARCH64_TESTS+=fcvt +# we don't build any other ARM test +AARCH64_TESTS=fcvt fcvt: LDFLAGS+=-lm @@ -16,6 +18,6 @@ run-fcvt: fcvt $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) AARCH64_TESTS += pauth-1 pauth-2 -run-pauth-%: QEMU += -cpu max +run-pauth-%: QEMU_OPTS += -cpu max -TESTS:=$(AARCH64_TESTS) +TESTS += $(AARCH64_TESTS) diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target index 2deb06e6e46..231e9a57b48 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -3,8 +3,6 @@ # ARM SoftMMU tests - included from tests/tcg/Makefile # -ifeq ($(TARGET_ABI_DIR),arm) - ARM_SRC=$(SRC_PATH)/tests/tcg/arm # Set search path for all sources @@ -25,5 +23,3 @@ LDFLAGS+=-nostdlib -N -static test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel - -endif diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index cee342017e5..1c8790eecd2 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -12,17 +12,9 @@ X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system # These objects provide the basic boot code and helper functions for all tests CRT_OBJS=boot.o -ifeq ($(TARGET_X86_64), y) -CRT_PATH=$(X64_SYSTEM_SRC) -CFLAGS=-march=x86-64 -LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld -LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_x86_64 -else CRT_PATH=$(I386_SYSTEM_SRC) -CFLAGS+=-m32 LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 -endif CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index d0eb7023e52..08c5736a4d4 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -6,14 +6,11 @@ I386_SRC=$(SRC_PATH)/tests/tcg/i386 VPATH += $(I386_SRC) I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c)) -I386_TESTS=$(I386_SRCS:.c=) -I386_ONLY_TESTS=$(filter-out test-i386-ssse3, $(I386_TESTS)) +ALL_X86_TESTS=$(I386_SRCS:.c=) +I386_TESTS:=$(filter-out test-i386-ssse3, $(ALL_X86_TESTS)) +X86_64_TESTS:=$(filter test-i386-ssse3, $(ALL_X86_TESTS)) # Update TESTS -TESTS+=$(I386_ONLY_TESTS) - -ifneq ($(TARGET_NAME),x86_64) -CFLAGS+=-m32 -endif +TESTS=$(MULTIARCH_TESTS) $(I386_TESTS) # # hello-i386 is a barebones app @@ -26,7 +23,7 @@ hello-i386: LDFLAGS+=-nostdlib # test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ \ $( X-Patchwork-Id: 173046 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp432560ilq; Wed, 4 Sep 2019 14:00:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPdqIZe/qmgaml+CtCZQ5hqsR8SKdx80hLUf4wd/UAkN1Kemw3+pAewB7Y/1v9SvrXrcH1 X-Received: by 2002:a37:e409:: with SMTP id y9mr39032572qkf.423.1567630842130; Wed, 04 Sep 2019 14:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630842; cv=none; d=google.com; s=arc-20160816; b=Q+TdabQUmK0jUvklbbasQbHcK3C+HJSBmIKCNT8O7aj+CbE9/NoKW0S2PJ8mywvpb7 tomcl7qKDVS2dRNPCFbKr8C/qp6AJFvW4j8O/4weIyA0cqYyamVzhgG0OryoOmeQfxd+ aPWh7SFw1jZYc21eRMXTzYN0emadkCwCUjqeSdj4MuAVyhLCru2EPP6gr7YJPFMa98mv G7fJg3uzmfNHoUuyvJPOEFFP1C4MZI52obgE79p8NFfigvzm8AdmDtfRDcQXjJqLRCMj wKI2wEl9pHthf6ypC+caWn+yWkaUpnKgphTUR9Kg9NYWHEG25hrF52SZjOkw0ceQ6OOO K02Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=DowzcpHFxYQS1l03Cm9hViM/2yroo56W0ONqHBhViLQ=; b=iSalzoUc6XhrU6ABQoyZ9xz61ORt5FF+YkjFrBkOylUpV+lAz12gzF69qvhchP+zio 5qslvqqcgMomLM8mvjDMo1TaH49dU4PeVOuR4Zi+eG9r1pe58xDRjOfuLeen0UHsBoZ6 CiKJg2lF82vLgRCbGIBFTnKssUgJ93aBvrJ7Ads565cRUsz5Oa0IQyi9Bniotor9E5tD UbvokUdLHt1Ju+wUXq4ptQxd2AG4R2lGY/x5eVVCy6LXK49qS5350LCr/pO8JAZKDuOw iYS35HXvjvYT6wScVaMX/hcqxr6yscvMQy54IQclyOtjr/SqYAO7G8syknfisvXJBFTI hEhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eBFteteN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f19si7736588qte.226.2019.09.04.14.00.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:00:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eBFteteN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cOO-0005Fu-P4 for patch@linaro.org; Wed, 04 Sep 2019 17:00:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008CK-T9 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006dq-Ej for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006b0-Ib for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wm1-x342.google.com with SMTP id n10so224762wmj.0 for ; Wed, 04 Sep 2019 13:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DowzcpHFxYQS1l03Cm9hViM/2yroo56W0ONqHBhViLQ=; b=eBFteteNCsfTclxGSLUdxQb4usyz3xnxpoDXDWeH/Ilp1g+IkAYwEqeOf85xfCtkwx 0ljULBATtzBF5Qw1bkItogglmwpWQUkFs1Bv5xl0iwlGNIIZTUqMRhbA8X8f7aGn6Wep /oGbYqfe5sSN8fs/+2aepoaMEk/1RGnpPKX9xMJfrFgiBnnvHW3LgzlvZVTXL3+dtgx8 gRHYIRA30BW60ihlw0RlnRBr5z53c0yZUUmTTwMXe5D6zYyBc9b2JJ1FQQqoywXxS77y sa+NtBWSHQZoNnL/2YkpS0KK26GZTI7ONV1nERf4Obm3mo/QWHdQc90opypym4J604gj SoKw== 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=DowzcpHFxYQS1l03Cm9hViM/2yroo56W0ONqHBhViLQ=; b=ul7WWgnCxN6VcAll7xbI+sLDBR3RXkdZvEBw5FSf+HY6VBHMYz4DrPo3sND4GrFAY1 U8DUaXiFihDzhrcqwp5uCbkDuNge/GJn3NHmELL4ZoIK+S3Fe63h4D3hse8MnQ3VAuYq ighFkkjzLhGXz1EDfmaqxrDTqom9Yvdg7J30H0cmm1zBSNwo+aYBUp1wz3TsDc24riXX +wTvhyOWV+3Y76sm6YtUvAuLcuFfpjb1vbOh3nf4OLh+321ZYVNYJf7EGhIo867qCkMx LXyianrczk/uDiQX9qp54NIhPTLbNwY84EMSpLzPghbgFTM/fX3Obyg6dYEHHHtOxnp5 bZXA== X-Gm-Message-State: APjAAAXsz37n+JnRtsAsyUiUB2JgSQ8lDcCP+Fe1l5HrEBT/ECCDEeau xpCR7yIBkay8TP2NTH4gHMkO6Q== X-Received: by 2002:a7b:ce99:: with SMTP id q25mr67009wmj.163.1567629023659; Wed, 04 Sep 2019 13:30:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h17sm334093wme.6.2019.09.04.13.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 09E901FF93; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:37 +0100 Message-Id: <20190904203013.9028-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 06/42] tests/tcg: move configuration to a sub-shell script 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Avoid the repeated inclusions of config-target.mak, which have risks of namespace pollution, and instead build minimal configuration files in a configuration script. The same configuration files can also be included in Makefile and Makefile.qemu Signed-off-by: Paolo Bonzini Message-Id: <20190807143523.15917-4-pbonzini@redhat.com> [AJB: s/docker/container/, rm last bits from configure] Signed-off-by: Alex Bennée --- Makefile | 1 + configure | 157 ++----------------- tests/Makefile.include | 8 +- tests/tcg/Makefile.prereqs | 18 +-- tests/tcg/Makefile.qemu | 51 +++---- tests/tcg/Makefile.target | 8 +- tests/tcg/aarch64/Makefile.include | 8 - tests/tcg/alpha/Makefile.include | 2 - tests/tcg/arm/Makefile.include | 8 - tests/tcg/configure.sh | 234 +++++++++++++++++++++++++++++ tests/tcg/cris/Makefile.include | 6 - tests/tcg/hppa/Makefile.include | 2 - tests/tcg/i386/Makefile.include | 9 -- tests/tcg/m68k/Makefile.include | 2 - tests/tcg/mips/Makefile.include | 20 --- tests/tcg/ppc/Makefile.include | 10 -- tests/tcg/riscv/Makefile.include | 10 -- tests/tcg/s390x/Makefile.include | 2 - tests/tcg/sh4/Makefile.include | 4 - tests/tcg/sparc64/Makefile.include | 2 - tests/tcg/xtensa/Makefile.include | 11 -- 21 files changed, 282 insertions(+), 291 deletions(-) delete mode 100644 tests/tcg/aarch64/Makefile.include delete mode 100644 tests/tcg/alpha/Makefile.include delete mode 100644 tests/tcg/arm/Makefile.include create mode 100755 tests/tcg/configure.sh delete mode 100644 tests/tcg/cris/Makefile.include delete mode 100644 tests/tcg/hppa/Makefile.include delete mode 100644 tests/tcg/i386/Makefile.include delete mode 100644 tests/tcg/m68k/Makefile.include delete mode 100644 tests/tcg/mips/Makefile.include delete mode 100644 tests/tcg/ppc/Makefile.include delete mode 100644 tests/tcg/riscv/Makefile.include delete mode 100644 tests/tcg/s390x/Makefile.include delete mode 100644 tests/tcg/sh4/Makefile.include delete mode 100644 tests/tcg/sparc64/Makefile.include delete mode 100644 tests/tcg/xtensa/Makefile.include -- 2.20.1 diff --git a/Makefile b/Makefile index ae17a830678..b3528617e48 100644 --- a/Makefile +++ b/Makefile @@ -717,6 +717,7 @@ endef distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) rm -f po/*.mo tests/qemu-iotests/common.env diff --git a/configure b/configure index 94845fc5101..7860bbc3121 100755 --- a/configure +++ b/configure @@ -495,27 +495,10 @@ qed="yes" parallels="yes" sheepdog="yes" libxml2="" -container="no" debug_mutex="no" libpmem="" default_devices="yes" -# cross compilers defaults, can be overridden with --cross-cc-ARCH -cross_cc_aarch64="aarch64-linux-gnu-gcc" -cross_cc_aarch64_be="$cross_cc_aarch64" -cross_cc_cflags_aarch64_be="-mbig-endian" -cross_cc_arm="arm-linux-gnueabihf-gcc" -cross_cc_cflags_armeb="-mbig-endian" -cross_cc_i386="i386-pc-linux-gnu-gcc" -cross_cc_cflags_i386="" -cross_cc_ppc="powerpc-linux-gnu-gcc" -cross_cc_cflags_ppc="-m32" -cross_cc_ppc64="powerpc-linux-gnu-gcc" -cross_cc_cflags_ppc64="-m64" -cross_cc_ppc64le="powerpc64le-linux-gnu-gcc" - -enabled_cross_compilers="" - supported_cpu="no" supported_os="no" bogus_os="no" @@ -548,9 +531,12 @@ for opt do ;; --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-flags-}; cc_arch=${cc_arch%%=*} eval "cross_cc_cflags_${cc_arch}=\$optarg" + cross_cc_vars="$cross_cc_vars cross_cc_cflags_${cc_arch}" ;; --cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*} + cc_archs="$cc_archs $cc_arch" eval "cross_cc_${cc_arch}=\$optarg" + cross_cc_vars="$cross_cc_vars cross_cc_${cc_arch}" ;; esac done @@ -745,42 +731,34 @@ ARCH= case "$cpu" in ppc|ppc64|s390|s390x|sparc64|x32|riscv32|riscv64) supported_cpu="yes" - eval "cross_cc_${cpu}=\$host_cc" ;; ppc64le) ARCH="ppc64" supported_cpu="yes" - cross_cc_ppc64le=$host_cc ;; i386|i486|i586|i686|i86pc|BePC) cpu="i386" supported_cpu="yes" - cross_cc_i386=$host_cc ;; x86_64|amd64) cpu="x86_64" supported_cpu="yes" - cross_cc_x86_64=$host_cc ;; armv*b|armv*l|arm) cpu="arm" supported_cpu="yes" - cross_cc_arm=$host_cc ;; aarch64) cpu="aarch64" supported_cpu="yes" - cross_cc_aarch64=$host_cc ;; mips*) cpu="mips" supported_cpu="yes" - cross_cc_mips=$host_cc ;; sparc|sun4[cdmuv]) cpu="sparc" supported_cpu="yes" - cross_cc_sparc=$host_cc ;; *) # This will result in either an error or falling back to TCI later @@ -1555,44 +1533,30 @@ case "$cpu" in ppc) CPU_CFLAGS="-m32" LDFLAGS="-m32 $LDFLAGS" - cross_cc_ppc=$cc - cross_cc_cflags_ppc="$CPU_CFLAGS" ;; ppc64) CPU_CFLAGS="-m64" LDFLAGS="-m64 $LDFLAGS" - cross_cc_ppc64=$cc - cross_cc_cflags_ppc64="$CPU_CFLAGS" ;; sparc) CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" LDFLAGS="-m32 -mv8plus $LDFLAGS" - cross_cc_sparc=$cc - cross_cc_cflags_sparc="$CPU_CFLAGS" ;; sparc64) CPU_CFLAGS="-m64 -mcpu=ultrasparc" LDFLAGS="-m64 $LDFLAGS" - cross_cc_sparc64=$cc - cross_cc_cflags_sparc64="$CPU_CFLAGS" ;; s390) CPU_CFLAGS="-m31" LDFLAGS="-m31 $LDFLAGS" - cross_cc_s390=$cc - cross_cc_cflags_s390="$CPU_CFLAGS" ;; s390x) CPU_CFLAGS="-m64" LDFLAGS="-m64 $LDFLAGS" - cross_cc_s390x=$cc - cross_cc_cflags_s390x="$CPU_CFLAGS" ;; i386) CPU_CFLAGS="-m32" LDFLAGS="-m32 $LDFLAGS" - cross_cc_i386=$cc - cross_cc_cflags_i386="$CPU_CFLAGS" ;; x86_64) # ??? Only extremely old AMD cpus do not have cmpxchg16b. @@ -1600,18 +1564,16 @@ case "$cpu" in # runtime and generate the fallback to serial emulation. CPU_CFLAGS="-m64 -mcx16" LDFLAGS="-m64 $LDFLAGS" - cross_cc_x86_64=$cc - cross_cc_cflags_x86_64="$CPU_CFLAGS" ;; x32) CPU_CFLAGS="-mx32" LDFLAGS="-mx32 $LDFLAGS" - cross_cc_i386=$cc - cross_cc_cflags_i386="$CPU_CFLAGS" ;; # No special flags required for other host CPUs esac +eval "cross_cc_${cpu}=\$host_cc" +cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS" # For user-mode emulation the host arch has to be one we explicitly @@ -5893,17 +5855,6 @@ EOF fi fi -########################################## -# Container based cross-compiler support -# -# This is specifically for building test -# cases for foreign architectures, not -# cross-compiling QEMU itself. - -if has "docker" || has "podman"; then - container=$($python $source_path/tests/docker/docker.py probe) -fi - ########################################## # check for libpmem @@ -6474,7 +6425,6 @@ echo "qed support $qed" echo "parallels support $parallels" echo "sheepdog support $sheepdog" echo "capstone $capstone" -echo "container support $container" echo "libpmem support $libpmem" echo "libudev $libudev" echo "default devices $default_devices" @@ -7384,10 +7334,6 @@ if test "$gcov" = "yes" ; then echo "GCOV=$gcov_tool" >> $config_host_mak fi -if test "$docker" != "no"; then - echo "HAVE_USER_DOCKER=y" >> $config_host_mak -fi - if test "$libudev" != "no"; then echo "CONFIG_LIBUDEV=y" >> $config_host_mak echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak @@ -7461,10 +7407,6 @@ case "$target" in ;; esac -target_compiler="" -target_compiler_static="" -target_compiler_cflags="" - mkdir -p $target_dir echo "# Automatically generated by configure - do not modify" > $config_target_mak @@ -7481,26 +7423,20 @@ case "$target_name" in i386) mttcg="yes" gdb_xml_files="i386-32bit.xml" - target_compiler=$cross_cc_i386 - target_compiler_cflags=$cross_cc_ccflags_i386 ;; x86_64) TARGET_BASE_ARCH=i386 mttcg="yes" gdb_xml_files="i386-64bit.xml" - target_compiler=$cross_cc_x86_64 ;; alpha) mttcg="yes" - target_compiler=$cross_cc_alpha ;; arm|armeb) TARGET_ARCH=arm bflt="yes" mttcg="yes" gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" - target_compiler=$cross_cc_arm - eval "target_compiler_cflags=\$cross_cc_cflags_${target_name}" ;; aarch64|aarch64_be) TARGET_ARCH=aarch64 @@ -7508,41 +7444,32 @@ case "$target_name" in bflt="yes" mttcg="yes" gdb_xml_files="aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" - target_compiler=$cross_cc_aarch64 - eval "target_compiler_cflags=\$cross_cc_cflags_${target_name}" ;; cris) - target_compiler=$cross_cc_cris ;; hppa) mttcg="yes" - target_compiler=$cross_cc_hppa ;; lm32) - target_compiler=$cross_cc_lm32 ;; m68k) bflt="yes" gdb_xml_files="cf-core.xml cf-fp.xml m68k-fp.xml" - target_compiler=$cross_cc_m68k ;; microblaze|microblazeel) TARGET_ARCH=microblaze bflt="yes" echo "TARGET_ABI32=y" >> $config_target_mak - target_compiler=$cross_cc_microblaze ;; mips|mipsel) mttcg="yes" TARGET_ARCH=mips - target_compiler=$cross_cc_mips echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak ;; mipsn32|mipsn32el) mttcg="yes" TARGET_ARCH=mips64 TARGET_BASE_ARCH=mips - target_compiler=$cross_cc_mipsn32 echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak echo "TARGET_ABI32=y" >> $config_target_mak ;; @@ -7550,32 +7477,24 @@ case "$target_name" in mttcg="yes" TARGET_ARCH=mips64 TARGET_BASE_ARCH=mips - target_compiler=$cross_cc_mips64 echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak ;; moxie) - target_compiler=$cross_cc_moxie ;; nios2) - target_compiler=$cross_cc_nios2 ;; or1k) - target_compiler=$cross_cc_or1k TARGET_ARCH=openrisc TARGET_BASE_ARCH=openrisc ;; ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_compiler=$cross_cc_ppc - target_compiler_cflags="$cross_cc_cflags_ppc" ;; ppc64) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc mttcg=yes gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" - target_compiler=$cross_cc_ppc64 - target_compiler_cflags="$cross_cc_cflags_ppc64" ;; ppc64le) TARGET_ARCH=ppc64 @@ -7583,7 +7502,6 @@ case "$target_name" in TARGET_ABI_DIR=ppc mttcg=yes gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" - target_compiler=$cross_cc_ppc64le ;; ppc64abi32) TARGET_ARCH=ppc64 @@ -7591,60 +7509,48 @@ case "$target_name" in TARGET_ABI_DIR=ppc echo "TARGET_ABI32=y" >> $config_target_mak gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" - target_compiler=$cross_cc_ppc64abi32 ;; riscv32) TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv mttcg=yes gdb_xml_files="riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-32bit-csr.xml" - target_compiler=$cross_cc_riscv32 ;; riscv64) TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv mttcg=yes gdb_xml_files="riscv-64bit-cpu.xml riscv-64bit-fpu.xml riscv-64bit-csr.xml" - target_compiler=$cross_cc_riscv64 ;; sh4|sh4eb) TARGET_ARCH=sh4 bflt="yes" - target_compiler=$cross_cc_sh4 ;; sparc) - target_compiler=$cross_cc_sparc ;; sparc64) TARGET_BASE_ARCH=sparc - target_compiler=$cross_cc_sparc64 ;; sparc32plus) TARGET_ARCH=sparc64 TARGET_BASE_ARCH=sparc TARGET_ABI_DIR=sparc - target_compiler=$cross_cc_sparc32plus echo "TARGET_ABI32=y" >> $config_target_mak ;; s390x) mttcg=yes gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-gs.xml" - target_compiler=$cross_cc_s390x ;; tilegx) - target_compiler=$cross_cc_tilegx ;; tricore) - target_compiler=$cross_cc_tricore ;; unicore32) - target_compiler=$cross_cc_unicore32 ;; xtensa|xtensaeb) TARGET_ARCH=xtensa bflt="yes" mttcg="yes" - target_compiler=$cross_cc_xtensa ;; *) error_exit "Unsupported target CPU" @@ -7655,27 +7561,6 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then TARGET_BASE_ARCH=$TARGET_ARCH fi -# Do we have a cross compiler for this target? -if has $target_compiler; then - - write_c_skeleton - - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC -static ; then - # For host systems we might get away with building without -static - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC ; then - target_compiler="" - else - enabled_cross_compilers="${enabled_cross_compilers} '${target_compiler}'" - target_compiler_static="n" - fi - else - enabled_cross_compilers="${enabled_cross_compilers} '${target_compiler}'" - target_compiler_static="y" - fi -else - target_compiler="" -fi - symlink "$source_path/Makefile.target" "$target_dir/Makefile" upper() { @@ -7752,18 +7637,6 @@ if test "$target_bsd_user" = "yes" ; then echo "CONFIG_BSD_USER=y" >> $config_target_mak fi -if test -n "$target_compiler"; then - echo "CROSS_CC_GUEST=\"$target_compiler\"" >> $config_target_mak - - if test -n "$target_compiler_static"; then - echo "CROSS_CC_GUEST_STATIC=$target_compiler_static" >> $config_target_mak - fi - - if test -n "$target_compiler_cflags"; then - echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >> $config_target_mak - fi -fi - # generate QEMU_CFLAGS/LDFLAGS for targets @@ -7894,11 +7767,6 @@ done # for target in $targets echo "PIXMAN_CFLAGS=$pixman_cflags" >> $config_host_mak echo "PIXMAN_LIBS=$pixman_libs" >> $config_host_mak -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: cross-compilers enabled: $enabled_cross_compilers" -fi - if [ "$fdt" = "git" ]; then echo "config-host.h: dtc/all" >> $config_host_mak fi @@ -7927,15 +7795,14 @@ fi # so the build tree will be missing the link back to the new file, and # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. -DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" +DIRS="tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema tests/qemu-iotests tests/vm" DIRS="$DIRS tests/fp tests/qgraph" DIRS="$DIRS docs docs/interop fsdev scsi" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" -LINKS="Makefile tests/tcg/Makefile" -LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" -LINKS="$LINKS tests/fp/Makefile" +LINKS="Makefile" +LINKS="$LINKS tests/tcg/lm32/Makefile po/Makefile" +LINKS="$LINKS tests/tcg/Makefile.target tests/fp/Makefile" LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS="$LINKS pc-bios/spapr-rtas/Makefile" LINKS="$LINKS pc-bios/s390-ccw/Makefile" @@ -7965,6 +7832,12 @@ for f in $LINKS ; do fi done +(for i in $cross_cc_vars; do + export $i +done +export target_list source_path +$source_path/tests/tcg/configure.sh) + # temporary config to build submodules for rom in seabios vgabios ; do config_mak=roms/$rom/config.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 8400656b9d3..9380b9eb666 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1059,30 +1059,28 @@ BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) -ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) -endif build-tcg-tests-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) \ - V="$(V)" TARGET_DIR="$*/" guest-tests, \ + V="$(V)" TARGET="$*" guest-tests, \ "BUILD", "TCG tests for $*") run-tcg-tests-%: build-tcg-tests-% %/all $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) SPEED="$(SPEED)" \ - V="$(V)" TARGET_DIR="$*/" run-guest-tests, \ + V="$(V)" TARGET="$*" run-guest-tests, \ "RUN", "TCG tests for $*") clean-tcg-tests-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=$(SRC_PATH) TARGET_DIR="$*/" clean-guest-tests, \ + SRC_PATH=$(SRC_PATH) TARGET="$*" clean-guest-tests, \ "RUN", "TCG tests for $*") .PHONY: build-tcg diff --git a/tests/tcg/Makefile.prereqs b/tests/tcg/Makefile.prereqs index 53b01962e1d..7494b31b952 100644 --- a/tests/tcg/Makefile.prereqs +++ b/tests/tcg/Makefile.prereqs @@ -7,24 +7,12 @@ # selection of required docker targets before we invoke a sub-make for # each target. -# First we need the target makefile which tells us the target architecture -CROSS_CC_GUEST:= --include $(BUILD_DIR)/$(PROBE_TARGET)/config-target.mak - -# Then we load up the target architecture makefiles which tell us -# about the compilers DOCKER_IMAGE:= --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include --include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include +-include $(BUILD_DIR)/tests/tcg/config-$(PROBE_TARGET).mak -ifndef CROSS_CC_GUEST ifneq ($(DOCKER_IMAGE),) build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) +$(BUILD_DIR)/tests/tcg/config_$(PROBE_TARGET).mak: config-host.mak +config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh endif -endif - -# Clean-up -# undefine TARGET_NAME -# undefine TARGET_BASE_ARCH -# undefine TARGET_ABI_DIR diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 7eff11d434e..9c23aeaa2a6 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -8,17 +8,22 @@ # to do it for us. # -# The per ARCH makefile, if it exists, holds extra information about +include $(SRC_PATH)/rules.mak + +# The configure script fills in extra information about # useful docker images or alternative compiler flags. -include $(TARGET_DIR)config-target.mak -include $(SRC_PATH)/rules.mak -include $(wildcard \ - $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include \ - $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include) +CROSS_CC_GUEST:= +DOCKER_IMAGE:= +-include $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak GUEST_BUILD= TCG_MAKE=../Makefile.target + +# We also need the Docker make rules to depend on +SKIP_DOCKER_BUILD=1 +include $(SRC_PATH)/tests/docker/Makefile.include + # Support installed Cross Compilers ifdef CROSS_CC_GUEST @@ -26,11 +31,11 @@ ifdef CROSS_CC_GUEST .PHONY: cross-build-guest-tests cross-build-guest-tests: $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ - $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" CC="$(CROSS_CC_GUEST)" \ + (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC="$(CROSS_CC_GUEST)" \ SRC_PATH="$(SRC_PATH)" BUILD_STATIC=$(CROSS_CC_GUEST_STATIC) \ - EXTRA_CFLAGS=$(CROSS_CC_GUEST_CFLAGS)), \ - "BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)") + EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \ + "BUILD","$(TARGET) guest-tests with $(CROSS_CC_GUEST)") GUEST_BUILD=cross-build-guest-tests @@ -38,30 +43,24 @@ endif # Support building with Docker -ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y) ifneq ($(DOCKER_IMAGE),) -# We also need the Docker make rules to depend on -SKIP_DOCKER_BUILD=1 -include $(SRC_PATH)/tests/docker/Makefile.include - DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_COMPILER) \ + --cc $(DOCKER_CROSS_CC_GUEST) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " .PHONY: docker-build-guest-tests docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ - $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" CC=$(DOCKER_COMPILE_CMD) \ + (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC=$(DOCKER_COMPILE_CMD) \ SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \ - EXTRA_CFLAGS=$(DOCKER_CROSS_COMPILER_CFLAGS)), \ - "BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)") + EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \ + "BUILD","$(TARGET) guest-tests with docker qemu:$(DOCKER_IMAGE)") GUEST_BUILD=docker-build-guest-tests -endif endif # Final targets @@ -75,22 +74,22 @@ guest-tests: $(GUEST_BUILD) run-guest-tests: guest-tests $(call quiet-command, \ - (cd tests/tcg/$(TARGET_DIR) && \ - $(MAKE) -f $(TCG_MAKE) TARGET_DIR="$(TARGET_DIR)" \ + (cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" \ SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") else guest-tests: $(call quiet-command, /bin/true, "BUILD", \ - "$(TARGET_DIR) guest-tests SKIPPED") + "$(TARGET) guest-tests SKIPPED") run-guest-tests: $(call quiet-command, /bin/true, "RUN", \ - "tests for $(TARGET_DIR) SKIPPED") + "tests for $(TARGET) SKIPPED") endif # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: - rm -rf tests/tcg/$(TARGET_DIR) + rm -rf tests/tcg/$(TARGET) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 8dbcba4474f..8808beaf74b 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -31,7 +31,7 @@ all: -include ../../config-host.mak --include ../../../$(TARGET_DIR)/config-target.mak +-include ../config-$(TARGET).mak # for including , in command strings COMMA := , @@ -63,12 +63,6 @@ CFLAGS= QEMU_CFLAGS= LDFLAGS= -# The QEMU for this TARGET -ifdef CONFIG_USER_ONLY -QEMU=../../../$(TARGET_DIR)/qemu-$(TARGET_NAME) -else -QEMU=../../../$(TARGET_DIR)/qemu-system-$(TARGET_NAME) -endif QEMU_OPTS= diff --git a/tests/tcg/aarch64/Makefile.include b/tests/tcg/aarch64/Makefile.include deleted file mode 100644 index 5d4e4c6f99b..00000000000 --- a/tests/tcg/aarch64/Makefile.include +++ /dev/null @@ -1,8 +0,0 @@ -# Makefile.include for AArch64 targets -# -# We don't have any bigendian build tools so we only use this for AArch64 - -ifeq ($(TARGET_NAME),aarch64) -DOCKER_IMAGE=debian-buster-arm64-cross -DOCKER_CROSS_COMPILER=aarch64-linux-gnu-gcc -endif diff --git a/tests/tcg/alpha/Makefile.include b/tests/tcg/alpha/Makefile.include deleted file mode 100644 index c7dc48eadb0..00000000000 --- a/tests/tcg/alpha/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=debian-alpha-cross -DOCKER_CROSS_COMPILER=alpha-linux-gnu-gcc diff --git a/tests/tcg/arm/Makefile.include b/tests/tcg/arm/Makefile.include deleted file mode 100644 index 8e7eac008f9..00000000000 --- a/tests/tcg/arm/Makefile.include +++ /dev/null @@ -1,8 +0,0 @@ -# Makefile.include for all ARM targets -# -# We don't have any bigendian build tools so we only use this for armhf - -ifeq ($(TARGET_NAME),arm) -DOCKER_IMAGE=debian-armhf-cross -DOCKER_CROSS_COMPILER=arm-linux-gnueabihf-gcc -endif diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh new file mode 100755 index 00000000000..5f794b664b8 --- /dev/null +++ b/tests/tcg/configure.sh @@ -0,0 +1,234 @@ +#! /bin/sh + +if test -z "$source_path"; then + echo Do not invoke this script directly. It is called + echo automatically by configure. + exit 1 +fi + +write_c_skeleton() { + cat > $TMPC </dev/null 2>&1 +} + +do_compiler() { + # Run the compiler, capturing its output to the log. First argument + # is compiler binary to execute. + local compiler="$1" + shift + if test -n "$BASH_VERSION"; then eval ' + echo >>config.log " +funcs: ${FUNCNAME[*]} +lines: ${BASH_LINENO[*]}" + '; fi + echo $compiler "$@" >> config.log + $compiler "$@" >> config.log 2>&1 || return $? +} + + +TMPDIR1="config-temp" +TMPC="${TMPDIR1}/qemu-conf.c" +TMPE="${TMPDIR1}/qemu-conf.exe" + +container="no" +if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) +fi + +# cross compilers defaults, can be overridden with --cross-cc-ARCH +: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"} +: ${cross_cc_aarch64_be="$cross_cc_aarch64"} +: ${cross_cc_cflags_aarch64_be="-mbig-endian"} +: ${cross_cc_arm="arm-linux-gnueabihf-gcc"} +: ${cross_cc_cflags_armeb="-mbig-endian"} +: ${cross_cc_i386="i386-pc-linux-gnu-gcc"} +: ${cross_cc_cflags_i386="-m32"} +: ${cross_cc_x86_64="x86_64-pc-linux-gnu-gcc"} +: ${cross_cc_cflags_x86_64="-m64"} +: ${cross_cc_ppc="powerpc-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc="-m32"} +: ${cross_cc_ppc64="powerpc-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc64="-m64"} +: ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"} +: ${cross_cc_cflags_s390x="-m64"} +: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"} +: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"} + +for target in $target_list; do + arch=${target%%-*} + case $arch in + arm|armeb) + arches=arm + ;; + aarch64|aarch64_be) + arches="aarch64 arm" + ;; + mips*) + arches=mips + ;; + ppc*) + arches=ppc + ;; + sh4|sh4eb) + arches=sh4 + ;; + x86_64) + arches="x86_64 i386" + ;; + xtensa|xtensaeb) + arches=xtensa + ;; + alpha|cris|hppa|i386|lm32|m68k|openrisc|riscv64|s390x|sh4|sparc64) + arches=$target + ;; + *) + continue + ;; + esac + + container_image= + case $target in + aarch64-*) + # We don't have any bigendian build tools so we only use this for AArch64 + container_image=debian-buster-arm64-cross + container_cross_cc=aarch64-linux-gnu-gcc + ;; + alpha-*) + container_image=debian-alpha-cross + container_cross_cc=alpha-linux-gnu-gcc + ;; + arm-*) + # We don't have any bigendian build tools so we only use this for AArch64 + container_image=debian-armhf-cross + container_cross_cc=arm-linux-gnueabihf-gcc + ;; + cris-*) + container_image=fedora-cris-cross + container_cross_cc=cris-linux-gnu-gcc + ;; + hppa-*) + container_image=debian-hppa-cross + container_cross_cc=hppa-linux-gnu-gcc + ;; + i386-*) + container_image=fedora-i386-cross + container_cross_cc=gcc + ;; + m68k-*) + container_image=debian-m68k-cross + container_cross_cc=m68k-linux-gnu-gcc + ;; + mips64el-*) + container_image=debian-mips64el-cross + container_cross_cc=mips64el-linux-gnuabi64-gcc + ;; + mips64-*) + container_image=debian-mips64-cross + container_cross_cc=mips64-linux-gnuabi64-gcc + ;; + mipsel-*) + container_image=debian-mipsel-cross + container_cross_cc=mipsel-linux-gnu-gcc + ;; + mips-*) + container_image=debian-mips-cross + container_cross_cc=mips-linux-gnu-gcc + ;; + ppc-*) + container_image=debian-powerpc-cross + container_cross_cc=powerpc-linux-gnu-gcc + ;; + ppc64-*) + container_image=debian-ppc64-cross + container_cross_cc=powerpc64-linux-gnu-gcc + ;; + ppc64le-*) + container_image=debian-ppc64el-cross + container_cross_cc=powerpc64le-linux-gnu-gcc + ;; + riscv64-*) + container_image=debian-riscv64-cross + container_cross_cc=riscv64-linux-gnu-gcc + ;; + s390x-*) + container_image=debian-s390x-cross + container_cross_cc=s390x-linux-gnu-gcc + ;; + sh4-*) + container_image=debian-sh4-cross + container_cross_cc=sh4-linux-gnu-gcc + ;; + sparc64-*) + container_image=debian-sparc64-cross + container_cross_cc=sparc64-linux-gnu-gcc + ;; + xtensa*-softmmu) + container_image=debian-xtensa-cross + + # default to the dc232b cpu + container_cross_cc=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc + ;; + esac + + config_target_mak=tests/tcg/config-$target.mak + + echo "# Automatically generated by configure - do not modify" > $config_target_mak + echo "TARGET_NAME=$arch" >> $config_target_mak + case $target in + *-linux-user | *-bsd-user) + echo "CONFIG_USER_ONLY=y" >> $config_target_mak + echo "QEMU=\$(BUILD_DIR)/$target/qemu-$arch" >> $config_target_mak + ;; + *-softmmu) + echo "CONFIG_SOFTMMU=y" >> $config_target_mak + echo "QEMU=\$(BUILD_DIR)/$target/qemu-system-$arch" >> $config_target_mak + ;; + esac + + eval "target_compiler_cflags=\${cross_cc_cflags_$arch}" + echo "CROSS_CC_GUEST_CFLAGS=$target_compiler_cflags" >> $config_target_mak + + got_cross_cc=no + for i in $arch $arches; do + if eval test "x\${cross_cc_$i+yes}" != xyes; then + continue + fi + + eval "target_compiler=\${cross_cc_$i}" + if ! has $target_compiler; then + continue + fi + write_c_skeleton + if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC -static ; then + # For host systems we might get away with building without -static + if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $TMPC ; then + continue + fi + echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak + else + echo "CROSS_CC_GUEST_STATIC=y" >> $config_target_mak + fi + echo "CROSS_CC_GUEST=$target_compiler" >> $config_target_mak + enabled_cross_compilers="$enabled_cross_compilers $target_compiler" + got_cross_cc=yes + break + done + + if test $got_cross_cc = no && test "$docker" != no && test -n "$container_image"; then + echo "DOCKER_IMAGE=$container_image" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + fi +done + +# report container support state +echo "cross containers $container" + +if test -n "$enabled_cross_compilers"; then + echo + echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" +fi diff --git a/tests/tcg/cris/Makefile.include b/tests/tcg/cris/Makefile.include deleted file mode 100644 index 1c037824bff..00000000000 --- a/tests/tcg/cris/Makefile.include +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile.include for all CRIS targets -# - -DOCKER_IMAGE=fedora-cris-cross -DOCKER_CROSS_COMPILER=cris-linux-gnu-gcc diff --git a/tests/tcg/hppa/Makefile.include b/tests/tcg/hppa/Makefile.include deleted file mode 100644 index da2353430e2..00000000000 --- a/tests/tcg/hppa/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=debian-hppa-cross -DOCKER_CROSS_COMPILER=hppa-linux-gnu-gcc diff --git a/tests/tcg/i386/Makefile.include b/tests/tcg/i386/Makefile.include deleted file mode 100644 index be1c3008dd7..00000000000 --- a/tests/tcg/i386/Makefile.include +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile.include for all i386 -# -# There is enough brokeness in x86_64 compilers that we don't default -# to using the x86_64 system compiler for i386 binaries. -# - -DOCKER_IMAGE=fedora-i386-cross -DOCKER_CROSS_COMPILER=gcc diff --git a/tests/tcg/m68k/Makefile.include b/tests/tcg/m68k/Makefile.include deleted file mode 100644 index cd7c6bf50d7..00000000000 --- a/tests/tcg/m68k/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=debian-m68k-cross -DOCKER_CROSS_COMPILER=m68k-linux-gnu-gcc diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.include deleted file mode 100644 index 4a14fc078d2..00000000000 --- a/tests/tcg/mips/Makefile.include +++ /dev/null @@ -1,20 +0,0 @@ -# -# Makefile.include for all MIPs targets -# -# As Debian doesn't support mip64 in big endian mode the only way to -# build BE is to pass a working cross compiler to ./configure -# - -ifeq ($(TARGET_NAME),mips64el) -DOCKER_IMAGE=debian-mips64el-cross -DOCKER_CROSS_COMPILER=mips64el-linux-gnuabi64-gcc -else ifeq ($(TARGET_NAME),mips64) -DOCKER_IMAGE=debian-mips64-cross -DOCKER_CROSS_COMPILER=mips64-linux-gnuabi64-gcc -else ifeq ($(TARGET_NAME),mipsel) -DOCKER_IMAGE=debian-mipsel-cross -DOCKER_CROSS_COMPILER=mipsel-linux-gnu-gcc -else ifeq ($(TARGET_NAME),mips) -DOCKER_IMAGE=debian-mips-cross -DOCKER_CROSS_COMPILER=mips-linux-gnu-gcc -endif diff --git a/tests/tcg/ppc/Makefile.include b/tests/tcg/ppc/Makefile.include deleted file mode 100644 index ae01fb8fadd..00000000000 --- a/tests/tcg/ppc/Makefile.include +++ /dev/null @@ -1,10 +0,0 @@ -ifeq ($(TARGET_NAME),ppc) -DOCKER_IMAGE=debian-powerpc-cross -DOCKER_CROSS_COMPILER=powerpc-linux-gnu-gcc -else ifeq ($(TARGET_NAME),ppc64) -DOCKER_IMAGE=debian-ppc64-cross -DOCKER_CROSS_COMPILER=powerpc64-linux-gnu-gcc -else ifeq ($(TARGET_NAME),ppc64le) -DOCKER_IMAGE=debian-ppc64el-cross -DOCKER_CROSS_COMPILER=powerpc64le-linux-gnu-gcc -endif diff --git a/tests/tcg/riscv/Makefile.include b/tests/tcg/riscv/Makefile.include deleted file mode 100644 index d92ac6c89f0..00000000000 --- a/tests/tcg/riscv/Makefile.include +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile.include for all RISCV targets -# -# Debian only really cares about 64 bit going forward -# - -ifeq ($(TARGET_NAME),riscv64) -DOCKER_IMAGE=debian-riscv64-cross -DOCKER_CROSS_COMPILER=riscv64-linux-gnu-gcc -endif diff --git a/tests/tcg/s390x/Makefile.include b/tests/tcg/s390x/Makefile.include deleted file mode 100644 index 1f58115d961..00000000000 --- a/tests/tcg/s390x/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=debian-s390x-cross -DOCKER_CROSS_COMPILER=s390x-linux-gnu-gcc diff --git a/tests/tcg/sh4/Makefile.include b/tests/tcg/sh4/Makefile.include deleted file mode 100644 index ad21594d9d8..00000000000 --- a/tests/tcg/sh4/Makefile.include +++ /dev/null @@ -1,4 +0,0 @@ -ifneq ($(TARGET_NAME), sh4eb) -DOCKER_IMAGE=debian-sh4-cross -DOCKER_CROSS_COMPILER=sh4-linux-gnu-gcc -endif diff --git a/tests/tcg/sparc64/Makefile.include b/tests/tcg/sparc64/Makefile.include deleted file mode 100644 index 95fc8dee9f4..00000000000 --- a/tests/tcg/sparc64/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=debian-sparc64-cross -DOCKER_CROSS_COMPILER=sparc64-linux-gnu-gcc diff --git a/tests/tcg/xtensa/Makefile.include b/tests/tcg/xtensa/Makefile.include deleted file mode 100644 index 423c00a5d31..00000000000 --- a/tests/tcg/xtensa/Makefile.include +++ /dev/null @@ -1,11 +0,0 @@ -# Makefile.include for xtensa targets -# -# The compilers can only be used for building system tests - -ifeq ($(CONFIG_SOFTMMU),y) -DOCKER_IMAGE=debian-xtensa-cross - -# default to the dc232b cpu -DOCKER_CROSS_COMPILER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc -DOCKER_CROSS_LINKER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-ld -endif From patchwork Wed Sep 4 20:29:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173031 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp417049ilq; Wed, 4 Sep 2019 13:41:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOc/PdiNGWskuB9eoXFlpS0lmHY96o8aANz9JVetBTIKSDsrZK3ADKwH9pn5icdQDFvG1R X-Received: by 2002:ac8:7083:: with SMTP id y3mr17984251qto.207.1567629713007; Wed, 04 Sep 2019 13:41:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629713; cv=none; d=google.com; s=arc-20160816; b=I9ef1B8jTRi/o3uYNT+uYB65BlNjZ5KfDIhKDOPdWS3Q0ToQciisyoTbwd68Q42Tg/ E/U1tDh0r6NJit25UAY9Yd+1MutrsoA5bjqXSkub9uuiUp75ZkSK2LM2BDCQyi2dKQtV q1ejvOKwFTNcgesT7BR3lpnoQfFBlOsr3+4DJOcfgRKEqseyiiobiqM2yLSrcFGBbCdB 2aWlkyBSaBN5clRe+DvljWaaIsEcIOgnUp5dXyT8nb7rmuD/GCczUtUYGbco31vrQ7ck gNT0lqOOEFVPP1i+JNtiVGNTcmy0PmvCSVIt11fscpHFjDg5dJWoimWWkKZxOK+K1CeO Umkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HOLsUCpRO5RppiFlrrFGOubpGTLW833HZzVzpexdmsQ=; b=bIeuPg10aY3KCgwsdR/8FXntUbdPoNTlXLkIMnb0sS7T5fcnzORjjL78xhR5tSUiCQ RjEqmU58kgjhiiulfMK1EkKYyyR3PeXgNAdpeOwhs91ZsW9dBG8taDBrmTz5YTVxvMib nJe+BPpxdmrbaxfqU6LuHpqXWrPuWd0LYh3SIJepe36fyn4Mbdy3NX58S2oCr8x9RkLo RTmXh9pDBWTsxE2iCEogp8KtzDdymT3Rh84iG63uS1tmgr3T8yfmGSK/TeZeZ4ak/kfy G3CmyO67rTVNw6eoc/Ni4gDOQmkmFK0oXCvoZU59Jy6RZN4pI47p2fiz7L+Pt0Yq0eyB RhIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v2W17WoN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c11si14758624qtq.152.2019.09.04.13.41.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:41:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v2W17WoN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c6B-0001jH-Tq for patch@linaro.org; Wed, 04 Sep 2019 16:41:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49809) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvF-0008At-K3 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006eR-K6 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:30 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv8-0006YI-0d for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:27 -0400 Received: by mail-wm1-x344.google.com with SMTP id o184so210656wme.3 for ; Wed, 04 Sep 2019 13:30:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HOLsUCpRO5RppiFlrrFGOubpGTLW833HZzVzpexdmsQ=; b=v2W17WoNPTi+qmiMJ60l+xCHJqCLsc1QAlJaEoKY0vmhpUdSzXYKD61iXiKc7rsUTM VnoN4RWnQeN3Gou6jSCssF7zLzddzcq78TVHeNcaRBFcPeRVsXqa5GwgmiYCWSK7JOq7 7xyiJkHkeFu6esrxA3u5rq3WMfGgRAwvRUhAmBXAX7bQsH+1qU4i6mPoYMwv0LpXRsz+ cm5vFZ60Y3CU0mnife88uVJoB6fIhLwCZsB1M3PEtQQ4tyXMJWoDei+hcc/hUv+g0v3x L2YlcXeZt9tZvkS0s4Qrs6Zjzz2ebVM79kGHtwTbeGcNd8XLv2wxeHw7M//CNihTBvVm sCYA== 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=HOLsUCpRO5RppiFlrrFGOubpGTLW833HZzVzpexdmsQ=; b=OVUlcEKA9vVfPmh0lVxBSG9Ka3dEyo/rxClts0ZK0rlm/v+2WKfSuj31245i+keq3p M2A+qUVwvDxskvpokzhnw60boRukScV0o0J5FIi3VaXxj0hFz7zDZTicoW5os6VzFaIX RwdzE7GYoMtQ0GDxNq2Y2bP9uoO4iFN73oYVE3OHBSdTJi3bp4ateltE3x+qtUZiv2AV qcZu/jt0yiYEv/NepsYkjhEU7QuoeIs8GoGfiu4qlL7ragmhJizoLnbGAg8kbkCuXc4m ICGSeXQmZRAwUbJkC84zPi+M18q7lFisEGS6TMbkYdJwc/o+zMZykhk4ZFZEK2A2DQ0q bSJA== X-Gm-Message-State: APjAAAXlpqSeLhzXWF4PAlgk1d8ZwyWZz7mco7+0GpWTsBXQEzS1jz6x +qkam8wjGQE1QHMnJoBTrqy86Q== X-Received: by 2002:a7b:cd97:: with SMTP id y23mr101794wmj.74.1567629022077; Wed, 04 Sep 2019 13:30:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm4891234wrg.65.2019.09.04.13.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D8841FF96; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:38 +0100 Message-Id: <20190904203013.9028-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 07/42] tests/tcg: add .gitignore for in source builds 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This hides the new build artefacts from the re-organised TCG tests when you are doing an in-source build. Signed-off-by: Alex Bennée --- tests/tcg/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/tcg/.gitignore -- 2.20.1 diff --git a/tests/tcg/.gitignore b/tests/tcg/.gitignore new file mode 100644 index 00000000000..84d7541b286 --- /dev/null +++ b/tests/tcg/.gitignore @@ -0,0 +1,5 @@ +# These are build artefacts which only appear when you are doing +# builds directly in the source tree. +config-*.mak +*-softmmu/ +*-linux-user/ From patchwork Wed Sep 4 20:29:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173032 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp418398ilq; Wed, 4 Sep 2019 13:43:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqztkd9as35GzSzF4Qif4lrcFkDhMn7XiRuFzMRzk/o2GJLnkXvnma613mPtMvntu02OccRI X-Received: by 2002:a05:6402:17aa:: with SMTP id j10mr208394edy.222.1567629802464; Wed, 04 Sep 2019 13:43:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629802; cv=none; d=google.com; s=arc-20160816; b=A11xCnqwTnNJp+ds+iNdohJ7GblBGVAmZ9d7uvbyCqMhdfevOOLsyjjI744wrufYYA yuIM7JsHZrjdOleZTGKxv7K+08OnqPSziWb8DCsJi6kPiSz+Y89S1k5NRT8NiJZQuV6C r2mVxLNS/zF6CoFbw4teys7gRIbQDyvPuFXDHfYSSZAwM8+CMd8HN+K5N+SrNCf5j/ZY IZ9wwhUaawkjSMEEHT3iWFdydid+lOyxO+P6dfpSy99UgZpsYP/r8yJLg3uPFnoYzX3t jTZXk3YGdysjQDWe0QQGGFd5bOiqGEK1UrKYOqQEb6BE5Q6I43FCoJ+oEZztUY6/dZxN lx3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=XbPV2t+F7ljq0HCAxTum9zmKwOphxxVJo57tiv6WLRU=; b=vfn/H5shcE6z/DfriHnck2YZjJ7V9yTQtwfEoXF7EDY8NiUDMdJr3sEZ06TzzwILW/ JbJGzafncOheGghoB7HoBeI4g+Wk7st1ipbMNZ1juh+HptL3UX5oarJscPJvW5Bq6Xeq WICvEE4JUiNYOQOuKMLs5n/tGTO6tkeQRhP+wP88qn7blsxywC+l4QBRkMR1he1brYUB +GSf7nCxeNCMDlYQNvV9O9jlQ9haPJJOTcNPbcEWFE9IAn3NKudAddFdXsgriX1Sh1q7 LpI73SUzweNr32JtZlksSO6dw2iG1aMMQhHABBpvJ0dqiJfUux8AEwAvKPcat91yatOs G7/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PoXG7lu5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p33si13838467edc.358.2019.09.04.13.43.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:43:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PoXG7lu5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c7c-000469-I0 for patch@linaro.org; Wed, 04 Sep 2019 16:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49773) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvC-00088l-JM for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006dj-Bd for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:30 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35471) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006WO-JQ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wr1-x431.google.com with SMTP id g7so204759wrx.2 for ; Wed, 04 Sep 2019 13:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XbPV2t+F7ljq0HCAxTum9zmKwOphxxVJo57tiv6WLRU=; b=PoXG7lu5Oz9qsutsTGqexR+n94adVB9Cvp2O5KYtgi9bmhrzCAqC1h2z3fg3ZZgaRR 9qKc8FGYOCaSF1YxfOrlWKdh88cGQl6Cp0Zt35evBgWNU94XyN2b/PgJ++j8JrVEYeqe whXdP8BabODG7g8EliCsevvB5+uRBjsCeRU1l4lRsD/R8GizVGfzVUS7T3sHvIKOByJY g+IzvC7sXNfLvrLsfcv2sWxyY4gVzszT1DXnWYCYYiNgDaxxwHt6NCnEvS08cmx6/wDt fw53oOzZFQb5++car1NBAtTqDjBIzT0RpEvRQZi5ymsRIV1192Oz9pTi9csrUr6sAzgz psHA== 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=XbPV2t+F7ljq0HCAxTum9zmKwOphxxVJo57tiv6WLRU=; b=ZPf/HaWcOxw0parWYXNas2QKM2UmjuJMXfVVXxIKWuoZ3csn0vmhCyVU3BnVT9bo3S 7RRKIG78PctfL4SgUxvGeJNycxj9iIRCfIz967dzHGuvNanCnlcwDhCTuTnts4ruCbpp QyhrHEipl6rzaMTkxqUs0p4XOxWnYkVE5gNNAZn5ODp0pdZLoJxwCZLiYFE1NidoZ3Yc zGjLoknIVSou4AJTulwclSbyIB8hZNM1+u3aVkCQaLVOV/uvF9ZSfBH1fdmbnIQxqI3N GoEnotj8uB020iZpEw8v5veCrdkiXfVYGCRe3YD3676APMW+fYXj3dOu/aLFos8q/U4J 9qgQ== X-Gm-Message-State: APjAAAW/FhJ/7EGBB7IOEZPrunDVKAhPX64iUtyusWkXPioz9k7Bdpm8 7E4S/HIEZ/wtXBajsgbcOAnL5w== X-Received: by 2002:a05:6000:49:: with SMTP id k9mr2235236wrx.21.1567629020700; Wed, 04 Sep 2019 13:30:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm31755088wra.91.2019.09.04.13.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 361241FF98; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:39 +0100 Message-Id: <20190904203013.9028-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We might as well not repeat ourselves. At the same time allow it to be overridden which we will use later from docker targets. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/common.rc | 4 ++++ tests/docker/test-build | 1 - tests/docker/test-mingw | 1 - tests/docker/test-quick | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 4011561587a..512202b0a19 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -11,6 +11,10 @@ # or (at your option) any later version. See the COPYING file in # the top-level directory. +# This might be set by ENV of a docker container... it is always +# overriden by TARGET_LIST if the user sets it. +DEF_TARGET_LIST=${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"} + requires() { for c in $@; do diff --git a/tests/docker/test-build b/tests/docker/test-build index 22766cfacc0..2b2a7832f15 100755 --- a/tests/docker/test-build +++ b/tests/docker/test-build @@ -15,7 +15,6 @@ cd "$BUILD_DIR" -DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu install_qemu diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index fdb1c2c879d..c30eb654eb7 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -16,7 +16,6 @@ requires mingw dtc cd "$BUILD_DIR" -DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ diff --git a/tests/docker/test-quick b/tests/docker/test-quick index eee59c55fba..feee44b2476 100755 --- a/tests/docker/test-quick +++ b/tests/docker/test-quick @@ -15,7 +15,6 @@ cd "$BUILD_DIR" -DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu" TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ build_qemu check_qemu From patchwork Wed Sep 4 20:29:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173044 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp430260ilq; Wed, 4 Sep 2019 13:58:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwC50OPOBO0YOG2Q7cwa4guOvz2fWQXrJB/AYNQJ8OfiEDCUg/D6AsH+tTCtNiaD8/UCpNa X-Received: by 2002:a17:906:5a8d:: with SMTP id l13mr4422ejq.219.1567630685474; Wed, 04 Sep 2019 13:58:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630685; cv=none; d=google.com; s=arc-20160816; b=n5z6w+62H9McyYyyg1p0eeklWYWx1Ph43pTdWquX0ATLjibaGDwZqn0jo0/DwXMN41 gh+CI2AOznCryW8i4M7tb1KKuD21SwbbdIyzQknHdcEei1kCWgZwqs2CTcLXbxnkDQMQ HIBZAWGPdXU/JWzyyW42KAk8KZbtJXdkd/5PuPHAFrGewiSYWI2eb3fWcRZUYa0vERtn JkfIHxQ6dEUpuZBnN+PECBY/mdA1u+ePFg6E+8GHU6USI3gBxRDnOh7fRYIBP9AZyFbZ BC6ZL1dzPaCE0WSaTeYKxmer3XSuKRteBJ+EW92eD2o90si9pofMjAeY9ZYxEb59RqwR aIQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=p3y2eX+7FONDbDZLCLCZxdBeIEWMh8ZiPOEtCXfGU9A=; b=t0DWFQZnutvGVYQKf9lFE59yUpAMOLbpGrB41YVIYvAvRqXuGFZmpCA5OCTGi1iz6Y 2BWbHWTWQGrNbemaQdychNmjkj5FAlTH4FqxrAah+YGyGRSOnLLLBH3A7O6mOxd+B/Dv Qz1AaYGxqVLeBfkIt/ijUAIgFfvfNG1vA2Z0FjsAcgiIEIFkpgas6otxYaFXag+F2BOF rKecAqhbbKKCePyqZb3CLkazhyFyziUrm8LeO1BCvtmehIjvfE2hKqZD8fLEP7huLl7z h5JZO51Z/nrric/K67/x4NdOmQssGWGVy6wBWPq8EfSYP70qGRo62NAL5GRWOdD85Axf iwsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mUAKJXnz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fy13si110763ejb.50.2019.09.04.13.58.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:58:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mUAKJXnz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cLr-0001kR-Ip for patch@linaro.org; Wed, 04 Sep 2019 16:58:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49820) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008Bh-LC for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006dY-8Q for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006Wc-Fn for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wm1-x331.google.com with SMTP id k1so205155wmi.1 for ; Wed, 04 Sep 2019 13:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p3y2eX+7FONDbDZLCLCZxdBeIEWMh8ZiPOEtCXfGU9A=; b=mUAKJXnz8UhhFcroaGb1tuken8Ra0GlXgXT5Eq8B0VlfDrLuNKq+Zy51oxh18yWqBL 1RXdhXlrtJLlTD89vxCashJe67dN7NbZAeBpQvr0MvCNNRpxtBTVM4fmoJyvTnkxyIBm bDI6BiZVsXZcNI3yU2TmUlPN1w/8+6H0afwz0t1vVo8bknclKfdI4r9ePV5+2fpFZ8BW m5+DQYCUpo9orD/YHvl2dxtMhgEVgNAtnBqw+gBepAYCZ0ygoC6S5OBAL37xgAmM3i7k JKcXZWvIg5Bh2aC02Co8iJbD+1PCNrtMlppLoHoj2m0PTIH6eHO6c+12IaophsaVRRBz zwuQ== 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=p3y2eX+7FONDbDZLCLCZxdBeIEWMh8ZiPOEtCXfGU9A=; b=SnlnS+jsLKUUwuETEfycCLqNSBNUBmi3ZSJ9Y7xHETAyRN/Z+JtjI8ZteTeacA91JS Ib9+N9ABDpl8sY28t+X/GoPKg5BEuLXGb4kMeGcc4tUYE5Ze3CmHrirxPnhJRDytRoCn wNSNvM8lbb1fbQts8l4EZ2Tl42vpjuCsUMzt+ZacX9HFqV6pwVx9FI+oQUEBRVLFHLmB oHhKw1BwMqF4JJ2GOwA39Bwlaubtb15Ta+b3TNKRQ5w58c7BvlNXAZfCMfbpNXlz6YZ3 oBj01vGoqlc6m8lBtRplbAH1YnWkwyaWFQEBeXf7N8o961HmF4493FFTGV07ByHCUIC6 ONcA== X-Gm-Message-State: APjAAAUgNTBjjgijvpiaODzwgNCZiHfTOf9u2yS6aQdEuqPg2UXgHT1y hCU4H8NpAVrvxgj4qcoQIbu0fg== X-Received: by 2002:a7b:ca50:: with SMTP id m16mr93152wml.158.1567629021269; Wed, 04 Sep 2019 13:30:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e15sm12493544wru.93.2019.09.04.13.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 530611FF99; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:40 +0100 Message-Id: <20190904203013.9028-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PATCH v1 09/42] tests/docker: set DEF_TARGET_LIST for some containers 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" You can assume the failures most people are interested in are the cross-compile failures that are specific to the cross compile target. Set DEF_TARGET_LIST based on what we use for shippable, the user can always override by calling with TARGET_LIST set. Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-mips-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + 7 files changed, 7 insertions(+) -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 7c2cc93daf8..6b59ef0843a 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -17,6 +17,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- +ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index d866fe5d75b..363a162a253 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -15,6 +15,7 @@ RUN dpkg --add-architecture armel && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- +ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 2b8627673c3..d5365881e79 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -17,6 +17,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- +ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 3c4d6f9ec1f..a54efa7253a 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu- +ENV DEF_TARGET_LIST mips-softmmu,mipsel-linux-user # Install extra libraries to increase code coverage RUN apt update && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 34b0b828957..a1481e16e2c 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -21,6 +21,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- +ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user # Install extra libraries to increase code coverage RUN apt update && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index fc056d7bc35..f10883c8188 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -16,6 +16,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- +ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user # Install extra libraries to increase code coverage RUN apt update && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 6732f9ec789..efa346007d6 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -21,6 +21,7 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- +ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user # Install extra libraries to increase code coverage RUN apt update && \ From patchwork Wed Sep 4 20:29:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173051 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp438354ilq; Wed, 4 Sep 2019 14:05:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqywCnIzcmnGCzCjyPtebUnodUHDkDfi5EckzfpCS8KnvVeJktt7J6gTuOFMYEkBi0hH4xaI X-Received: by 2002:a05:6402:1421:: with SMTP id c1mr299598edx.51.1567631152493; Wed, 04 Sep 2019 14:05:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631152; cv=none; d=google.com; s=arc-20160816; b=VKbsUg+pNMIugWiOwWr9MFqYHjncK91FeXX6l1elOSwZzLG8pltzJO5lH6KflaBc/j i7KzpEFAJrklvWO+5qHJR+70knw6Tr9xG/3nTynv9DO19GsAomGGzpwxxgFIwiMMlu64 zlEixDOSVjRH20pdfe0pIFDaSus39Rww+L3gsNs380KYVbbqOzj40+3cESvYe91O+VAz kWZVDon3Tz7Tqpq3ZKFtrsiq7dQn9SESO+0s6g44hIujfh2VqOQwdJTdxsRuC8xt5zpt b5OWrjd7IuE2G8NuIGhMHkQN5jx885zMLPiIToL8lsHNAONUUajfVS+JyhHrps3URDfi Rcww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=c7umJv83whdCiZGCt8ZEswrCwowwGFdOv9ulf4HA70s=; b=yes32C8CidWAXUPB0qKcON/LuL1YMIFygSsfAtzG3wlGsfoadGRlr+Du0pbxmyzvum O6s5CjUlJwgLtwktZMUOwGlvCRM2FzTeICzY8P3//OA8iIOE0hWoeb4I39I34+4vmxYx QHl5bqv5p+J2UFCIC/gWwO13d6k9qoSNUgT8U4nZPd/xFkqb4sKEJrGwWbRmGyptcrwy c7/o54LfdLgrO9HBsdUKQndiigWA4h6fKl/pQC7n3Wus8O3TYW5bfpVFCDQkLn6kqMgo f1/9Re5B/qwIujmNMlLpUslkZI+YvS6A0gXgNAqCz874ZVBP2Rgnt/ZxbdYCcX9k8NdR LaQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hN7swSUE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b4si126495eju.47.2019.09.04.14.05.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:05:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hN7swSUE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cTO-0000fo-ME for patch@linaro.org; Wed, 04 Sep 2019 17:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49821) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008Bs-NB for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006eb-NK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv8-0006br-LK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:27 -0400 Received: by mail-wm1-x330.google.com with SMTP id q12so204646wmj.4 for ; Wed, 04 Sep 2019 13:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c7umJv83whdCiZGCt8ZEswrCwowwGFdOv9ulf4HA70s=; b=hN7swSUET8CMhcMsBF2uK99MMexd1Vv1L+Bm3NfzQlhsqkD/4lW1BlD1s65y3BM8b8 7gRvlTA8ZChifx7/bpF7IO3u3E5SmMx8X8WtNipsyrgiSbrUGJUSvtQTwocypq6lSP5D HOQMAA6WX8I7DbBNPI60agdnuYQT++7gTb9+ZB1pitC8gLRSzGw8j1FXJkNUB6l5x1q8 z/EYnRfqTeL2OxU0S98kJIIAQepQXMryYF9vt6+ilq8qP1cUxbjeauVG1wVy1ydmmTpv VQhdp99w/xl+6LOvhjfg2JMhbSxuxnK3bLw8Jtsle5C2cb2zJaYkR4wt3yITKLNrlVSo ewTQ== 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=c7umJv83whdCiZGCt8ZEswrCwowwGFdOv9ulf4HA70s=; b=JCdN95NBDyG08Nv5NGtbMkOXtTGnWAwoG544KhUO3yZIxCm7HvGFe5cQbbu2R0ckIk P9vM2ENwEpuH922y2dUUC21Oj6jrjZ5nI+ZmRHdn5IoKmRxzo0ShM4pgyZs2YwkZtTSd i3DOPsSxb09U5Q9jyByDN3+zpNO6lUx+GcYQ3HBsbu3IO1kPAFpRv78DJYbM6SlMz85R Nt9WW6BkXQdmX97scrJk4T5tAgW9S9u7aZRcX3DtEBoI+kvJMDOEKsFhBFcXy2ML/fiY KawLytOzDGPTeHro8LgQ7sNNw9tmGpTnsdHoy8DbmW6CzkkG7rowqGe8V8Q5d9CozzVq NCdA== X-Gm-Message-State: APjAAAWJg9Z/8mmLz12ERvCoZYuzgiBK9npmON8vxdJ4ihk2yv59yEYt 67hXNSTn+D0cwehU6xLC8W3g4A== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr116237wmj.16.1567629024800; Wed, 04 Sep 2019 13:30:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y72sm280956wmc.26.2019.09.04.13.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6665F1FF9A; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:41 +0100 Message-Id: <20190904203013.9028-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH v1 10/42] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need to add additional packages to the base images to be able to build QEMU so lets avoid building with it. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index cf535cbd196..89881fb5f5d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-sid debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds From patchwork Wed Sep 4 20:29:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173035 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp422003ilq; Wed, 4 Sep 2019 13:47:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8hRP44DDKt/SpSipe5/MZhPmfR0zTAB3aYP3z9OXvqMN/Yt8Fg43/L4hIihYR5ZOpBVqr X-Received: by 2002:a50:f30c:: with SMTP id p12mr165651edm.299.1567630072453; Wed, 04 Sep 2019 13:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630072; cv=none; d=google.com; s=arc-20160816; b=bcPXFavqQanx/so1PEEltBWOf8e29nt/AFlkuG5F4IIdMbG+IIdhifGhSlGK4JNjc2 DUOdxlwk2sa3g/rMsuT4IBSFyEBkndFCdFCM6nDOQ90xiGSfWTtmEjretWbckCGtM1l1 EFEjhjvBc0a0frVxSHB2ygIv0jx1ClhESB5meglO+Stk4GWx4YdsoOKtoeIE4UTIMX6f kzTYB8ISnRPn3qeJzKDbX8ha1JPjNg9EJuACFA3fx6lVG7d2cDl6jP6eNZ1iNmc/twya SJkfUMrK/OiJnZQ1Dd1pVkEux56FRe7d7YsjgzzEPTZKUU1GOJ5cxjmxNt+dAbamWPUW g51A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=OmAMDGUZZIEYuBDeIjfuuC20tNIMcVnZlmnVoAhSov9G3PR/VJGbQ1jXqHY39uXvc1 FQ89QpYrXHzKSaPR8Q0z6DorLeOl7sFhL2Fs4qjtNyKRxXn2rooEC6qav/+EILKHKlHK P59ilmWkXR+tjlrS/mmeGFegSywZxu4SFHZcHnMRmyCEAkUDaIZ39fDzKDFAmPm9XoXv sh0WymssNzAITOCgK03zB0SiA37nTlKetiq9rZ76HIuJpxkJzLt5tdT6dbgREaLAtW+h N15cNCP10Mu3BKwlutY+eCtPq5l6hb6IBd8ZX46w3Xnf4olVRiisWoSR8Zjf+kBhk5jJ v7SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="RoOlX5/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t56si7114905edb.302.2019.09.04.13.47.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="RoOlX5/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cBy-000842-Dv for patch@linaro.org; Wed, 04 Sep 2019 16:47:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49824) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008Bu-N4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006e3-EV for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006bL-Hz for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wr1-x444.google.com with SMTP id u16so217929wrr.0 for ; Wed, 04 Sep 2019 13:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=RoOlX5/tEuce1rgHi/eF2JXXwzwfTUntqM+MZSbyyyZj5UQTRwPSmQ7ciwraxRycax C9Sug2K1OynTgpaSzTWsNvmCC/Ph7IE9Gy2a7ugms/6AmfpiEQ8JtYGbNWLtmwNO0eiD Zm+DuI6FZIlVdNFGcqzfQOmgI2ojW/TZqYU87+WN18zL4M3b4idOuhvoKfQLVj8Ceq2T eOLnRno0gj0xROVreUEzpWnQ9Rf/ehxnbrfLej6k3eNAgKGuyACnZpDXVC5WZcjqJAgo l0r1kx4VsJIg6G9jdAxbV6Ne6AXQE+7LtZAdCXdO/BxmKBiYD/1J81/VWNwG1NqiI9K6 aUkw== 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=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=tFa0j5vW6VXhjPlQHr7F5/J2PImj4ahHUPZuokIU7xFZgRbl8WhIljy/dRpbVl7ADj P5pjWYiHMB9AmfQQypTYocqEev+SBrp4ma8N6Fi1zaE9n0E8h9PMkwTVKOwFP0eK3vTl YZsij4PZmcSga2gd0iYIHPC7Q81XvbBw7blMcTtuA3e0ykNVnirCW28MxrpsUR3LBwHH /IWqy7aUzh7YYTSHMvYmWJl4JITnqnuY/Ej49D0hT8QUS4YntImdXn08mwnksHMB2mos XjlxTq4BebGOawyrUBwLO0ld42IHJqrsfUBhD/shADlPIYpClZpv6LpU9qSI0HbnDxZ5 qR8Q== X-Gm-Message-State: APjAAAWTKHCespDZRdDZO+bG35LXqptdV7tmvF/J/XaUWTAFfFtUPwz2 IZ1lgmoDqtqtfcz2u9GddaBkrg== X-Received: by 2002:a5d:4f08:: with SMTP id c8mr24089975wru.51.1567629024275; Wed, 04 Sep 2019 13:30:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q192sm196901wme.23.2019.09.04.13.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E2DC1FF9B; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:42 +0100 Message-Id: <20190904203013.9028-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can unify our cross build images for both QEMU and tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 5 ++--- .../docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- .../dockerfiles/debian-buster-arm64-cross.docker | 16 ---------------- tests/tcg/configure.sh | 2 +- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-buster-arm64-cross.docker -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 89881fb5f5d..48c22ae40c0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -86,13 +86,10 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker endif # Enforce dependencies for composite images -docker-image-debian: docker-image-debian9 docker-image-debian9-mxe: docker-image-debian9 docker-image-debian-amd64: docker-image-debian9 docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9 -docker-image-debian-arm64-cross: docker-image-debian9 -docker-image-debian-buster-arm64-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 @@ -101,6 +98,8 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe +docker-image-debian-arm64-cross: docker-image-debian10 + docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 6b59ef0843a..55045ff5d5a 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,9 +1,9 @@ # # Docker arm64 cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian9 +FROM qemu:debian10 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker deleted file mode 100644 index 52787edcc2c..00000000000 --- a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker +++ /dev/null @@ -1,16 +0,0 @@ -# -# Docker arm64 cross-compiler target -# -# This docker target builds on the Debian's Buster base image. There -# are no QEMU pre-requistes so this image can only be used to build -# test cases. -# -FROM qemu:debian10 - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - crossbuild-essential-arm64 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 5f794b664b8..2a351a00048 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -95,7 +95,7 @@ for target in $target_list; do case $target in aarch64-*) # We don't have any bigendian build tools so we only use this for AArch64 - container_image=debian-buster-arm64-cross + container_image=debian-arm64-cross container_cross_cc=aarch64-linux-gnu-gcc ;; alpha-*) From patchwork Wed Sep 4 20:29:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173058 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp445098ilq; Wed, 4 Sep 2019 14:12:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwnUUiG8bCk6tzBAq/LTsMp2s12uOlIWAI7T5xinX5IkgZVcjFSLzlrGQO1MzF6vukjCPd6 X-Received: by 2002:ac8:2d2c:: with SMTP id n41mr80645qta.335.1567631560673; Wed, 04 Sep 2019 14:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631560; cv=none; d=google.com; s=arc-20160816; b=ihq8Opzke0231GVHzDP44YGMR9mUBtMH0hN5nrQuVl2ogyfEsWuS19VC9jdj7aAtCA w081Is8qtVJklPU6l0wW/0n4pAih8ZVYT1MoQlVX80YiN9O3yz0gTmFf1zn0pMAjlyql D8rKfSpfwJIkyxPZ1Qwc2K1ilt2PT/Re0CsrdXt9iy7uRjMYFzyenY1k2zqNZo1uEjrF Jnhh9Hh/GvZVD8qTebhuvHSl44Z8S1sQAHEXr1Fty4lwJeqlqKov0QQB/qBShptsx7mn iP01Z6FzXRs57TYVDHFl6ixiiR/ndqgvtr0nFiR2pqrvfNdzCc2GlVQ3BXVwjP2B/NkZ fZ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=e6/Y3kAQfcm8gVLpETkbTd4pLX1/IhY8SN6s+VJNHc8=; b=uuqMeVpmKtB6qYNxODd2hunwVi3AazKp+vYGaNY0g5sD5Z9KGFXqwcBdP0UPOIGaGf fYyGF7s73PITnU0W0B15PpYB2wvdi1z6NWQ5SmHcQIjEEzvX4XFd/Zqz4OFZg7R6POjb Ta+TdFD3AYWH0Wtl55th5JPawCsw5PKNcWzRsFLo7t+Z/W4LnvigUjTq3WieIfCGqyZ3 P4rreuK4fo4P4a8HOxUCQtV19z2bcwEXFDu5arbMb+XzdN3mg1zABjcpRcwseaNXFBTH xPCmqXggBhPlYbpAmaPZtP5rKiMf/GbOWFMCkTif7oqGDIruJzw/0nk2hNNlf33qP24t xuCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dBfmWg8i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j34si78895qvc.190.2019.09.04.14.12.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:12:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dBfmWg8i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cZz-00018P-GF for patch@linaro.org; Wed, 04 Sep 2019 17:12:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3r-0000pD-48 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3p-0003QV-OH for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3p-0003P1-Gq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id r195so239146wme.2 for ; Wed, 04 Sep 2019 13:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e6/Y3kAQfcm8gVLpETkbTd4pLX1/IhY8SN6s+VJNHc8=; b=dBfmWg8iDm06KzYx+P55ql8aGiWC6HgQ64V3E1p1USBHf9V4jqszn3cl7A38xHlecD Ab+KpABJymTztogcdKmgZbqZ/gAg/ufp+I+YtVYxAoQElAGjBsT4zRYjcalDrBhA11Vg FogCMNe7pNLlmtTndlnp9XmG8JdibMYlgjyKP/mO6JHtFtSp/trm+NV8T+oflmOgESZj aYGhlbHKfpH+JOBKfqQWYQDBGe/09rhWmfAz1VmQ0YxpVTtUv5MPJtyTDcEQA9R/khmO /LkvK/tAb//u8t4nSHyBmpVWSWLv/QHcfEa2WUtpeV2WBI5MUm99DGTcOQT8Vn4cc4/m zdsg== 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=e6/Y3kAQfcm8gVLpETkbTd4pLX1/IhY8SN6s+VJNHc8=; b=NCNxvJhhjfZ3ah+fVlekAVXEAWi+ZEQjpKVLn1HmfNl469HDcrwNOJgjkRSR4oWg6/ eQuqPM/g0yRwxJwj0EvO1sb4zlujMBBHGYJOp22w+YbmjJjw/aAzM5lDMjD5SVKMv3ZK XhVDZkn8b1amrbA0EI42me0ZtxIZai1uB+QrfRSZeEfivY4/sq6/XbmWFd4kORd0tyMU TE69gBHzZN++JCNaugDQ/b4XzekyvjFe4huXWX3rS3+KQFNoDCKPCu28wFaJshs7iZb6 FEnqvWBF/t0/Uqp5cu06FoVJyivjRlnohrSCfnVhhAMo8ZKKjdW1hhKVFGWVNMkganJ0 NdMQ== X-Gm-Message-State: APjAAAWSF2XZe9GTTbjfN+C5iAqOC0JBhcGhh/KCG15p7+Om+/J36qr6 RiHPh/kCrTzNmZ/Po87MvHkN9g== X-Received: by 2002:a1c:9805:: with SMTP id a5mr99928wme.119.1567629563654; Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q192sm248460wme.23.2019.09.04.13.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 93FA11FF9C; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:43 +0100 Message-Id: <20190904203013.9028-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 12/42] tests/docker: move our powerpc cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-powerpc-cross.docker | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 48c22ae40c0..7c1ff677a13 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -99,6 +99,7 @@ docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-arm64-cross: docker-image-debian10 +docker-image-debian-powerpc-cross: docker-image-debian10 docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid @@ -107,7 +108,6 @@ docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid -docker-image-debian-powerpc-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker index 5d08fad7cd3..89dd4fbf870 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -1,14 +1,12 @@ # # Docker powerpc cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. The original -# Jessie based no longer builds. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } + libc6-dev-powerpc-cross From patchwork Wed Sep 4 20:29:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173039 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp426985ilq; Wed, 4 Sep 2019 13:54:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcA1sAzwJQ+GwWcyyiTp4fLEsndCnZ5B3x4Yax1ElO9jpJI3thsRWDnWkyEOB/nj1bSLwM X-Received: by 2002:a37:ef16:: with SMTP id j22mr14861282qkk.198.1567630442950; Wed, 04 Sep 2019 13:54:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630442; cv=none; d=google.com; s=arc-20160816; b=JwSFeV4mVA+tcOHkmk2/6DXNpGW0kkYcoHLAKvdjLVDwEVx+oyBrSUKEj/+/Po+xb6 7QcDj0MZjVDqXxTbbSiFeWeoHMv7dvBZtv1vl+S6YKsXtAgdY+P0X5R7/Icxtd9G+s+N UCQBh0h2NAuyUpYR3M0iEZUx4KGydWFdMBkglWl5AnqXfXRYTcV0QZkv5zOAQvajtzXC bRYjbUwNFK/nqzfUM1iYnrffnVyD7B8Qczh96aO8gl4hgMMGghDTVDRlGF7YbNJN+60U Yv4RRGdSHjgKSpe3QruKXOlm6PMo0Q0C7ZT69rk61nuVf6f0W7mIjuaWBlKnn0qqr5XQ pFoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=DJNOak01VaYIVfmTkJLzi54b9KZZCFhu5sQw2igRPWk=; b=TqzH45XpAQG3+p+LWXxzSsxIUObYZYy7w0TANyxPS9ye2OjeMfJp2mUC1/ixHnDzya UROVTTHwxboLJEvknYDKUccj10cPz9nRmZtrdg7O49lE79XmDLRjT45hXt4A00RQqRP/ JdjJdPGhfdCQht5doLMA9zDdCfwp0KAp9qa0/RDGmjG/FRd53v1umLZ3ergmp4hmNDFF xDKsF05GqWXELAvBlMBPUBbuPsn6dCwmQcwrQzmzWCZTUFwrhuf/q3uSd4a30yoIb9wV gLBCMyXRzCdngHAEYQKxzdLKhhS9bC1XK5O0eKBO0/tKpQPKEdfPOIJXJoMvfW5+7aM/ Wu0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tvSR6OPt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j6si110047qkl.303.2019.09.04.13.54.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:54:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tvSR6OPt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cHx-0005BV-LB for patch@linaro.org; Wed, 04 Sep 2019 16:54:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49899) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvT-0008DN-9R for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvJ-0006k2-HR for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:41 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bvC-0006fP-G8 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: by mail-wr1-x443.google.com with SMTP id y8so163853wrn.10 for ; Wed, 04 Sep 2019 13:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DJNOak01VaYIVfmTkJLzi54b9KZZCFhu5sQw2igRPWk=; b=tvSR6OPtRKLc39xyC7NzcaqJAmyLjTOuVgvJyob49BwwDpSg1dAgt3qPi9J5uV1WNC g8oEzKqFygoRcsGcRPw3NSbrpqbtHv/KECDl5FH+vh6E+rWccP7UHDrXR61TuIjPDLoD fwxcAScIOO514e1uKg+WojMei904ie7HIUWpCwjE+0bvHbg/T1CwzWqpmTMFawZvND8K oJd6A9AeeOF608EGuFEx9VDb4hqcM0rJ1lrBqUX+TqVMKrpOBNAW3vlYDRoldNMWVbsm sVkoRe4rOx6bcbkFirnL/kNLxWErIo8bHehP3M1qGiFEM0TKkAjnKndXK+ce35T33PnG ISDw== 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=DJNOak01VaYIVfmTkJLzi54b9KZZCFhu5sQw2igRPWk=; b=QyPYn9R1f+RwDbuPhyf2KmSY3Twz4jWtKyFGX7+sxMrqyW/xiCMbCfruGHHSVxBSm7 ZbTYvWHPurg/O4OTKQGf7R+E/9g7XD9v2f6ILwaxkForBGjj50WyfcacUjFney+Gc07R OyjLWrqonM7o3WWKiE6GlO/DgAM6vBIllQEhwlUQdPyp/Mo1CksfktubimZf4GI4cOhF MQrC8Y/2/MS5poyTpRaeyApLUR++kmBb/qTWJ/ZrsJDEpGNoYi+yeDV0VvLgzNLF0v5C iNpEyZexQ+kz0DhaLaiBWzgKf0ga7P/7Cy0V5OaEW30nmZEMiJL0qjAzLN+3yONQy/mL qLxg== X-Gm-Message-State: APjAAAW/t/yZxezj7pUHvCcuUJbOgufELBXbpg7XtyR8h28GLJ7k8UTA TCXS1z3yRiHThZb9PeNAZggOxQ== X-Received: by 2002:adf:dfc2:: with SMTP id q2mr22967813wrn.307.1567629028452; Wed, 04 Sep 2019 13:30:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w8sm5467058wmc.1.2019.09.04.13.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A91C81FF9D; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:44 +0100 Message-Id: <20190904203013.9028-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v1 13/42] tests/docker: move our Alpha cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-alpha-cross.docker | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7c1ff677a13..e7379f1d732 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -98,10 +98,10 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe +docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid docker-image-debian-sh4-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 23444342f03..74bcabfdb12 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -1,13 +1,12 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } + libc6.1-dev-alpha-cross From patchwork Wed Sep 4 20:29:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173056 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp441760ilq; Wed, 4 Sep 2019 14:09:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqy6cXCjIj+IrFvewQv+fJqk18Bzuofhlnonuzf62CsCR9VOhNweTLiIYJ6RWoz6UeS+1YfJ X-Received: by 2002:ac8:2a75:: with SMTP id l50mr86099qtl.137.1567631366605; Wed, 04 Sep 2019 14:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631366; cv=none; d=google.com; s=arc-20160816; b=YTWw62oJqFAlyuB07Tyo49kDnxyKNyOl1fYmq4+MWUy+4kYIUs22gqS11akGnjzTcr 5tnpyPek34illmJzJ7feX092eCywUvQ7SzDrJKmRediPBKqcliCb3oU5/vZkr98N8kM+ HU1vweE82NHMA8Eq4lwz4tB6z9fBjgBZ1HkALgVqMMOywXiDhNJR9MxiufekKGAmX0Ak Kvw/ndkAU06wVgooLy+H8SOrTNicV1B2YVQVN5DCt6PmKzk9cdNGxLu07GSou2fv4FZn sT1Zs9Opv5Elgtc8Eb74Uw01u2nsXXbNO0W3R0CFHkxzgzpz9KQ1LuIhatbUXIMjUf7j Ejgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=zh8cJOMlQoU86gylTdnIBMbDSjCDSeGhH9/trBdCYUA=; b=Q4ISk+I20yXw58ISyK7Tia9h9MJbrNw16q6Fy+7EmxCN10XyLzF7zvMezZpE4oTh4x uX5fwFoRcamU+NMW7neEBrJ2QU6ipNf1hQXmkILY1r/UEQoSMdrjxSn5q3N1BhwDP5kP apklPVkPGDbyyM8pPCh0OawyHA5iQj6V+GImRBtLMf4b+qEDdCCxyOXAtQaOUHX5wql2 dvKxvNNXnnGpRYkX1l1ljdBeWmbcPElwJyYHZGDGikdkDhcAg+m8pQpai5KqorMWNU7V Ub2oWcs0QsnhqcVz2Rtc+TdRN3QLXNsLXkdF39BuqWdV82r/AeZyBwriibkMownhlJS6 kdbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gOav/tuu"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k32si75680qvf.157.2019.09.04.14.09.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:09:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="gOav/tuu"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cWr-0006Tg-AT for patch@linaro.org; Wed, 04 Sep 2019 17:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49822) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008Bt-MG for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvA-0006f4-FX for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:56318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv9-0006dL-Hz for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:28 -0400 Received: by mail-wm1-x331.google.com with SMTP id g207so182165wmg.5 for ; Wed, 04 Sep 2019 13:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zh8cJOMlQoU86gylTdnIBMbDSjCDSeGhH9/trBdCYUA=; b=gOav/tuua1E4hp8ziE/1je/+tdtkNkgZUpWFXm2jAFqUB5HsZLjUd0GZRxVOZv1gm6 iJKaKaGzuY7EYwN8A4Ks8dIu6v1s+fckqkZqgKR51m5u2alDiKU9z2ptwG5FfOxnq3zi 40/v+4BDg9Vw0Jn1qVl+xht4HPrqsYNo5JfL/qobiaJLRHUwm2UAQ/Kh26EsaTjsbNZW lwXoPHDMvP8XOBMtCbqSQvwjKBd5S6IKEMccFBsf7nQCPzRfYTlV9bZEphWgRnRauGe1 sq+e48t+T/9ue+4UuuJlezWPaDFYtERf2kpotGArdxgKzzaC3nUkTN9FOQoDIOSJPfZL 0AZw== 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=zh8cJOMlQoU86gylTdnIBMbDSjCDSeGhH9/trBdCYUA=; b=EtDYLzF5z5xoz5Dm/9kvmUYIwaYJ4JmFSV3x4EUrbLZ0+La3UyI3//aHSlaBlScFIT WZcfKY6cIyWTfjvv6KnNsWbKWWY3ifZq+i9NOpovV2dKzNAl+z9bHkQ31jf91W9CwbuP o5qtQ8+npLmH7KbBtqCHIgXOq8JS6HPXE6TysJeqy++S7TpJ8X9aGJc/a0jTjkqcTQt4 oxyi10uvzvuJZcffLWgmRmgXFe7CyZp48sPq0k/2WwXZ3kDm8z7kC1ZHFrwMueqXXp8O x9N9pniV4wDrPJmFHBsJIdvjC+TW0HspJKCFB6Q0zQAe9VkSnZ9CHx792BMgOlqyKxfL 82og== X-Gm-Message-State: APjAAAUSTmUae45jtZin/4ZTJWs8ukDWM406PpGuta0dTnFjOiEytRX/ ny5t63ahAQTUcriunfjNuSgr9g== X-Received: by 2002:a05:600c:23cd:: with SMTP id p13mr89932wmb.148.1567629026315; Wed, 04 Sep 2019 13:30:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b136sm130137wme.18.2019.09.04.13.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BF38A1FF9E; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:45 +0100 Message-Id: <20190904203013.9028-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PATCH v1 14/42] tests/docker: move our HPPA cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-hppa-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e7379f1d732..ba5a624eaec 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -100,9 +100,9 @@ docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 +docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index ee6d9a24ce8..5c68b2d3304 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173037 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp424919ilq; Wed, 4 Sep 2019 13:51:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFyzcFt3lJv+ZVHoRe/u++OD3ZXK7EoD0/PzrrhH61I0w8BAo+uBCgxlC/AHqO5dBYMg4r X-Received: by 2002:ac8:5197:: with SMTP id c23mr61214qtn.70.1567630289868; Wed, 04 Sep 2019 13:51:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630289; cv=none; d=google.com; s=arc-20160816; b=qU9Y76ZX2IKBPaJQ6IeeDtHEnT/EyeE/YBMjXhTj17nQNbe/YYr9sCSvKI392fAlf2 Pv+qIQ+AgR7mrjYgPRtktmy55FhgK/5mjYtbD6HiyglzAB4FNwKSoBkGtuCzrzG94J7q gaeQXNhFH+I2HVKlPN6aEIu1wrq/NGc234X5TMIoQsJ3kmFKmGoXRNnWLwka40J70xAu kxFtUnfJdX+dwT/6cyxRSAjxbPw3zCd8NdzvZNUTm2oKoC0hVw0pdfl/nHBFJuCcHFRi //UXiKmg7xbR/iPGi0FbfOyPbu+zRb8Yd39FUKA4WvOT1QJITJVP3csHMfwfi4Vquc5m oGvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=P/I2OnZViMdHt3FAidu0SleYqkts7IpxERv4eYEqeXc=; b=eXTqlJAkRn4HqMVf0BFFic6XDVD0CvkfRt26n0WV5DvrXnbcGcAwV+DJes8ahhf6Dd C4FWdbUb+xIo9yl2HXll3aE/Dw+EkzrMBVI6AQgWO/IBXyNlcnr7HAvgNpuDCbRkyezW UWY+v1lszgQV8r+yhildkZZyVOg3Mqq501P39GcyLaXg4m+5IhR/m7No8aal9Jn2JJT0 HZSo9/rLKgzfeli/cheL4PWw+rlRhTiaIGHq5cG/JDC8udOfPQX8+8o7HdqEW/HVmXH7 2/uf2w4dEnQTXFuPtS+Ww022wsXZCAt5qS35omK1Vew8PNfkmLMt+R73FYb0qT0hypjP D49w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="PCX6xUy/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v138si95429qkb.355.2019.09.04.13.51.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:51:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="PCX6xUy/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cFU-0003rx-Oc for patch@linaro.org; Wed, 04 Sep 2019 16:51:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49833) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008CE-RQ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvC-0006g9-NX for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37678) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bvB-0006er-Ee for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id r195so215296wme.2 for ; Wed, 04 Sep 2019 13:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P/I2OnZViMdHt3FAidu0SleYqkts7IpxERv4eYEqeXc=; b=PCX6xUy/9pyy7C6kxmT2gz9AhhIZrXdeu1D+vBoSOkzU1iA7E1H946AqcKNgXQ4VZw x11wB+sGwptYNddX+N9rKIHzN3bY7xlMXr6XCKAc0gKnuH4LvOadPCWrNaM5WuGbfx+6 9IgnLjnNuvKLnkXKpsjSaj98iNAeP+4jk837pcVTp3VDQLTyoYfgsR1bGUxsGq38SxnW yba/xdJNpGuv6U9TaC0I1tpRu1ry4wq1sXLWx4F9lYHESs2FidOY6J2VyH9nnHSeI+fc EZxS4k5Qvry69r0lPi2jGB3kf73NVgLf0xL/JO8UFmuw7UC83YoTek3SnbJ/RymVLj/7 7YCA== 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/I2OnZViMdHt3FAidu0SleYqkts7IpxERv4eYEqeXc=; b=gd10JdqmZN7lz3PyelT4IoCNbqsUVp2HT9ze+Hdk/asxcq1YN0Uh96cvvdcdDpt84k g3/RIJNkX3zVegJlzbApt9wVe3nWQDZJ9ZY3vffIQCbTSfV1ko42InicdkRH/C9rBqlw APMqOyyjfO25vtFajq+ssjdj9CvUbkYHZQPeqG7/JzqPZydnW1jGYu/lUulDgMwhPYMD 5auCWN0c9fUg7G1tkcgUtygRl840nflsCSB4OeaPJX21blxQP5YpXWehyEkL75lQRNSw P/MSefF7neSuM2wHkMxVoczss8D6tl4Xt629W47uMOKeHS0BAulLkNtATsA7izhseqYE HBWg== X-Gm-Message-State: APjAAAVE7xPTfT/VdOJkYNnCEqO8J65+z3ql2kZwHsOsKKRFQVtxtM4d 64+Y3inU/PnAtOCEKq0HGMjlgg== X-Received: by 2002:a1c:9c96:: with SMTP id f144mr111670wme.96.1567629027460; Wed, 04 Sep 2019 13:30:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm31755302wra.91.2019.09.04.13.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D5CBF1FF9F; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:46 +0100 Message-Id: <20190904203013.9028-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PATCH v1 15/42] tests/docker: move our m68k cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-m68k-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ba5a624eaec..62f2733eb66 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -101,9 +101,9 @@ docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 +docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-m68k-cross: docker-image-debian-sid docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index 4311c9cf86d..25edc80e9a3 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173054 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp440835ilq; Wed, 4 Sep 2019 14:08:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqy675/c8ZlAy+rZnM+V7DHOXkq2ErQGcxQSoV46aY4CnVEqMbqypqixRb7M6anzb7nY9Pmh X-Received: by 2002:a17:906:d9d9:: with SMTP id qk25mr40424ejb.275.1567631303074; Wed, 04 Sep 2019 14:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631303; cv=none; d=google.com; s=arc-20160816; b=AYUD6fZX1X6trJ0v7bflK0P976T5eUzqKkefgdN8zDolBgZkhu8F+0iiLJdsBjZXH1 IqvZKRqjzym48f4BaN/DIctco7sZVZwjA9kdjBe2vRZj3O+WUcQFKWILDdQ8nWVE/fcn NE/YkrKNwTAbnM0bDKX8o14qUQyEkpzZx4OaSXJAmX864nZiSGgnnIhV3Ttf17sQ2dnt le9m3ZV60nfvcHheQp1SnU+x3VkEs5XxnHUlZCcxgNiuJlIHe8Km0n4aztE8nkYldQl7 4CK5E6zwOqVvvTdNB1Lai4evT9p558j1l0byexX35Usw7uCO175+xf992tBm1fBiRpCI e9aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=qKk7W/OkoQyoVSUhxE+KkbmuWnbPiA9cvGBg2KVCJvo=; b=e3W2rXSC+LPQuZ6OJRsL96EimEgHT7kesVDwOiBcw3SFPaWUaFEsA59kfIq7zov49S ZatY3cK5VnrF7vJHfLr1eBImeSwxZk5qWiCR0eowpSxjBlOKPsUNgdlOBo+UKaVdCeVz PumKsI04h//xyCsTmK6K5qRItUJ8snqR2d9r+lxb5DT5vgHYMm06UDNwTo0WaWkSpjMc KqpfxZAdTZvR0V+g6I7Qi5RPxCydu5SUJJ/4Uz47BCjy4GNgGxBX+SkLE+qx5xRJMwGY 1rzedE5beqYsp54Dsm5e73qFhI+jP0D5n9hioclE+4kpk6U3i7q4ihVAOTqu63O02Bx9 uwBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=d6sjbn8D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l55si6016870edd.31.2019.09.04.14.08.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:08:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=d6sjbn8D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cVo-0004Jr-SB for patch@linaro.org; Wed, 04 Sep 2019 17:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c40-00015K-UC for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3z-0003Zd-KP for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:36 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:54159) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3z-0003Z8-EV for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:35 -0400 Received: by mail-wm1-x32e.google.com with SMTP id q19so217414wmc.3 for ; Wed, 04 Sep 2019 13:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qKk7W/OkoQyoVSUhxE+KkbmuWnbPiA9cvGBg2KVCJvo=; b=d6sjbn8DlOEmacWGSVqP0Ru5XKQKJQpxnq9U0KZQl7Z6hzFA7qlU1Jt8DAJEJmPUQr MW7kqR/f5dYjLrAqOw3wlsy8URXLxEk1wh8EnaMPFOgSBWV4nyuhh3Dj/Oq+L5OG90n1 1Aao3w+9sbL7Jr/VkMxDv9fZ6c1V8N2x8k7Khdz+LA/kZcUHq2sgyjypjc3SESJurjDp 1UODrzcBD1DMepgu4j8cKlp0HcvCkU77/KUoNGB0Q/Hanqa1N5DG92Qy7Gv4DtzT/ada OFkyUXk31SEwOu3Y0KGUeTUHbawEV1azeP0pkRUi3T4xIjx2KLmRaWDP+NJDC/EPxf53 rMow== 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=qKk7W/OkoQyoVSUhxE+KkbmuWnbPiA9cvGBg2KVCJvo=; b=ghEtto5d98D8Ae95yRIWKK7ed5v+rB0gw6Z8Ep6ImZY9cZ7t9WLXWdNFxw49QDBffE NNkDJ1QEWAE4NFwjQLnsE+Dt/Wx6JdIMdhW2fcb9YP9bo7aRLhA/D2BNCRDARf6aygTb GBs/CWgjcH82OJlqhA/gvVJXN0MTV+qlWpPQdoryKp2GrpYfFrxOOv2sduXM49ZL0BCg 99HLkF11qIw5aJMmijqK8ccfTMtdybEQ0Pq7lvNiPdEQz4ALgfOPlNFsgVGbC6pEiKO+ J3j10W12IduMKFJdDIQXAswVSRuePGmMaB+xRFnc5i9z20WbYpFG62Miv6AHdsKPcF55 tDaA== X-Gm-Message-State: APjAAAUWvHsS9qDDJXMI7jHms8mXsMGkZyrGEBANVhgromAb1Hm/YxRw 1iEsErfKSoIivMe+5xhBbNJ4vA== X-Received: by 2002:a1c:7ecf:: with SMTP id z198mr86274wmc.175.1567629574472; Wed, 04 Sep 2019 13:39:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j30sm528393wrb.66.2019.09.04.13.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EAB461FFA3; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:47 +0100 Message-Id: <20190904203013.9028-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH v1 16/42] tests/docker: move our sparc64 cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-sparc64-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 62f2733eb66..50c5e64212a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -103,9 +103,9 @@ docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 +docker-image-debian-sparc64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian-sid -docker-image-debian-sparc64-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index 7a2c2ab19c2..31fd34f120b 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173041 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp428832ilq; Wed, 4 Sep 2019 13:56:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEOHPQ27QB091iiLykHOvS/FgeZXtehvDxFC9uWjQvMpJhIxBE4GHFkKbA9/C2C6WcE88/ X-Received: by 2002:aa7:d0d1:: with SMTP id u17mr237760edo.99.1567630577970; Wed, 04 Sep 2019 13:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630577; cv=none; d=google.com; s=arc-20160816; b=uJOkCbXiRf1Kwo2tcjvAOremlkoE2TZea6Ldb3efDM3OVUyXYOFf1Y1NRCuZPSgfVs kMdqTqDabUXp0RRQMgJkKHtaa6r6giFjgj2kcWdqJdhyfwEKJ1gfPnns7tqwX6Dd4jEk 115VtbUlKFp27m2hv4k5f0c8fm/FJD5ydZaOOCDmkMe5p9+K7N0Z8M1UAKWlY4PH4yOp EkMXZfGe5XtPBW9bf7Sn4kjumYIo9l7tS3H3Hd7hoQF4eWtHp/5tZyFfYpxSjx66YYju AtOs+qgYu4vnZqQUoFmX5dGaUUMSUWdv4tzGFXgbInNleg082OruwfReBbcZQdeH/sJ7 jEwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=a+GIa0BNDG6/Dqc09MJyrBtI2tjBB0sKr2+tPxT00to=; b=W5vYefHcFcIDx52lL1jwf74JT+cF0ATgT0if+8dSKa9D2Cw35yscJNcPh++Nnc43+W XvY9c1Vk0xJXooiHVGUNNTysI+tPKtx/Ejhr4SlHNrFhA85fpHzGKKsgiC3lFhJ1Fosx /2RpvofPX3a9b6SW1kh9CBMiIo+EU4pkmCCl/D+oVlLFu/uAaZRHTkh8gt7Cvil1K7b5 Gvc/nnC5nd4v6YjkThXFcphiRY+SeyVyrX7ylI31803Oym3ZOa22qtpiQ2EHE4jmlT4w NQUNeeXBm/aWjyiE+R+1nDcHlv93E39GuD5dUVl+5XVfAvAwEAeKz/H9V0+FTZ5r1eap LfAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="X/GcwSiX"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id lu17si100538ejb.146.2019.09.04.13.56.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:56:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="X/GcwSiX"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cK8-0000SW-3z for patch@linaro.org; Wed, 04 Sep 2019 16:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51580) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3v-0000vK-Cw for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3t-0003U7-UX for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:31 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:46212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3t-0003TU-Nt for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:29 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h7so169706wrt.13 for ; Wed, 04 Sep 2019 13:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a+GIa0BNDG6/Dqc09MJyrBtI2tjBB0sKr2+tPxT00to=; b=X/GcwSiXEqGZOpL/Cc8ROh8kd37pNJMxOPNTRgZDaVfh0U/ipmWgMYXsDlzOfpuD2c yg7fmRQmj7RKGP1FM2RVvTZkmYLx+QauQV93AvjTMXzeAHBnYK3kDTu/w4okLeaEjnmp azOM0Jqm1XW2qG4o3+/t3QWxGfgK1XwxNStz/UC+fSDIug0kh1wWl9aVbpl4jiClyJbi NCLQFW6vDIAf9HF7b7a9XJCZTYSwzz1k2erh5ztgAOmh1PUU3ImzGPyGditAGo/p0Lu2 OD76u0XxhZyKbfssZ+fmVNAfGfJuYIKmqOpC8cCxywtjQkLuq4Md0PpnlOUS+IKf5klN 8R2Q== 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=a+GIa0BNDG6/Dqc09MJyrBtI2tjBB0sKr2+tPxT00to=; b=HQyqzzAc+Dw3BGPlreRR9tvcwyQzRNOZlce7xNdX3jCyQve1AOhkvk/m5EoHYUW8TB EOxt47FLtdJyttd2SdPaiL9AbpibKKPEdgfo7MxJZXbY9XHDeh/+RoA9auKAVcF7Yo3B iCGktlp0kBfuenYhY7mefTMWdrmPfcCMy9kmYz5P1TwzW6pf231Z5yso4B5tCRygh1Bc ymZ4mS+jRzXG5Um/RxLSQN8ez2fCUH9qAWn78PH85H9LsxcsQx7dHalXi1zRDp94ijnT 2Nwa1TuvJfqnBlbQ1tj+751X4ZgnW0greDPQY+caMQ64Mc8QM1tnaIe5FhtZrnanMY+f 9QOw== X-Gm-Message-State: APjAAAW/MB4ZkiOpzg4J4iLP9Qo3kH+WLsOsqg7OfZ30bTUntO4hwgMS 41k+Up35yOAxs+Gj23FJUafc6A== X-Received: by 2002:adf:e390:: with SMTP id e16mr2585833wrm.29.1567629568663; Wed, 04 Sep 2019 13:39:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x5sm20483706wrg.69.2019.09.04.13.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0BFA01FFA5; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:48 +0100 Message-Id: <20190904203013.9028-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PATCH v1 17/42] tests/docker: move our sh4 cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-sh4-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 50c5e64212a..e946aae14fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -103,9 +103,9 @@ docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 +docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 -docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index 29983b2d75b..9d7663764e4 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173101 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp485827ilq; Wed, 4 Sep 2019 15:00:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjYXFyxxsXrWCYvhyNj7JYM+eLgQR9i29O1RT3xB27uA8CRIuddhu9a+ekRGe84EbXGPHM X-Received: by 2002:a17:906:65c5:: with SMTP id z5mr208645ejn.282.1567634413419; Wed, 04 Sep 2019 15:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567634413; cv=none; d=google.com; s=arc-20160816; b=FOCgpszZ8pGBh+vfLPZImCOb/pwURPuNP2yQwG6o+qOCUaG6CRrOIBxq+DOAIrPwiK OTzGuQX893YqOxEBv+hPdokGzrXIeHE0+rOw04IVYq0IUAHXFajCNuO+5sZaF2NDgGmU rB7AEthfg4QGNy27inxtjSSOceS5kHE/ILRvkCvsesNz42xDYISuMwsL1XilY4hIGVk7 XKnLEl2gpbBdVljR62iT8htCRMGV9TZoPG7Tpy//gFuo/lPyn5ssKhYZjqd9rf++b2Ms fbO3YM7sbeM390NSwLP9jsbLfvpoqH1XM7wBnXoywMQb2m2y0mtXGNFQDjxxz0gCg2t4 lZKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6gFtLJYtViu/bHjCP6AP8cA/3kIHosahflHgjIy5jC8=; b=MXH+sLKBz7Ti5Xcuh5sIYsPxknyl1Ts3gOnge9v5bnxMUA2nzie33N7e5ArKuf33rT 2xfKIx9+9GuD/Jaylucicy5DkYwK6ASZvXF+BsElSeZ3F4cBDBLaoPB6uA//FUMwTorr /NVF8rui78UewFP135TLNCTuGUbHHXr+b5Qkx4SM6GG1p1Jlbu8JjEl9i16JY2ZoUU77 bsOUJ0HmI6zqkAYBaw8Ae5EyHads56CHM3De9vHEblInEBjOcKHey8BGgLtpMlUy6P39 twHBOURuKsxpZ/EpdgvaGRnG4qGgFzyaczpwS+C/NCl5SrN0FV/nUmNIp8PvoFUGb2p5 meTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k0UI2Pl2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m8si158237eja.392.2019.09.04.15.00.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 15:00:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k0UI2Pl2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5dK0-0001us-AJ for patch@linaro.org; Wed, 04 Sep 2019 18:00:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54194) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDZ-0001ym-BK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDX-0002TA-RW for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:28 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDX-0002SW-Ko for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: by mail-wr1-x429.google.com with SMTP id h7so192202wrt.13 for ; Wed, 04 Sep 2019 13:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6gFtLJYtViu/bHjCP6AP8cA/3kIHosahflHgjIy5jC8=; b=k0UI2Pl28IyQeF7qy9IzVIxo42t71MDZ/qdAbsaH5u7blaVGZa//8a1B01SKVIMMSk x/isVpimoCPrLu+LIVNiSKIS6DUhXEKrsm+S/uCkXQogoqJag76wXIQCpOP2dESZwPyY bhYOdu4oLeLjN+TYMEokpO3qlC2rAQYel2G/C12/oHtyGW9izPHdFaK0/6yXJe28KgXN Cfh1WIX1+cKxrLIhg7xQ/aaCLygOfMUUrEf0Hqnlu2HQYDRt5wmvJ7ObpQlzSAX0uqUM pEHo0PIG6m8aQf4HANyOTUkVf3K4eQOJF/ZEk9aPf3mynqGXZTLAiY85Xcy9Y/GzMS+R GxEQ== 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=6gFtLJYtViu/bHjCP6AP8cA/3kIHosahflHgjIy5jC8=; b=ITMCV+7/8KGYr2obaQ4T83ZN0wpoEVk4GbqzzjL3TPCfCjInXbp0EXcLBl8a97ozr6 IK/u0TUeaKGe7LcwfuHHIGB9RGAon1wCQ6MlUBBQE+aRnBD4GskuhQh/+b6lsEdpLWj/ cj1rRGmJjOoWXrJTSTUzyuyKBkFFBgzH7eytBrW4PSdGkMaVY0DzKRAjq+zm3EOvv+66 ayATpaGo3P2CQzhPmX+texsdg/bH4RCbqyA/7I1GeWr4jIEjDcmyWVV89vee4VrHqj0S SwZuzqFA5ZctnlWllWh6jpvzGF/W2kJL6sefsHb8d0lNlC/Dh8LTS+M+tdLg7s8gdVSf 43kw== X-Gm-Message-State: APjAAAXzJnpMCveMvHfcLcrECl7Vh5UBNDaObP/LXWZ1buLYKrT7A/AC WpnfSdzldDvoSbYB6uRy5dHbXA== X-Received: by 2002:adf:ef05:: with SMTP id e5mr20279135wro.127.1567630166559; Wed, 04 Sep 2019 13:49:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm30367775wrh.28.2019.09.04.13.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 220551FF8F; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:49 +0100 Message-Id: <20190904203013.9028-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PATCH v1 18/42] tests/docker: move our mips64 cross compile to Buster 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@euphon.net, berrange@redhat.com, Aleksandar Markovic , stefanb@linux.vnet.ibm.com, Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-mips64-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e946aae14fa..896c1c5a601 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -102,11 +102,11 @@ docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 +docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 -docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-debian-riscv64-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index bf0073a4662..1a79505d696 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173059 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp446084ilq; Wed, 4 Sep 2019 14:13:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxktT/vVm8xoWpUxH/ZE8TThpLCinNIBh81y2ntcfTGV81GeelFvvYIOPr5LElyXXCcMJ+n X-Received: by 2002:a17:906:4708:: with SMTP id y8mr90639ejq.204.1567631626849; Wed, 04 Sep 2019 14:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631626; cv=none; d=google.com; s=arc-20160816; b=AwYP2tczJ4zVC4SQYFp8O4zAJGBmgvM7jsREna3pfZ2bmC170Q3n8OPo+2muOEr352 eMFmEL/s8joiKanoH8WLpeBap34G2y3C99mJT56McbBVq/Ej0yV3TgwwWmq4YlorCdmp aKdQPxsBf+rpBpIHvnc33unQhlncH9o37IciCz1pfqrzP8IkH+PBofnYW75DLISn2k04 1RBaTuHZPTvMXUm2GqgcOqisWoU0/91w1Pk23x+Dz+LlZvXhoQlX1Q5Vjz0c2CdK4tof Oa2fyAZevjpKCE37ZH/UzPbVX6ltQudLwg8uh3kmB2SaMR1BBm7QeG3wIxrgVyq3cAwM jNAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=oAvhvXME+54VRvS2clCGoY6uoOz3RlYmcJNO8CHCVtg=; b=EnNlasNBcg3FsB9IueAt08072C2cWdpMM2EbAdTPBiFzPZIW52+AuPSI/wbIEM1Y2o tyWIK2pp3I9tTyeZgTE5PCmg8tLLhd8UInPpJWQH5EbwFZMbaHpOyPX/5oFJnsGPa/5R lCkqoY5fsJwhJfNjYPD8KhAldx3iXnWfIm8YJ1ATrawDxSG+eYpguEuNLGOYokSFaF9b eZP5MysH0bYUdbVCHK8IiAtDH3mvHi5ZAdoJXFT7W8g8MF6Rcxg0JQCSLwXHsa65BNRH VbVIY5S/ZARb1PFdAwahA0NcIu+on3Z33KADlyvsNk3CtES6BJyHMYtGvkfxQ4P0ADaT 1gNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fi/wmRpi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s7si12417321edd.151.2019.09.04.14.13.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:13:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fi/wmRpi"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cb3-0002A5-82 for patch@linaro.org; Wed, 04 Sep 2019 17:13:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49918) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvX-0008Ef-95 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvQ-0006na-1N for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:47 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39899) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bvJ-0006gG-GW for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: by mail-wm1-x32d.google.com with SMTP id q12so204919wmj.4 for ; Wed, 04 Sep 2019 13:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oAvhvXME+54VRvS2clCGoY6uoOz3RlYmcJNO8CHCVtg=; b=fi/wmRpikBCTtuVs8qLRK2S41gp7mSNTVakc9Z/KQfmhySE42cIANt+mHhQgxfKYyc NsPPZSN5Hkox5M8KkIGk5uylwF+/wfKMw6p5vEZTL3+fmv23St28W6iiAv9aqOqZu5gA eM++Wa9mVNK2I1o5IF6wl8nH+teS8NqolAsQpJzVEWzuPkwa2lNFi7ea1oNahqEWoqhz svBEb+MaSsQK439yVGpvH/YjLgnxFdpm3RNB0fiUnpIRZ9if54VOAZ5XIxGA43RgrOLG 0jxl3hOfYykyU5Br8CqIojDCUgrQLPJCIsJoftezM2uUfGbysJKdqXwTJ1b85Rl5HPuN ZEeA== 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=oAvhvXME+54VRvS2clCGoY6uoOz3RlYmcJNO8CHCVtg=; b=h69zmiOTl9jouC2S1yKDOIhJ9PXUIfmjSh9k2Az+KJOWFmr3tYdmRM01D+Snylmk8/ bxxj95nOXMZxNnVzEy09gybZDcBQFp8nftZ3hXK1e/f5bB3VFyoW3mpQ+gELqTODNa8n C+VzaArI5OD42VV6tWpkiKMRoosJlom5nmel17i4csPWC3YrYVyBVZTencd9GpGefx3W /O8U5pKwXzwnqxQVw3p7jWjI1kFbTktbszhqozN+xopZ1kgxrLzAGPtmoXef1rURwIOc 67rvoYXydX/GE7dpVcgM7jMwtMXxfWpQLLC/cTiK34v7zH3xr6WvCJhFdYzf4Mk8PUKy n7sA== X-Gm-Message-State: APjAAAVGiQ/d/i10hRO0yzccjv2W0VOO0GwaDaKzUWH05x5efO5iRUkm U7/k+gnzG/PH8a7SbhdKKo5BCg== X-Received: by 2002:a7b:cf37:: with SMTP id m23mr90494wmg.53.1567629030159; Wed, 04 Sep 2019 13:30:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f13sm20944033wrr.5.2019.09.04.13.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 377A01FFA6; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:50 +0100 Message-Id: <20190904203013.9028-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PATCH v1 19/42] tests/docker: move our riscv64 cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-riscv64-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 896c1c5a601..93190b1e2a2 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -104,10 +104,10 @@ docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 +docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 -docker-image-debian-riscv64-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 221697f9d11..5e2d6ddb600 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ From patchwork Wed Sep 4 20:29:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173093 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp470626ilq; Wed, 4 Sep 2019 14:41:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm+u5KRc0xqFSOsDpfM8qJ2WWHoHxdfJCIkhQuUjsh1++n/dcCnn9/5R2MgFfvJIAYjq41 X-Received: by 2002:a17:906:88b:: with SMTP id n11mr190065eje.60.1567633285956; Wed, 04 Sep 2019 14:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567633285; cv=none; d=google.com; s=arc-20160816; b=AtczTefeX8duYHa9gRdUnp64Gfrd8bdPvBHnDgdoGAk7TTNQTh1iO5ecevhphCA+IU 9we4D9eZtWVHVG+c+qTWgVXYusugFDZeBD+AqPtSvq+bdr3amLvDMnXg2fFVMtdnO0bF pj752eGmnGOIBKVV905g/s1JGjrvigJ1FjrvzPdZzstFk/7lhiF72ecKL60KVSelyCCU cKCpLnH+qqOOmRG4Aunnm7gzqWWhlYdGDU/yoWzpS+pn3uTpeWH44Mj4LJtdrnG8Lur3 t1qid2k+da6cQkSKKQKOVHp+f5eTgAtDE7ekXR5Asra1hHsYj5O5Gh1qX/WH1rdG3Ql8 vWYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=nQUAtVsslkJ4r9+COAvvl/ujYC8YWVWBFis/DB41CnY=; b=Vw0dLTAuJZBXh26a6dD5jKOr/iSCP0YohO9D+jGNGKY1OjGkBBhRVrmQ7/BhuvGji4 D5GbI7p5VRFYWc9cfTuhKwjD3/J84DGz0v7Xytid68d5PHrjbBWhTMj0Tx383uNPJwjJ O6BWgWVZnNCjDIegGclx+l6+wyYG2OEwMvRzyWDKrMRlxKjcL90soxJyB1KEPFQ9Jx26 rJUulopu2ZGvI8rh8nvppRKA+MyZ1f3xkaKCOus+yhqwx7P23eEUzv0qXlRR9oLy/dQS nJ819nTqX4f6FsKExVE60Tz6kFD1EGljZ7/ERx8+I9jsAd5WalW3DWwRVkH+Y1fyDS+X beLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pMvsKvq5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id qc9si149827ejb.380.2019.09.04.14.41.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:41:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pMvsKvq5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5d1n-0007Gk-VU for patch@linaro.org; Wed, 04 Sep 2019 17:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54169) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDX-0001xL-V6 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDW-0002SI-Ju for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:35565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDW-0002Rk-Dj for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id g7so248696wrx.2 for ; Wed, 04 Sep 2019 13:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nQUAtVsslkJ4r9+COAvvl/ujYC8YWVWBFis/DB41CnY=; b=pMvsKvq5smTCin/K1Ykk3d+3kVQgmNwEbNJat9rPEjBt1YYOLMLJAV5af9qWHjByvO sEZYKqqLPCIzgaZ7tzB1hzrxAEDVIZeNzHJJkvavpIduO2pvicZHsel9MkFcvhYe7cd6 Fms+Aog14ZltZ0v4ATjM7RceHfwrDSZgRtT2uuCpJR7oPCUqB3uBTHv3FJZ0ivfrKPA2 fpgznL/rcNYEeKMtBOEQHfiyvx4lPc2d6aJLfH/05dJhRfHd6BHeEyjycu/EsWLCTxtO AeiWZQJHw5/Pmy0DudxXtZIxFCKnuSfduOIkU2l89yu2ytx6a3hmKBifETpGj9cn7FDG UQ4g== 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=nQUAtVsslkJ4r9+COAvvl/ujYC8YWVWBFis/DB41CnY=; b=FbTNZrAI2aRg3gsy5y3ZE6Nv81KygRnlxAEpFomP49Q8GfHVpT67/VTE9yQPnxgtQ9 c0vnSheH2YHb3HpPc2qdZbAK+CQdLpEbPk43vCFpw6NjgHvKhNltIEB05N3+vuhd/NfQ LJiBcugBljj3puZ8oSooIPR0SoGCfjz/PqdVqcQOji/thMAwL/bWORINsQWelGtseYMM eaRnuTSFHU2083VZ78/MvWGfQKVSd2KTM5bw2yTpbPQoUVimL0Jai6JA3jagNia7LGP5 V/9HVt0gsjtfXGWkp9Qi63yzJhwHgwF7OwGWOm1vFYwZdPvY2BrEd+QXaytbaRmCOSl4 YOag== X-Gm-Message-State: APjAAAVA1xB5hoNVY2LV54Atcqapy8Yic1fqYmSZVwGwPaNwr1ubwC9A frVKuIOykmR+ekF43Goo08qtWA== X-Received: by 2002:adf:e48f:: with SMTP id i15mr21475361wrm.26.1567630165274; Wed, 04 Sep 2019 13:49:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r17sm22396419wrt.68.2019.09.04.13.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D34A1FFA9; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:51 +0100 Message-Id: <20190904203013.9028-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v1 20/42] tests/docker: move our ppc64 cross compile to Buster 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 4 ++-- tests/docker/dockerfiles/debian-ppc64-cross.docker | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 93190b1e2a2..b6c04059502 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -104,11 +104,11 @@ docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 +docker-image-debian-ppc64-cross: docker-image-debian10 docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 -docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools @@ -117,7 +117,7 @@ docker-image-tricore-cross: docker-image-debian9 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross -DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross # Rules for building linux-user powered images diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles/debian-ppc64-cross.docker index e5757fe46ee..4bf88ab02dd 100644 --- a/tests/docker/dockerfiles/debian-ppc64-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64-cross.docker @@ -1,12 +1,11 @@ # # Docker ppc64 cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. -FROM qemu:debian-sid +# This docker target builds on the debian Buster base image. +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ gcc-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } + libc6-dev-ppc64-cross From patchwork Wed Sep 4 20:29:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173068 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp453491ilq; Wed, 4 Sep 2019 14:21:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFJB5q6489TkITa7YtXCNkb5kxICYAKWd68XStPKkrj6IkTz28bC9d2geszEPXyDZhP/aZ X-Received: by 2002:a0c:9665:: with SMTP id 34mr6026qvy.223.1567632101847; Wed, 04 Sep 2019 14:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567632101; cv=none; d=google.com; s=arc-20160816; b=JgRCisDf1CihQtFxt8Tw/v2J7VibK1/U6tsecWS6tYs2gcQntFFaqoF12za1rNP/u8 8hPpecPSavmof/Fcy5W51cJv4wTPuN2jDGuDXMjXzC9yIuPHP88hZ5G1i3NUNeKD+oiP PSMkTsVWeo0UbQ1NI9uqKyJFqKblhxZdkk/Ey57+FMPkt/gxNPRRalBYPRMhvbMtYfle 4OH7SfCgpRbdfhaWSCQQrlMN51QMlCbcAduR7MOc8Cu463SOzPudzGP52tVl+QDcvWYu oSjlt3IFGjoqYnWgimiR08tRZFs9lYzFwHNEk1Vfhy2bzOupsuzvwYwJfgvekRQfivAH ZVsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=zp2HTd9MlExt3qm/dUKdQzcVkIb7wY5T3E7kKCEGd2M=; b=Idnbvbi11fXe8+lUTedOJiH/tK6qHUKldbZ0xDo8pDsT0sUVZYWuACS2ANkkXBVy0q sHCAEeVqA1Gd2WivQ1fIR6SjaSO81RaQ4trf+sUx/oxLJXJ0jqSlxoflKfXtX10sWokW R8wNxyNfsL1UIrrIXjcMJ30pGD/G8k6+TlKt1L4kk56iNMOzCW+oC3jXUjp1ThysEeRh 9fYp04cQEb/z3zXv+P4pJNWPO75qSZC38SHiCghxAynMPSRugC2KVXYRcuAxd5C/i9Id tA8Pnge4SvS+Kv1l1RhYwdPRowcCei5s/4qdH+MgiNOl3/IM1aWQMk5uMDHwdhbCZ9Ly jcUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XY0znVtU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6si186223qks.186.2019.09.04.14.21.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:21:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XY0znVtU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cii-0001BW-Py for patch@linaro.org; Wed, 04 Sep 2019 17:21:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51566) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3u-0000tx-Ck for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3s-0003Sw-Rk for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:30 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:34897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3s-0003SH-K4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: by mail-wm1-x330.google.com with SMTP id n10so249370wmj.0 for ; Wed, 04 Sep 2019 13:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zp2HTd9MlExt3qm/dUKdQzcVkIb7wY5T3E7kKCEGd2M=; b=XY0znVtUJ3AiLRz5SacDhW9wVilqHGBCl3Pr3DKz5biFCZyDPBmj+09OPgh0M+IHoM Gydh9rjzHTdHfVEMupaZhPmo7gWtdJTUN0gMPFcg0YDAvOoW05O4RZnVC6dM40Rk0wpD y3Oh0Gm1LkXkdcQ7YF9WDa675JLVTrYuWPDvowYMTeGoUatHrU53vfkN2CaHdhCV5fP0 P2ksvOmYnvNBGQe5Cf15NIyFDLWhER51E99kk8yhQ+dsMOxEV7i3SYpaJQG6/HpvUieV a3R4eAWqZHVDe9SQkHIYv2E9ZqzF0O5h5NKFAk+DKuSlKYZs1UzuyBy/OWMUN3MI5m6c OjQA== 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=zp2HTd9MlExt3qm/dUKdQzcVkIb7wY5T3E7kKCEGd2M=; b=CfrwO5IVrVfZ8ROi/nmJeMWrixDbATe7MOpyUnFd4+eWm+pNNZ5nKZ0GzqNmVkgFFt AUh/xkHYhuN6VWYoMKFqPEvEFcdgXolcT/SjXi5xyhyvIX/T52nIZPHSi9v3br6hR8Zo mH0pU1sbVMfla9IHfxt3fm2qfLltHg8TJzn1HdiQWTYQ7IyXitTdyfSY5uegqcFpDoyq 98SIiMMHave6MQGJdKKI47fYGGZxpqUKKhdlZneci5nL6wJWTmLSXaGzjxGE0pJJv33Y ObxOc7cm6OnFfcFASpJBqi13wlQSwWeqvQGHCkyq2vEMtIX3B/bKVYIf8bfZD1VPxrcT synQ== X-Gm-Message-State: APjAAAXeRuqzYuOJrAqelLoRJnBs+0M9LMbM1+a9Zj2VbVufsm2z9D/f HJRix1+2wHF49FZa0c22NBt19r/ADuA= X-Received: by 2002:a1c:23d7:: with SMTP id j206mr111917wmj.57.1567629567453; Wed, 04 Sep 2019 13:39:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e15sm23134875wrj.74.2019.09.04.13.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 620AA1FFAA; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:52 +0100 Message-Id: <20190904203013.9028-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH v1 21/42] tests/docker: drop debian-sid image 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Debian Sid was only ever a stop gap and thanks to the much better cross compiler in the Buster release we don't need it any more. Send it on its merry way. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-sid.docker | 41 ---------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sid.docker -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b6c04059502..59fbebbe2e6 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-sid debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker deleted file mode 100644 index 513459ca7f8..00000000000 --- a/tests/docker/dockerfiles/debian-sid.docker +++ /dev/null @@ -1,41 +0,0 @@ -# -# Debian Sid Base -# -# A number of our guests exist as ports only. We can either use the -# ports repo or get everything from Sid. However Sid is a rolling -# distro which may be broken at any particular time. If you are -# unlucky and try and build your images while gcc is in the process of -# being uploaded this can fail. Your only recourse is to try again in -# a few hours when the repos have re-synced. Once built however you -# won't be affected by repo changes unless the docker recipies are -# updated and trigger a re-build. -# - -# This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20181011-slim - -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list - -# Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20181030" -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ - build-essential \ - ca-certificates \ - flex \ - git \ - pkg-config \ - psmisc \ - python \ - texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } From patchwork Wed Sep 4 20:29:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173100 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp483048ilq; Wed, 4 Sep 2019 14:57:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyo7CpkZSDNzgaYAdc6GsFv79LGvxNiHxw1G96/cTloQIsolR2ub/hNZj0+QdBjX6LMFkUl X-Received: by 2002:a50:99d5:: with SMTP id n21mr516605edb.50.1567634225091; Wed, 04 Sep 2019 14:57:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567634225; cv=none; d=google.com; s=arc-20160816; b=Qagnan1L86SLHYJkYto1D7SOdx5g8jMEm2qshEedl+Fjv+jkqof/ggPVXMlexYf2MO J4V77+XbrB3Ml1+aQNT2UGypwPTgjZTRFwzQzyKmDoXrGcqA7Wl5eoGzphLWMLg8b2KO hPE70F/pMJJY2VnCTYhiSdsefX7LpI2oOhyb/AueaX+ILNAnQomosYmCX6A8q1Wt2bNS /DZSQBC6ST8oB02TG9mcVsHMKGCY3csyK3YWGUEJdYBdpTDWgZbqAptGj/kqRrT3I6qP HG9J0hFggcPR2cJblE3avIGaVk17zenZRZIXa5jhcQgWqW64On9G395zRtM+kujVQ2UB +Buw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=eex9C7ku7qLfjN/PN3lyTLs+AN2XoVsX1psapATGztk=; b=RB18jrNQisxTp08rJ7h132ZFQVYyKBkWTfBB37bCKN1srZqAQWQbieb0DymTR8NP5s +J8jaXrY1GqTZAiHZNETSjVun1UDAJNGwo43XsGirLImH+09+hbC5hX4gJu2Oysl5lV+ jjNWReo1EBOV0AXZyw5+VJITpQl3fzLN0iLdTfWdwzRZfU1C8ZvIQNCCVumvsIHvhdm/ xTF/YVgrirJBViUWQFF9V4tKVGfCHfqsuSN914dN5I1Q9RAlnjfnTG1OCblIk4OnwF/D rY9jqa/LP3h1Ud5XMO29SybwLHt/gYp5Fr9/PEQMo9M/Bl4yHVFoYuZGmezUuTwLrLfC uWHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VNV9avIS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e20si174366ejl.225.2019.09.04.14.57.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:57:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VNV9avIS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5dGx-0007Yg-Tp for patch@linaro.org; Wed, 04 Sep 2019 17:57:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54139) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDW-0001vY-Hv for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDV-0002RH-6x for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:26 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDV-0002Qe-0M for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id t17so246052wmi.2 for ; Wed, 04 Sep 2019 13:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eex9C7ku7qLfjN/PN3lyTLs+AN2XoVsX1psapATGztk=; b=VNV9avIS44htgTf6d22q1L8b91Xr7ylE4pmd79JEDm8z42TxMKy+4wm2hkSbhJLBwB 366+y/s0wBW/4E04rXWp3dT1eSMerwzZSLyb1nAWP78FEFPNImdl6Q7xvbOXF0tdYgb6 5sc5sC3TRgGU640Mpfzg7KRZNUdZHJHoOM8Gg6cNX2HGVlVQNnrbaDMsvVpWGY/XUFBU JZpwsow8dHFqevMjTOmzaEx7AY/GZlAy8ZwUpVaxcwnUjp2nq4Y936EdrsLAKiCya7QT VP1VdzEHUayXFPTvIfQqUduptKJsQzhNg866gWVikfmakgiaHJ5gCtxAFDwcxLG+K91j 1lSw== 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=eex9C7ku7qLfjN/PN3lyTLs+AN2XoVsX1psapATGztk=; b=f573VrB3z6MmPGnU38pXMvM9+d327MccN01l7eSmEw6RFlVR7YSk7+s2T4IDpMaB2D Pgw5BPZsOCEpIB3unQ7uFHC7Q75yuItCFrzSFm72jvP3eWExBFRhpWkBaiDmy0X4vv0L LB68dx+XZwOi25ZX4JP/c/JJ14ifoFlSzd/sbSlA/UV2B3Tv4/qdt6qIhDtfzpv8+ooZ bsVOwoNSWJrW1c0W9J0VvOwryj7PhOOoSDhLnyP4QAYlGTP/zNCZl1w2BczPJpFE/e5r nA/DDBb9UebDq8sc734kStc0MJZ9QmfYIhH7j9uc4a0oNjvXLBQEki72ELWfwD7x3aNd 0Gig== X-Gm-Message-State: APjAAAWmb/3mH4czR/C+YhZun0OxcfOZ9aVyjW4LpCt/oHUsnauc4IqG heTFrZbrInVCrt+wh14/ehOsQw== X-Received: by 2002:a05:600c:1087:: with SMTP id e7mr143646wmd.19.1567630163863; Wed, 04 Sep 2019 13:49:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n7sm18017391wrx.42.2019.09.04.13.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 775B61FFAB; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:53 +0100 Message-Id: <20190904203013.9028-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH v1 22/42] tests/docker: drop powerpc-user image for QEMU cross builds 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Jessie has entered LTS the powerpc architecture has been dropped so we can no longer build the image from scratch. We will still support a minimal powerpc-cross image for building testcases. Signed-off-by: Alex Bennée Cc: David Gibson --- tests/docker/Makefile.include | 8 -------- .../dockerfiles/debian-powerpc-user-cross.docker | 15 --------------- 2 files changed, 23 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-powerpc-user-cross.docker -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 59fbebbe2e6..f4e9dfc0120 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -126,14 +126,6 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross # work around issues with poorly working multi-arch systems and broken # packages. -# Jessie is the last supported release for powerpc, but multi-arch is -# broken so we need a qemu-linux-user for this target -docker-binfmt-image-debian-powerpc-user: DEB_ARCH = powerpc -docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie -docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc -docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user -DOCKER_USER_IMAGES += debian-powerpc-user - # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker deleted file mode 100644 index 6938a845ee2..00000000000 --- a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker +++ /dev/null @@ -1,15 +0,0 @@ -# -# Docker powerpc cross-compiler target for QEMU -# -# We can't use current Debian stable cross-compilers to build powerpc -# as it has been dropped as a release architecture. Using Debian Sid -# is just far too sketchy a build environment. This leaves us the -# final option of using linux-user. This image is based of the -# debootstrapped qemu:debian-powerpc-user but doesn't need any extra -# magic once it is setup. -# -FROM qemu:debian-powerpc-user - -RUN echo man-db man-db/auto-update boolean false | debconf-set-selections -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu From patchwork Wed Sep 4 20:29:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173095 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp472401ilq; Wed, 4 Sep 2019 14:43:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJl0M7gdstKcB/9Qx4AVB6aL2dwTOYNPmSaHmIUWZWY7o4WsObpGmekSMhI2LCBgN+eHxG X-Received: by 2002:a17:906:7a0d:: with SMTP id d13mr175088ejo.242.1567633419228; Wed, 04 Sep 2019 14:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567633419; cv=none; d=google.com; s=arc-20160816; b=tgBuCKVsZ2vuZSAPYY9ytXwBa3eoC5vUGkMXqFCtvEBN136zopXtLjEkekw59mn1mZ 0xWtydED97e7rF6ORU1Vm+TM07rLUVz/7/gddjtddThJhG/i9eH3tX6AjuLG0Ille2Bg anyw8San2yQ0tr2gRel+qmBeJ2Lo0gdEHjM12TvUqeoMSDSMT3GbUjenzWv8zjle21jE Fa9wusRrxvWvYlOVIeP/50oVt9pSiHHfdlC3M/QfBIjd2LPFW3W8VOpbOt2owB/yn3WV /xNxEJLl6xSluNvwWbxEwaZTOLzFp28cycZEydlqeNwDkAKsVGfpkAtBEH28GD2pXhPW zkdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ct8GRVkho5bZaPQ+r0/dd0wEzdlz65fQJcg/sMTvk3E=; b=yy8QQo0MVYDfoO9i1+tFxV0J8eswqjYrPQHodmCUkXg/bBRt85IdOua/c47R2ieYgZ 2it4e9/8wx6r4xDgHD93azEctG9J4af3mSk6qWR9mWckz04H/R2wpQEuAgeRwEFByca1 FKbsyP2eNWXSx0zlKZn2tKVYX1l5iSJw1ZrSq5HnwDyGkKehrsGSzSqII/XKuFtb1iUG Z/fkzKx86qS7DfC2Xo6gsMzlAaVrH1CldmPxioqdX2X/wZrkygHU5ufO4NRXDWRWwNJp xD1Es9akOyqxkbJIlTuXcKn/KviMqtz8V644OLCepQcQ9zlkHuiAJj3J2rf7OlwGLOVA 9GDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=raR5C9aI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y43si31176edd.42.2019.09.04.14.43.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=raR5C9aI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5d3x-0002gw-Hd for patch@linaro.org; Wed, 04 Sep 2019 17:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54174) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDY-0001xc-Ah for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDX-0002Se-56 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:28 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDW-0002S7-VI for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: by mail-wm1-x343.google.com with SMTP id c10so258786wmc.0 for ; Wed, 04 Sep 2019 13:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ct8GRVkho5bZaPQ+r0/dd0wEzdlz65fQJcg/sMTvk3E=; b=raR5C9aIXdekox5/6ORleuMBMP/O4fIzdlei2ifybFuJggDG/v5VmIjYHHyrdTfPdE SvDqEU/bjQpjCAtPzO8o1eb/98uhJUfz7aU6ZAn5+3ISG/cfr9eeI7NRrq/5AsgIlax/ NUrAbwN7i/V5TrjhOfl+kYWQa5ZDNu/q4k9yPZWuYwKpIgXasq+degGhnKjUdNfLnuu1 PBN4xV/2Rm7wBRbkEyZVa44jz6cTjbxPLvqseDIpJ+K5X/QgmcpCvL5jKbKiR6M6ZrDx 4JtDnR018fQRqmsa2iyuTxNyOXnT6EIDCr/7Jj2+yz0mZQM7jnjE1pdOXSwDwUOI5U9G 2f2A== 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=ct8GRVkho5bZaPQ+r0/dd0wEzdlz65fQJcg/sMTvk3E=; b=qKEf9Id/oqQKz4ATQYumoa62EruTMAWCnxtCINgKy3Th+wUUQyDYiGSCWsd0657qKS EqE2p211ypSEU7IJBHFfz57IRngXPe5VNVeo6M63hJemOacckkHcQIYmJG7ug1J/JuYO dzbzwkbR+EBFMlft8z3sC/vnLAATnFrhV1pnOwEz9TmTnTONmH3fKcCVXvgWRCMbBVx5 OjoYubNek8CqZ7pDu9n1DFtVwSLxNlHbEuYaxdKig6UbiXjltgF8bzJGr+HXf3RTdBQy KvCGUU5eyjwzZqZayqddKK1JnZfBNRsoOESlZ3Ewhzss1Gth9SXFpUfYvmrjKvj4Tw5Y idUA== X-Gm-Message-State: APjAAAWOdoKuyyJobMnZu92Aa7ySwr5nkSD02SzscSftBlOj99b4jZyB WWRkG9RoOX/hePEd2Be29sBNQw== X-Received: by 2002:a05:600c:2111:: with SMTP id u17mr177161wml.64.1567630165938; Wed, 04 Sep 2019 13:49:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g15sm212099wmk.17.2019.09.04.13.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B3261FFAC; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:54 +0100 Message-Id: <20190904203013.9028-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 23/42] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This should have been marked when the docker recipe was added to prevent it being used for cross compiling QEMU. Sort the DEBIAN_PARTIAL_IMAGE list while we are at it. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f4e9dfc0120..8d7f9376578 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -115,10 +115,15 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross -DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross -DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross -DOCKER_PARTIAL_IMAGES += fedora-cris-cross +DOCKER_PARTIAL_IMAGES += debian-alpha-cross +DOCKER_PARTIAL_IMAGES += debian-hppa-cross +DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross +DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross +DOCKER_PARTIAL_IMAGES += debian-riscv64-cross +DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross +DOCKER_PARTIAL_IMAGES += debian-xtensa-cross +DOCKER_PARTIAL_IMAGES += fedora-i386-cross fedora-cris-cross # Rules for building linux-user powered images # From patchwork Wed Sep 4 20:29:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173042 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp429542ilq; Wed, 4 Sep 2019 13:57:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDbfjhgpyWtc69SuP9k8PJelFVpJrZO8q4uHehkj83Hvpihc53U32syfVXW5bNR3taagSI X-Received: by 2002:a50:b0c6:: with SMTP id j64mr213731edd.267.1567630628122; Wed, 04 Sep 2019 13:57:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630628; cv=none; d=google.com; s=arc-20160816; b=NGNok8S75fvf6/JPkyjSAYuMrGHrQR7G3TUY9al9xwWorrmQ8OAtPavkGIgOuV1kSX us02PEibvxX6vMPNal3nFpmCAsEtxy+ti88ySInW0ocKbdD5WHgmiqwju8kQzHc8x0BI WeafCc/KNUi9ncNeImkBGDapztA7dIwH2+xwXwHlFsqrXdV9TWi4F+gB1gWc8tBrvSKZ O/GJGjbcSqvuwf2u+xDWqhvxTrya5KYMgOVxYzbXHO8lJtvo3j4TwwxxsJrBCeyYt12W SygxrxtunxtGgzMdjVmD70iqarlTbGkPb2ERvChj/fzPqI1IctjKFbNilwiDwZ1qqFH6 kq0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=68LGDwWChmAv2fWCzB7IqhsP8GzqVkWxCTjfvKv21og=; b=XQGwPdy9ICQsQINaMvCrheWdHySUAuiVnNFYlm5ZvojY7myNJUZT4z5kNs2VUkat1O WSPtaSq5pGeku8xQN0EydpuAlpBsNGZRtcLOkWG6WT8kQNFJ1oajyOFSA1av8mf1fUvK CN7Sk3h6pmuXZWDORjRBgBoTTLss5TH9nVg5a2HTsdZ8EHj5vLIvfnl9Dt9vtnl1wGZD QJRbLjssB6MJwuIKamCZCjnJth+RPbDqxojd6E25cpovLywGXJ07jP4EIBpmLWsF2qLl GvwkSsS/6zPUZBQCpGsOHqC/tLw+RJP+8x+Tw6kBcmmD6AAYGI4l7YKYwWvEDrxSvD+/ iepQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cyWAvfTz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f9si91166ejx.375.2019.09.04.13.57.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:57:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cyWAvfTz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cKw-0001XH-B0 for patch@linaro.org; Wed, 04 Sep 2019 16:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51501) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3q-0000p1-Vr for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3p-0003Qb-OV for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:34892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3p-0003Pp-Gp for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:25 -0400 Received: by mail-wm1-x32b.google.com with SMTP id n10so249203wmj.0 for ; Wed, 04 Sep 2019 13:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=68LGDwWChmAv2fWCzB7IqhsP8GzqVkWxCTjfvKv21og=; b=cyWAvfTzFnrPpTif9QgM241PJ5CHQrygnslKo2QLTFJ2Ix96mfvmqlPxKps08Zjxbo PfnWBuhEBQVC9RY0I7A/YGvuG/4s0nkQDPSZ1O4xkuXOGP01BTTTqe1lULYLbZx3OwDM IvVtoPJT5Oa059SpI3LYtglbBR5LYEGJS8yt9LJUal+4QLngH0vWHv05MlPEuM+KcRYh lF8MioZUPS3J01tANsPC8DjGXiAq5dGJRqO9EjqtbhYGlfxovBGz/cJZjWAmTGL68R2G 0Rvb3as5uM/uYIvLIl5ZHfetL40GAxH8Px21x3itmz4GvLAKprkwhxdPvrA8Upx9xczw njTQ== 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=68LGDwWChmAv2fWCzB7IqhsP8GzqVkWxCTjfvKv21og=; b=NqFlPTOOp0hcbrV+PU+D0tTH0izjShOwjRQ880x8LvueAPaNluPJnrMNYxC3uFM++Y IL4wKexxS+wxVBMxQDtAQqkPY+Mq/uVOjoeWKOnz2/3fCIuguAHUU1S/aAC+8eJvLTOV L8+PXGOGrPco6QIlDrDETK0RvLo9D3pLyaYRiLYVZnlIgSRnG0VKkjUlAjtPaVmPKY9U ee/IzoJBwjv6zPCnpEgTsggeIUrdELVPkU5COf+5mfDC0cRGQyh9t1iVEHSCaYLSrNqB CdSKGEviimEHKHB897o8PfGpdBJtZOb2Q8B3vL/Xkxtr8Wv3VfwZjQ4DMiBQ400XIH6W 8mlg== X-Gm-Message-State: APjAAAUjIby+4Ww/StcqJlCImwCxzMZRnJ0fXkh5d+9etPvDxozWesPp rIsPUq7A0nao+Ak/YDTiRhlRQw== X-Received: by 2002:a05:600c:cf:: with SMTP id u15mr131057wmm.168.1567629564149; Wed, 04 Sep 2019 13:39:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g201sm287121wmg.34.2019.09.04.13.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9ECB51FFAE; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:55 +0100 Message-Id: <20190904203013.9028-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b Subject: [Qemu-devel] [PATCH v1 24/42] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Another image that can't be used directly to build QEMU. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8d7f9376578..2c8cb790ad0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian10 debian8-mxe debian9-mxe debian-ports debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds From patchwork Wed Sep 4 20:29:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173084 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp459986ilq; Wed, 4 Sep 2019 14:29:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyy3nCiPec1MwZ4BQWj3lftkBfHa8YqN2UtYvSko8ImNpv2oNjTrEPUGoPpRhTrChSbS83/ X-Received: by 2002:ac8:4441:: with SMTP id m1mr151796qtn.365.1567632553006; Wed, 04 Sep 2019 14:29:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567632553; cv=none; d=google.com; s=arc-20160816; b=Du2QU0Kg4LGpNVEOsPqbQR4IZVaPDshYDhgvXKmCTW1Z1oiEMyLXkkA8CTLKKSWxQr Ld7uQI5c8Mhj1NJ4+Sz+SPvp8r1K+g3axdTVwRIBDUzVZ3dZIdGGiLwG9zuUACmJxOcR brPrNssgUWpS3pYMPcxSf6nQmLEhN7SudsyYqRTJEC7a16mXECvcMAnmY/0zCfbywiOa 1d7RNDPm4xsaKIWAePwhvHuP+vnSDgA6neD+WXPzlFQvlxNRHe5VC7deeAKCIqzBYSfG Bc/o+rLHMK1yLZ6TuxKtDy5sjaXaR1GprHcg5SGCwjofPwifcx6tfmobYYVUvKDltbXx rIUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Y72pQsH2+pAgJI3zXLgFu0D9M3OSNR6cGitEr7LgzBM=; b=Acp9skBf4SHsLPP2A5pUdmbEGDRHOASRL+OD3hAFxIHRDvk/orbtJW8ZmMu9C4Vpsv ZStFttTDbgmL9hoIYnalWq6zNQa42k5ubNWERK4VVSJs/aMlCrNz0IV5m3YBfJP1ijy7 rqZoGMBra20Jk98jcBxINgYPLs6PVLeltlDmhQ7Y/WbtbHqmboJREnrOAaZrtzyKubIF 8UDE0elM2muXDd1sa92bkF827X50UkueafoODg1IBpnf/uHO26T3nDvWpyS+KQsPZoHm 3iR/gfRtMG8cLDMSXn1SgyaMPv75DkLPB0j+9/EzNwg2bgshKMwgpSWQrrKlDZ3j6RsR YJ5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aVW9+QGf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5si129633qvh.67.2019.09.04.14.29.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:29:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aVW9+QGf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cpz-00036d-OA for patch@linaro.org; Wed, 04 Sep 2019 17:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51688) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c42-00015d-Uq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c40-0003aa-S1 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:37 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34757) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c40-0003Zp-DJ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:36 -0400 Received: by mail-wm1-x341.google.com with SMTP id y135so3360236wmc.1 for ; Wed, 04 Sep 2019 13:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y72pQsH2+pAgJI3zXLgFu0D9M3OSNR6cGitEr7LgzBM=; b=aVW9+QGfM2cmEphKcYy9RxM+R59bNWc9o5f8QdQifQuUuP04tHNrIzbpRYWvAW9hhD 8CsQ/a8OsgBjnsCMnjqKN/tdfVIfSA2vI2FSH+Q5TFvEkXYQ+gyKWBPFcQPhLhl3BL9i z7tXqXhVLfppHGjGDdBmpJNY11aZrjFqMG70RMVad0ma4XGJSaeF562KMBU2ojo6ayBy UfclIGgNAhLNhpqJs8S5ZGmI6B92YSijbM4I35ACCdiOaLRBZSbeACwBEFCARLUfWs39 X66lNC2OPOvxyIucysw4qjjXzqZBqMyykk89VjQmvriSwCJ1BsZ8yL7jVqA6wMaXEcqt QxnA== 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=Y72pQsH2+pAgJI3zXLgFu0D9M3OSNR6cGitEr7LgzBM=; b=fR+SYJUx5MHv7V/lYle+o0cjcosxSDHSokapmId6YuO26nAV3/xsz3iMj3ImKlkyu3 rR1vGyCBFwI/m7iDI5noWIvd0zfbjDY555BvJQ35AX/M9H3riBXu0y1pYoWOD75EOrxK BwoLNwHgtgzcZIk2ViJ2Fmhhk9wrlvUKoExHcAHyCwvpztS/Jc5gvoNvwucoeATmHHbi NnHjRJA/cuTVMgq1Jf7W1r1tYXPFad2vbicKKbKj8dP/wQPEqFz2JqIlhtTKnyx/30kn xpeIYsQBfsNdchZWZWioqZULrdAFdesTSmX1lmFCAI2gxqagxq/UFXoOU2+24izgTN6j 7MBQ== X-Gm-Message-State: APjAAAUfwHtwhkRYH87xxMtwgQSro6qVSXbMG9alqWZ/KmWiS5ceJPX+ yC6XZwhPk9iRKa6bGMyC3BArvA== X-Received: by 2002:a05:600c:2111:: with SMTP id u17mr149945wml.64.1567629575276; Wed, 04 Sep 2019 13:39:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u83sm5732761wme.0.2019.09.04.13.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B39ED1FFAF; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:56 +0100 Message-Id: <20190904203013.9028-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" On some images SHELL is pointing at a limited /bin/sh which doesn't understand noprofile/norc. Given the run script is running bash just invoke it directly. Signed-off-by: Alex Bennée --- tests/docker/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/run b/tests/docker/run index 1014871fec0..8edc7026ee3 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -62,7 +62,7 @@ echo "* Prepared to run command:" echo " $CMD" echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort" echo -$SHELL --noprofile --norc +env bash --noprofile --norc if "$CMD"; then exit 0 @@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then echo "* Hit Ctrl-D to exit" echo # Force error after shell exits - $SHELL --noprofile --norc && exit 1 + env bash --noprofile --norc && exit 1 else exit 1 fi From patchwork Wed Sep 4 20:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173082 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp458083ilq; Wed, 4 Sep 2019 14:26:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWxmbi2IL/uMiKLOHxNGdD39jUBrwSCGPK3zt8wYy+acFGc/ZZnfXQYYr6hwHpP3xnghey X-Received: by 2002:a17:906:4a19:: with SMTP id w25mr97449eju.239.1567632414029; Wed, 04 Sep 2019 14:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567632414; cv=none; d=google.com; s=arc-20160816; b=KbLJYC3tlR6Dj7eVF6b7GrgH0OYMoPWq0Dsv8oosk8CvcgDMeVshV+JZLjPm4znYxb WUyGPdmfbo9TCHEvnZ+bFG6h9yZYhKwW6IuOMCHrJZM+iy1z01+0J0jlU1FIRfFYdX5J 6aoukrZ1FOtdDLQHf0OsLlm9wkVl32tptRas5uLxv6Cc0sZbiolIK0xE0Tnh+Oc/Yr5E H6ixTKnfpbUBAeXb9zwFZ67Ph0WwqGGzuRCXQ5UfkD0NTOTVlpFTWW4a9a1Y/z5Qc27g RWJ9vblcV2/qFDnB1Pk2rKiRYQuUXGJ3Qif3CnoGLQALc3V+Nq4faueedjz3yeQiaM9H mD3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=7DN2Mz1jlphjeBD6Hgfr/tcOfOE2X7DGMlU3BQxiSxE=; b=ibFTm9rWclMZc4qeuulG+CXa61Iy+Ejtjgwb9hS0fIgNhf5x+HVHK6YTJgXmI0hM6H bNsBHAo6wbMFmqIa3z2H6jHy9UPrHPvzzwVk1kf1bvhn//hz1zRCTYNS8tb0iHOORI9E pVPxgFZtuJKDEgfMdSkMjBzFflqKGa3u0aRfMavK1ljjhBckkBczp7mQ/PSsWqzH1Mlv 7Xgg9yIo8+KdPW+wHS5Gst4fMLCGSGYZgAJB5D/8ks84XhS7J6VVuObx1LrzroWlG7uT EQITIM9IqRif3yk/mUd/Ndp/ql//tqGBzS9/+tHzgJHdGcb1l0n3fTI+Ej3sqTDPI35v gV+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cAnDLgN4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w3si126716ejq.400.2019.09.04.14.26.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:26:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cAnDLgN4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cnk-0007mF-9a for patch@linaro.org; Wed, 04 Sep 2019 17:26:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51663) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c40-00014e-9Q for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3y-0003ZE-W6 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:36 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34614) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3y-0003YX-M5 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:34 -0400 Received: by mail-wm1-x32e.google.com with SMTP id y135so3360195wmc.1 for ; Wed, 04 Sep 2019 13:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7DN2Mz1jlphjeBD6Hgfr/tcOfOE2X7DGMlU3BQxiSxE=; b=cAnDLgN4AEjP9y/AdcF7Qad0MexMWbLi1FxkPzh9cRZnESXJki8NPyezG2BsNCb3M3 jWfhihJNGNNHMwhNx+ccV003tzJRxqy+r5hlDET37Gve1DGLbN1eLBGkLtbdphMtTyIU SBXJRRl1ec4eoTmYp7KMWY9PATyjKc0aW5u3qP1gV1lf+4p4LcQtcr/rNXMMRmh4IA8V n/vy+ptkxGP3qjBcUMia/RX+1xUuVXSNV84+khTdnGpH9I3imoXbh/ZxOR4SWyot9BQT oNu7zAPjAXGUULtyOLRj7oRnQSibj7NiZyNETobSnQEa2mDnmvtcjjWDG8EvYwnVRTIC swxw== 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=7DN2Mz1jlphjeBD6Hgfr/tcOfOE2X7DGMlU3BQxiSxE=; b=GrG2Hlxjl9w3+sezSFLcr6pDilDIRxAk5aA2YkmxN55y1pTXnGs3uh+bApzozK/IAW 0Pg7l1GzOjqMoDi2231s4DaSwkUJdGTu8wnvQnL9tK1pOWmuEsiWsGgJxO0iuJJvMNQL Jch5+cnKyRCmXpLDxJGs57GlLzaS9RhiJjo/hgvP3aw92OA/ID6QdYF8qYjy++XdrL2p 4a9e0S/CyMjkOtpujUbtlEsTDm0pGLhCR0FCFt44Hwp7U7Nu015TTTX9ZnniuT1MgmgR jkQQ+PLIc+118ZNV2dxI9J+5WL5uoj6mWhYgLzBT+rH00m6PLzBaNl0H0BG4TlVeOuBk JzpA== X-Gm-Message-State: APjAAAXdp+HqhPWxkxtUY7LVRQH6NB4JEi6wGc7Z0uNvr51q/2Ht7bP9 b2kCa72aFaZ5viq55rkn0ZFibw== X-Received: by 2002:a7b:c7cc:: with SMTP id z12mr132592wmk.80.1567629573695; Wed, 04 Sep 2019 13:39:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a18sm4336262wrh.25.2019.09.04.13.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CAD6E1FF8C; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:57 +0100 Message-Id: <20190904203013.9028-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When building on a non-x86 host we need to setup the x86 build like any other cross compiler. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 6 +++++ .../dockerfiles/debian-amd64-cross.docker | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-amd64-cross.docker -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2c8cb790ad0..cb0961a69e4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -87,7 +87,13 @@ endif # Enforce dependencies for composite images docker-image-debian9-mxe: docker-image-debian9 +ifeq ($(ARCH),x86_64) docker-image-debian-amd64: docker-image-debian9 +DOCKER_PARTIAL_IMAGES += debian-amd64-cross +else +docker-image-debian-amd64-cross: docker-image-debian10 +DOCKER_PARTIAL_IMAGES += debian-amd64 +endif docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9 docker-image-debian-mips-cross: docker-image-debian9 diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker new file mode 100644 index 00000000000..5d890419251 --- /dev/null +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -0,0 +1,22 @@ +# +# Docker x86_64 cross target +# +# This docker target is used on non-x86_64 machines which need the +# x86_64 cross compilers installed. +# +FROM qemu:debian10 +MAINTAINER Alex Bennée + +# Add the foreign architecture we want and install dependencies +RUN dpkg --add-architecture amd64 +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + crossbuild-essential-amd64 +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy -a amd64 --arch-only qemu + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- +ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user From patchwork Wed Sep 4 20:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173052 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp439097ilq; Wed, 4 Sep 2019 14:06:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzSRSC7sB+F8rWVgRswFsq25QQ+jjapz562UiP6632KjWeKG68Qviz8dFmUxv4OUg3qx8nD X-Received: by 2002:a50:ba2d:: with SMTP id g42mr311630edc.288.1567631196794; Wed, 04 Sep 2019 14:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631196; cv=none; d=google.com; s=arc-20160816; b=Va73rvuRe4RLtzFDHDsINVM7xklIEFpfh0shGV+5TFuUM5PPTF7Rfih2TSQi1aVHYQ GFnfThNlVu3iwbb+oGxkZBw41Nif0lhtia0fwMHYn7K5xOBk3Cc/XZAShvmUgqwsJflA tnxDmbYcR7ajM0wFzwzfwDFYCieRru2GIZg7NpLp0DlbkMOaEoBx4IWV3GrLdMVCcFSF AXkYtgzwZy3xwglO6pg3LOMeq9ElWkKZSMPqB/xqne+x9d270bdSuMN54cOqfYXlrZ8U bxYlgD24qtw7pbEpj5xAqUGL+nkvllTp9EyzYKCZF13ijtcTLVAWqQbjJFYTw0Reqhld JEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=wStX4YIOlkF2MafozKZ2x8VdJIAuduzCMxFBTqikMjLWlcqHkMbvgu2gQJd3Dvi6/L C6I8IVRIPhk84y1dl//TuS/nVz0H05W+isAtOhMGOJwUwE1sdzPcEHOgR4sDSuTx7zHR YuB5NzfP3qsg4ni4UhoFQX8Rw6G/ZLnM4GnnKQGMjkoSdPlB17Y3EkrpcCpc2xP+AGMm bP2OdsRwxj7FF+Uf4QE53DFR5O8/6lk6+n8CIXYlPjUjLoB4R2w2FYPzt2HOMlgkZ5dp /dJvXyDBcEZxSc1WBXu3yzpwMc7B6FtXsl/o+IxhdNksmadT8Cl7xMEv2TpMF2rZSMh2 r6gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ltyBU1t7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k9si1928249edb.56.2019.09.04.14.06.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:06:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ltyBU1t7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cU6-0002yj-VE for patch@linaro.org; Wed, 04 Sep 2019 17:06:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51701) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c46-00016d-4K for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c43-0003c3-GN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:42 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c42-0003aL-07 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:38 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t16so204166wra.6 for ; Wed, 04 Sep 2019 13:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=ltyBU1t7HZ3qIO6jg9Jfphp5bLDFjArmZKITbVl8ayqv+TO+dfY7qKqTPGES3MDjw8 fHQEPVhxh8eLkmoqTKFtRnJZiXrqckt7Kfj5fQP01LMXlWcPDX89/3IZ5HJekHN2r89m xkX32vJ3dJjgupiPe+P1w3loxBSNzZP68x+L+7mDHLwjI8Ie/FEQsNpvGHwJ1UNmvkKt H02+fouSdqpD2mO3I1PaRRcVcP9St3GKfq8K59AsX9ssiRC13IZl9TABSGUGuX3bZT7v KC0U6DOBFnNv3XD0apv1jeRaDNtgAGGJJX1GqtEgfHqgiLusC+i53Je6yUJiyJiJIDjN kNjQ== 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=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=iJId2TG0dAoMByQutBiwWSpOzLjR4+6YlKiHjKiXH1qH9FWbqrHfmNrD9yHxxxgyq+ 3sZmLYzx1MJcA2ET5IhI0AaF8TJmMerSYrJKRbHV+4uF2gOMDdmcEWikB9+uJTGpSaEm nGVahclOE4tb5zBIWOYMxHIAu9BWwft2EVsy3jOwypqG3fe4mG9Cwg1VLtafQjg/EMI2 XMyeVDVk2yOZvmfqtRuegiHzeIFzl4Y9TfV8dXOlo1Xe1TVBLbLFvaza7G6u+yC6Wg7l aEyr939ZPbvtBhI3MqE6gMv5O+lKjkGwgLU2wk6hPxOzzsT5m/5nHE9gmQwf2RHhIFXM JPtw== X-Gm-Message-State: APjAAAU2mCA+GfPLeaVCy96UN3lTT58Fc+e1kTxHRbhW7r3zsywhCl/u OiJWkk5GmEj6YNuTnG0UbK2F9A== X-Received: by 2002:adf:fe0f:: with SMTP id n15mr29857667wrr.343.1567629576119; Wed, 04 Sep 2019 13:39:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3sm5604231wmg.2.2019.09.04.13.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B691FFB1; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:58 +0100 Message-Id: <20190904203013.9028-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The Debian QEMU packages require a bunch of cross compilers for building firmware which aren't available on all host architectures. Using --arch-only skips this particular requirement and allows us to install just the dependencies we need. Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-arm64-cross.docker | 2 +- tests/docker/dockerfiles/debian-armel-cross.docker | 2 +- tests/docker/dockerfiles/debian-armhf-cross.docker | 2 +- tests/docker/dockerfiles/debian-mips-cross.docker | 6 +++--- tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-mipsel-cross.docker | 2 +- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-s390x-cross.docker | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 55045ff5d5a..09ca0a1ba79 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -13,7 +13,7 @@ RUN apt update && \ crossbuild-essential-arm64 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a arm64 qemu + apt build-dep -yy -a arm64 --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 363a162a253..15378f8ea2c 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -11,7 +11,7 @@ RUN dpkg --add-architecture armel && \ apt update && \ apt install -yy crossbuild-essential-armel && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a armel qemu + apt build-dep -yy -a armel --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index d5365881e79..4a20af6fe1a 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -13,7 +13,7 @@ RUN apt update && \ crossbuild-essential-armhf RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a armhf qemu + apt build-dep -yy -a armhf --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index a54efa7253a..08a8e1c29cc 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -1,9 +1,9 @@ # # Docker mips cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian9 +FROM qemu:debian10 MAINTAINER Philippe Mathieu-Daudé @@ -16,7 +16,7 @@ RUN apt update && \ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips qemu + apt build-dep -yy -a mips --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu- diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index a1481e16e2c..2fca1124053 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -17,7 +17,7 @@ RUN dpkg --add-architecture mips64el && \ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mips64el qemu + apt build-dep -yy -a mips64el --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 88accad2692..4abf7832ac6 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -16,7 +16,7 @@ RUN apt update && \ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a mipsel qemu + apt build-dep -yy -a mipsel --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index f10883c8188..9973df9ff74 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -12,7 +12,7 @@ RUN dpkg --add-architecture ppc64el && \ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a ppc64el qemu + apt build-dep -yy -a ppc64el --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index efa346007d6..eb73c988559 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -17,7 +17,7 @@ RUN apt update && \ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a s390x qemu + apt build-dep -yy -a s390x --arch-only qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- From patchwork Wed Sep 4 20:29:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173070 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp454466ilq; Wed, 4 Sep 2019 14:22:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4bupn3NyMyIYJnbgSMwb5PfFEaES8oYgJVG+wjJNdvy0dcQirnDDKgJQlKOKA/SifQfsd X-Received: by 2002:a17:906:1845:: with SMTP id w5mr101970eje.53.1567632169310; Wed, 04 Sep 2019 14:22:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567632169; cv=none; d=google.com; s=arc-20160816; b=Pczw4IdM8VgKd1uBslIduwD4/uSGyOJ7I53ERXQHsc4nINLle9jHIRipuM0TW07Zb8 t8YgKLWH8tCB3LGTUZL8icE0YvKfd08JH2LKr2iUQh162f6DKg+CXsLaD8CpAwBtLgTt hvoriZsZt9dyDtF8vAXQstQJ2uQ3hD+QcyfeINnowpPZX6MrTFnOxUQUX33HUCm2KbO9 Kf2a4CJAk/rOkMSMyZ3D9K1mUfuZXMQd3MveGGNab68AI8QxrF7ca2cbpOBAOU32xGMW EtQ9dZ2DLXBMYz1cQYzma3cB0WE0DHjaaIahWKiKKA8VZsnVW53SVp8PtXn0ik8cZUGz dP+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=IYl8oq3wgcFADu2TXzuhJPsVZA2wiZ1eKvheGFBu/QU=; b=yExW8gK47WX1SBVisFr2035KEknEi5ALICAsrgQyRjRZ/a3cuMUH5D8IoLZuUlq49s oLhsrIYnO4uLdS62U9IXvRKi0pO3bg63+wchLUOG4sgu5/dgVCc7PdwvJ4jAlTjcpeuM GJEsnArlGn2XhRW4+XFI7EP0qvhACeRPJiOOeoV3Ja/lxyz2ZtU2YbrhJ17OuYU9mnpW 5BmVVt5td0J/U5V7otNZ3oDYe7hS9snxeXlFnDdm88B0dDKon3/941jLncvhWVXdPydF 9jmWDwhb1nY1toB7M4tNWjm26TaLDxOiG2N/Vx9WT078TGRpI628i+Z2OjFXwYLy4tg6 e3cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E9PHPaoF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b27si135955ejq.314.2019.09.04.14.22.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:22:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E9PHPaoF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cjo-0003sq-0C for patch@linaro.org; Wed, 04 Sep 2019 17:22:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3x-0000xo-5k for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3v-0003WT-L4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:33 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:40144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3v-0003Ue-Cu for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:31 -0400 Received: by mail-wm1-x32a.google.com with SMTP id t9so220402wmi.5 for ; Wed, 04 Sep 2019 13:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IYl8oq3wgcFADu2TXzuhJPsVZA2wiZ1eKvheGFBu/QU=; b=E9PHPaoFW4ANjCOcJIxMFuDNhV5Db+UjQcGlh+cj//DTtHBLdjUxkYXlcJY9fNO7zm vUXWZv1x7YSfmftO5oLbBxHITCocA26g0qFAaX75WHdOB85zFO7v/pIA5BeWXOH05KMl kPjx/1nVSHb8+SaRa907bRjNX7dGhCXy0OcZ7UM+CDnQH2OPe9N3Jp1JvO2czS+Fm8BX ojttsb8EpYpWSLzFVa1Tiwz1fNZygOeAn7lGFr1+xBKxTRSq7ixhNWpw8ReUB+mNyS07 wwLZ5gWADK8ZoGo2zzj2rDQnqIkP2oaFocRombh8KaNc0+GdS5NJ38kLwtggf1Z2jcMg Bg2g== 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=IYl8oq3wgcFADu2TXzuhJPsVZA2wiZ1eKvheGFBu/QU=; b=CGdbTRa+HG/WM47/kIepOlV6VH3F2DRpLgOPwflhVBdRPQ2hKTotfutNcM4+ckerMk wlVtwSmH0n1QalJvXUOve13CXNYh1CwNDMVcJ5Jx3jxBVub3CLnYunb+2QpaFDQm74yz eOqq46xBCGxjNk+0fVEF0UFFL0X0FWcBJfWpu147QedHRkMRdGOuNheB25WKaI1idLgP vEVJxCaAcgaxA/8Bp13g2DGpKP2Gi/u5R0pzhOc9dNlrqlc2mdew2jy0RQqxftTzXsPG 52vGFj16hHbVkwiPF+mixy4dOV1xIEiYJQ0T2qZvl62urNEqHgCgwNQ3uwS11CEFrimv G0Ug== X-Gm-Message-State: APjAAAVkMeEhQt7dpaJxVWqe0z14qmPGlFXjU4mbdba1UZsXPDKGD2k1 mvS81MGX8kkITaEG4UUyERlsRw== X-Received: by 2002:a1c:a6ca:: with SMTP id p193mr99904wme.103.1567629570219; Wed, 04 Sep 2019 13:39:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f6sm39064109wrh.30.2019.09.04.13.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 085D21FFB3; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:59 +0100 Message-Id: <20190904203013.9028-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PATCH v1 28/42] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This prevents us trying to do builds which we can't complete. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index cb0961a69e4..46f95320e54 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -104,6 +104,15 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe +# For non-x86 hosts not all cross-compilers have been packaged +ifneq ($(ARCH),x86_64) +DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross +DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross +DOCKER_PARTIAL_IMAGES += debian-s390x-cross +DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross +DOCKER_PARTIAL_IMAGES += fedora travis +endif + docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 From patchwork Wed Sep 4 20:30:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173055 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp441127ilq; Wed, 4 Sep 2019 14:08:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyACP1gubnJAk4wfrPg/DcKir/8P07Wc0QMX6OsZW0McXZb0ITL+BmTqUz1DMYrN48/Yvas X-Received: by 2002:aa7:c1c7:: with SMTP id d7mr348076edp.34.1567631322382; Wed, 04 Sep 2019 14:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631322; cv=none; d=google.com; s=arc-20160816; b=x/6wMBoPedjtXuw+24appW73vl2//DUckjLv8tTprmy5ZthEDiiQtOz1AqiNe1743V eAsZ3FT6LKtBUFewY0u6I+QGWCraJQpgy32pH2VWWIrjVc0oUxog5FzbuPxrZSliSDHa wagEMG4JlKlLIG2nSpFmB0o7SxkKqFr+blLVHTdEYhrPunMnosA2OpLnsDnTfDBIaNBe 5NbKNUZEo/nkElX3lj7dGlzGHbvlJIc7zoL9/Azccul1c+1kIqebxhnyPFcTI0Zo6ndF yrrgQPr0wYHylhK9v8c6hPemJ5l4P3K0Ro1tuHaFLGKimrUe3sT9sVD4j1Cm3UjvdtCb mvZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=ugB33z9NULKx/y//kwM5sEJ+zrs1rMaIgZwF0Y1O2S8=; b=oyw8hRVMK5G4JEgWZzGTXRojFxtCI7AB8HRysS33G7k6yDu3+7KJuD79dQgQJ01Pex lpJTNi6zQp5Ls1r741iwOoMfs3gZhES1WNxGHnKGMb7mftNbB95Gsi35RrZ0Kd5Er7O3 oLHKjli+lwK87w5LKbNeMrD2o5sQC22/o0cnhD9tzKzr5i0rcPaq0AAmiOay4MsIgmSD OPvHmkkAM/mQvzAoIX5JkOE5GYGmE+9/FC4R+FKm4wuBCrwWNSN5iscZQLZhOwtpUqhO SIrd/TePkBNN4rKCjbZ6KK9ccMvmLAz61d60egUtRpMSVtgEoJdp0QmxIk7BCXemfxzs fGPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ONZrdF/k"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e27si3816422edd.172.2019.09.04.14.08.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:08:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ONZrdF/k"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cW8-0004jm-MI for patch@linaro.org; Wed, 04 Sep 2019 17:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49897) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvT-0008DM-Cl for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvJ-0006kM-K7 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:41 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54796) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bvD-0006fk-7i for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:32 -0400 Received: by mail-wm1-x344.google.com with SMTP id k2so190360wmj.4 for ; Wed, 04 Sep 2019 13:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ugB33z9NULKx/y//kwM5sEJ+zrs1rMaIgZwF0Y1O2S8=; b=ONZrdF/ke7J58UfmcBcLGVufiSjJNdkGTluszm70JwS9xFifXl1NzJYycYGlzENQby HEvIn3vBN2ZddS8fh6PcSVe7wlwLbDjGNKjL0slBfrJd3/MIlfqC79DHeOC1+y/X0vPk QOibbXE3K1RLT3xduUojvFa441lXeVKF672z9lhWUpcdU8vhylBIU6F9ePcSv/aFfY0H iLXiCFb9YA5fOhvLH+Jaq1QN9Lr/FyyHL02U1rHmt+vWW91CwJuIK+fItX1oH0xQfPbR q6gVSSMddMJfeFwDZj9/NtR/TK47XD2tJkg+cKwS3wxOjwIQJvLIhgungBr5nqcI4UeH IFGg== 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=ugB33z9NULKx/y//kwM5sEJ+zrs1rMaIgZwF0Y1O2S8=; b=thgflFZp0j52JfXETpK9BsIIb+Yye0AgQwKO8xgi3u8f6sV5ERQ6aSpB8QhF+3+gqN +SJ/1AHSE7xTRe9c8ecFOQXpmfx824FWcsggm3vWP3cpWpUbYlx3X+5iV1+yTwQLn5cn hQL+1b+zBGxMkx4bXn8ELOUYFO0ch+omYf9jyPAhT5u9jzE543D1c1fcib6MTyvFG4dC 7OxxFvJ/7z6mP5QNAhTzDGCI8jeiVwoT0s9MH2V7LH6NvHRyqkdUqTNG20l4SsFya/k6 eI4GU1/7heCfgJ5StnU9fcN+Aw8Y2g52xl3o6MX7+yhDHCGPHOdZZ+PmgIAaift9K8Os ZwPg== X-Gm-Message-State: APjAAAWE4TgtNv388So3fUEDOnikXz10dCzz0XQUEdjc3ITu414uBduI qZdmOx5i+Ao9ECyZgdAbXur6SA== X-Received: by 2002:a1c:3bd6:: with SMTP id i205mr72432wma.135.1567629029318; Wed, 04 Sep 2019 13:30:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y72sm281324wmc.26.2019.09.04.13.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BB421FFB4; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:00 +0100 Message-Id: <20190904203013.9028-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 29/42] configure: check if --no-pie is supported first 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For whatever reason this doesn't trigger normally but because compile_prog uses QEMU_CFLAGS we end up trying to build a -pie --no-pie build which confuses compilers on some non-x86 hosts. Signed-off-by: Alex Bennée --- configure | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/configure b/configure index 7860bbc3121..30aad233d17 100755 --- a/configure +++ b/configure @@ -2021,6 +2021,12 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF + # check we support --no-pie first... + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" + LDFLAGS_NOPIE="-nopie" + fi + if compile_prog "-fPIE -DPIE" "-pie"; then QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" LDFLAGS="-pie $LDFLAGS" @@ -2036,11 +2042,6 @@ EOF pie="no" fi fi - - if compile_prog "-Werror -fno-pie" "-nopie"; then - CFLAGS_NOPIE="-fno-pie" - LDFLAGS_NOPIE="-nopie" - fi fi ########################################## From patchwork Wed Sep 4 20:30:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173036 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp423290ilq; Wed, 4 Sep 2019 13:49:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZhOfu+4iHidK58hJG+B4mcHE4KPdMGiuFRv/NvzWVjKfXzO6oeoBnAwYO22hi6aJLmRKW X-Received: by 2002:a37:4fcf:: with SMTP id d198mr41482011qkb.394.1567630169175; Wed, 04 Sep 2019 13:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630169; cv=none; d=google.com; s=arc-20160816; b=tglWtz62wuMUoMwRVjPDe47yN2TYiN415MWTeZb1IjoClNQcjxOW5osvb3SSQgfVyt 7mLaKjlf8UdixoySD3rRIsyz09q0n6OqbEs9gU8M6VXzPxqD2rpFvjCrH/aXGPc0DvAj M1uoyv8NwU7hyBlvVwSVr/18srgDw3LJQjZFYOMDOTGxZFjyv5yL/40b+pPJ4+KM8HxK Nr1KhaBulGdmuy3BURSNFJt8viB1Se1dg7Ce9zStRiz9jYG5LOCfxGv/EdQuzq2jUBw2 hvGPW4jq0+8uNInZTcThTtIygyFTynWziTiWh4K08thGNybihyEePInbruRQFqB93IUQ Y/cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=nE8/v9/E1aXsZxbh6/91YvEiHDaWx51s/9G3ceEKxhQ=; b=qQ9EAkzgmG2zLCWIf0cajHXOvTmDDjFVqQkovCghKV9y0wns0irHSrzs8oGKaOjLiU bVhqSFITquTeAfZlPhRMDFqUBEiwvKljakzPhARFTDtlrDQmU0hPwPWJOe935mvSJ7Qi l21Xv1/kNNuwabEMRNlSSNmpFSpIxxc2KWCwoKTdVn53u98M5FsNcJuB2i3eYEXFB60H 8x8r7Jn4L2S7Sl3bJ9/fZEi0DgFO85dHZGZOxeyjbU8LWmeseXrvz8Iwk5fqq2acsr3e n35NO1feCIglcP4vvM9/V2BJA8XF/53wCW/hWtFLoNQCMQMTbFbnVD5KOEQfEtOn8UH5 DC7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YHDgLRTR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h3si36618qve.198.2019.09.04.13.49.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:49:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YHDgLRTR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDX-0001Iz-0G for patch@linaro.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49834) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008CH-SN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bvB-0006fd-HI for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bvA-0006di-Bd for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:28 -0400 Received: by mail-wm1-x334.google.com with SMTP id k2so190261wmj.4 for ; Wed, 04 Sep 2019 13:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nE8/v9/E1aXsZxbh6/91YvEiHDaWx51s/9G3ceEKxhQ=; b=YHDgLRTRCJXCJOyb87/qCAwR5uNDwovJ3Q/EMi8uTj0lF3ba1bQMicVIdSCMKRmFMt MJxc6CCmh1SqZNo1yASDXgjYWnpQSsT20hP1eIlztMDQTPOxWzOvEKUFl0xSlRf0ZvdI EzVKbymVkvmh9fJzcnrhVPWM/Gz3XoGrLd6APGuTFxsik57V14qQPadyHHepTxLzIkmc t2R7v8C/5Z470wViHNv6aS2EZSvDoBkigkmV3lTsXj7W4/4Z70BZhkiX6WnWsSgLMKID Df8/ePs5lX61+QfLX6H6n0+rB5HQSIEPgjdFkmIOMUOUi360nBGyAVfQRIzHV+ZW9oGy dHXw== 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=nE8/v9/E1aXsZxbh6/91YvEiHDaWx51s/9G3ceEKxhQ=; b=Pure4+z7vwGnEcNAe1GvMzmZz4kFGqDkZfQdoEwg5hoh/rzowoSf/Ybdcgbp7JqKNh TeDoEXYnOHt7NsL9KKhAkwDFzwVYsBsqP3vQPEbw7OFxaIqmz1kuvNB+3zXymX6eJA6v YpKjnj6/CmM6RaNNX2vCaW1uYuwt12TxquVp67GsWi64wBwEFaNLRNqU8w16NI0PD/tk yW3+4HuSwp/JahsvZBwy4Zj1Q7HmLhGjdy4WjWf0emh/zFikavkBfbs+6XW5uJAh70jI Ci9Y9jyk9bVgIeM8pgyuOv7H9XbYydYIsOQaswDnNswJrsJr+fZraZQzKUITpZR17n// ZBbg== X-Gm-Message-State: APjAAAWxTx3XqVrDNXVtzzzryvKk9W9wMV+n7qqyoFiFhHgfn/m5SUSe sbjP7F+vwQIxt7UrHxLOjtWMuw== X-Received: by 2002:a7b:ce99:: with SMTP id q25mr67180wmj.163.1567629026881; Wed, 04 Sep 2019 13:30:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm116315wmb.28.2019.09.04.13.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 303761FFB5; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:01 +0100 Message-Id: <20190904203013.9028-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH v1 30/42] .travis.yml: Enable multiple caching features 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Using the 'multiple caching features' means explode the YAML array, thus it eases the git workflow (it is easier to move patches around). See https://docs.travis-ci.com/user/caching#enabling-multiple-caching-features Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20170809202712.6951-4-f4bug@amsat.org> --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 92b00927d4f..612caabc6cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ dist: xenial language: c compiler: - gcc -cache: ccache +cache: + ccache: true addons: From patchwork Wed Sep 4 20:30:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173090 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp467214ilq; Wed, 4 Sep 2019 14:37:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqylyzX7n0QcIB0uFFDzBCU1RBMiaBQYjoXv2WPohB3G3AJCCmVdPw6wYkkjc9PavYZhW/ZX X-Received: by 2002:a37:8e06:: with SMTP id q6mr39199546qkd.89.1567633043373; Wed, 04 Sep 2019 14:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567633043; cv=none; d=google.com; s=arc-20160816; b=nrMOhATK71EkpQqNcEU6gig/U4Z03zP4d6PzGJV4MeWmzQfBkpF38eU8ohABwJX39+ FQBiVo2rZuvRuczVp6Y+ppEKvjH70rPFNTU6fkX8PLX6sz2UKD8vUCgLkqjH9rWxAf2x 0p9DvWf8hvq5QtMtGyGIk+aAobCAz6jFsI/FJt56tUrWuHgWuBZmJYvoZOOggfO1bH15 ous5VOOZnZy/p/u+Tz0eVukDiQL0iIMCZj/xhnEiZWmtgriLVIbu3hSnhWdYQvEm1lUp YPoxDCZ1dEgC20+4M5YzJsM0gplDz384WzCgAWG0KMHn3XIzDzAYL17Yo2AjAdXh0XI2 eqcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=shdEgCVsEVOTDp+jCd0tUk+kAdVtVP18WfvdQSOvOYE=; b=JswJg3sVlvT9Kv94EQVZ+O1yO7fKGyocjA/M1+gur+PzMAmbCf7OJTtPXOseXwjaI8 ifi8tto0rQ9KWZNx9J22GwlVIs8Nhb3YeU0mPPMmx/twAiB7NrcmMUD0L0pWYm7xd+oB nfDAcz8EwydMXk2KBJfwKGAH+H8c0VrwqHecNcDOwX8fn+8uV1kfAIDnQa4YK6+MnN6U oWJQ8MQQecXJg4V28cXZlXeVl6FRnTKj+/qbEpDZPuHllgJn1i805vgWZ8zflQV2HWie OYuCnUjS/jGecCMZ3SiKzc6o+S9DT3c+kxowdF14j1QvwiJpj7XAhtn783WDOFp7ACi7 CNwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tINgPuPL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y43si118508qvc.221.2019.09.04.14.37.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:37:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tINgPuPL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cxu-0003Zr-2h for patch@linaro.org; Wed, 04 Sep 2019 17:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54133) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDV-0001uy-W7 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDU-0002Qq-OM for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:25 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDU-0002QH-IA for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:24 -0400 Received: by mail-wm1-x331.google.com with SMTP id q12so255804wmj.4 for ; Wed, 04 Sep 2019 13:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=shdEgCVsEVOTDp+jCd0tUk+kAdVtVP18WfvdQSOvOYE=; b=tINgPuPL+iaIB2ahUfBaaN0yzZQMa0m77Nn06PM+xqZPmDSJLhWACVSe2klWID5HTe IrOWj8ywF+z1jukjUocj3ZtHQWZxkuBAyA+lsyIyXUXLW2KQh6UnkI1cty28cjd8jsW6 9d018mApjtgz+/jcyQ8K64Oat3Ydq1gOfUwpFaPN5VyY2jHBg5QE1FBDyRo4gvJuDU06 cpgDRNhXDcxDn5aAqYaZzstphDS4CVtoKxgbunsT1J5Dy1r3kTx5vJaz0IN/J+KFTiEr fd4LG0bBUGKig+2xWc3jOh9NboG3fmWzmEFaxFPySU56PCBcaNjZkCjHjZKY2Bf09OXR fLNw== 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=shdEgCVsEVOTDp+jCd0tUk+kAdVtVP18WfvdQSOvOYE=; b=me/EcPZ1jx97Pkos0gejeYY9+HABwgjJFUbJP4bhsRuLecq5eiiu3qELSUX9o3ivr4 LU6xKUO6+ETXp17XYNmzRrr5lemn2kvPOv7x94wOTo47Z4KzMhn7fcL/MAbItZiTcIlK /8lIeqMpHlD6kmSHlB4CCTz3MaUYFid1jrqRZ97Nkf9rVilGsWs9KMTD1ss1iNBvUVdw yYHqvemwpCDvvK0Ld7FtCVcyjo39bd0phOzBB7MZoPGYWeMJNV8tKnwC9ArlTIek1fXu 3aTXjq4f8MGvnzXRvHPU8Wb2Hnyy+laAWL3PAfi+CXFvXpmi/cYOsR10j7HX2Q7PCo3y 4sBw== X-Gm-Message-State: APjAAAXsoEBpcInhdzZ0Can8l8bCKruadR9c2IppBt8RmYEhffyGsrU1 CJ0fEoq+v+oO8D9FZ3Lt5HGrfQ== X-Received: by 2002:a05:600c:cf:: with SMTP id u15mr158427wmm.168.1567630163382; Wed, 04 Sep 2019 13:49:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm31841389wra.91.2019.09.04.13.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44A2E1FFB7; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:02 +0100 Message-Id: <20190904203013.9028-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PATCH v1 31/42] .travis.yml: Increase cache timeout from 3min to 20min 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We are going to cache few gigabytes, increase the cache timeout to avoid build failures when uploading our cache. See https://docs.travis-ci.com/user/caching/#setting-the-timeout Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 612caabc6cf..8c376d22239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ language: c compiler: - gcc cache: + timeout: 1200 ccache: true From patchwork Wed Sep 4 20:30:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173062 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp449309ilq; Wed, 4 Sep 2019 14:17:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFcsMqXX885CgSD8YCWlYziIVxfNa4uFXgYnY231DQFpVvYM03F5myEmVa8WR6OHG073Lp X-Received: by 2002:a05:6214:12ca:: with SMTP id s10mr6882qvv.91.1567631834682; Wed, 04 Sep 2019 14:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631834; cv=none; d=google.com; s=arc-20160816; b=bEpQNZwlqvdHpMRQDBKvTTWdhnwAxOpeYSRAo5SHXOVxKn6SlSD/RrNbSEOvdeoCq/ IkiSaYBOotHdXMOoRea3K6zd/3rWUY8v6grFVnbjPgv5ys5he7VSSzLxrQaYXWwR1Enu chAXAjH6DoEgrs13GKrxTbcpUI2IXgTM1lEdkXsE6s4YEG997s2f+nbs1nbu+371lCYB C+7LLAV869IUU44vtQ5f9BVHivMax8l1gbmaV3daUSJs4gNgA0hQqDgkwLz6Rnsb2a1Y jqpm/2MWN2sWcs2RkwPan0IzJYEfu/LSwFEiiGp07SeKRtl60+JfToFDcqgXLk39ec8C UBYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=PIODOTVy4HDE3zFxAtxJ3smi6AAB4cF2pRQrP6evZ/U=; b=Fddo3LgHNDQ45EFKnXQPxS9LpmcKF1lSwwRvb9qdp6xJIv5IJDXgxezkmcp3D7t38r dhQqycB02u9Ed4vmtoFcE637NT2nScrJ8v4MvKZ/B43qAJMAFjB0XJFjMrpacgD+3gOL jyGKoLDMi42r5zoqSNEvISh6CeWSsSeaBbW5vROwx2U/UXYxQrStoMhMcDV8WZNLXlPk ByvaRTizTdIPpfrCCPa6/izgm2G4CxktYPDnaga0wAOBPvS8boxmHyzdHJDMDrVNOl5v cti2oxz9oMWnR69YAU9jtYAzsGqsmf+1tj663Zc9hr9vkOm3SqZVQWlHSH+hTci9mPbC +gpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eOKovI64; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c204si174574qkb.4.2019.09.04.14.17.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eOKovI64; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5ceP-00062q-El for patch@linaro.org; Wed, 04 Sep 2019 17:17:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51509) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3r-0000pk-BY for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3q-0003Qz-5h for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:27 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:55350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3p-0003QF-VX for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: by mail-wm1-x336.google.com with SMTP id g207so204892wmg.5 for ; Wed, 04 Sep 2019 13:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PIODOTVy4HDE3zFxAtxJ3smi6AAB4cF2pRQrP6evZ/U=; b=eOKovI64ggTWYbvl4vwuZOMrD3G3UNKZc50/ewN/tTWAk5Xl+IsVaZ9WTWhOf6LVBC KFFiEeR7m/E2Sx1Fi2xqWeU3W34X9Qs8y0bwzSBnHuyhwv8fyzqKViGFM+WkD5dyCr50 4xg3VomLtYHoQGQX2W2OSJUBVxdMI++zYZdL/3ist2PF/AI6cbXdTbOvX2wB54aq6g6N k/ocvipcTBrLhkReSCHspq7aT6t+IDPoHEg278aI4T7wbZCD74EGD76i5zBP4+v/+Zps OOGFEhfkwX2yZ1zu1YGRlty1gGpm3ld446zoGWd0+qo3lY7VS63+8NyF7V20F0ivDutw eR1Q== 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=PIODOTVy4HDE3zFxAtxJ3smi6AAB4cF2pRQrP6evZ/U=; b=GSh/8Yp6xtu5DyTjkA2CMUf8BpuIc6WwT/GUz24VrfbhyBiuXk4b6ZghLLaiYbLFnp omg5BopcQmCoGP+zuXwI/UNDO6lttq8mn0PFJqSeHSl18bodgXC9xtOgTRqHVfB/RpzK pLLkxT1teTo10wYQeGDOOavh6bXMDezujvD2eKscQO3CouGoU/M6KkhnOe+aRW0x3qrA hCXUTkXqrXZgmHj7NAwhFD9h+1j1Y/K1uGz1qRT7IRlIQ3qsh7YxsCQRDJ7zBlHtlq8n BdyAkT04WN1j0qFYCI0kWZsuMPqfSOvF9XfrLSVA3m5vZyMZtdQVuMtTgAGTA3k5OmCD GlPw== X-Gm-Message-State: APjAAAViywWOryHOQEgd+KOULqliDKzFeuOchcrkhWc6P6pb6xfA99HY xbw8yoKRvhm2JHfla2dlXSAUHg== X-Received: by 2002:a7b:ce8f:: with SMTP id q15mr128286wmj.106.1567629564909; Wed, 04 Sep 2019 13:39:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a205sm183512wmd.44.2019.09.04.13.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 58D201FFB8; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:03 +0100 Message-Id: <20190904203013.9028-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PATCH v1 32/42] .travis.yml: Cache Python PIP packages 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We always install the same packages ever and ever, cache them. See https://docs.travis-ci.com/user/caching/#pip-cache Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 8c376d22239..d51125c9569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ compiler: cache: timeout: 1200 ccache: true + pip: true addons: From patchwork Wed Sep 4 20:30:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173065 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp451691ilq; Wed, 4 Sep 2019 14:19:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxf0cp0uiJZ8sgn3xHfUkYSiGI5IL361Lu9Gf2K6k8UsFWl3fDyAYEJqFVusmnWBz019QRM X-Received: by 2002:a50:91f4:: with SMTP id h49mr317047eda.201.1567631986587; Wed, 04 Sep 2019 14:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631986; cv=none; d=google.com; s=arc-20160816; b=B+8Gg8SRjKF6oZN6wn94W8kFHQwW7yjzdCquFXisMrO+ODB/negZZaTCyZDJmfC5nb +7VY06E+nLraUZwHazfEAlJxEzpbcbYU6qOxSXzN5hdEt3glzwx17LecjM6ntCE3Mxaw rGqWCnSASgD9JxvYZt168PzpENOdSOTqwq/vCzC0l1NyBzq+2CFi920XKccZcdg9iREn pd1mACkluV2t7BrRWBulmc+OM5z4vn5BaJ8xxcaxfVFy3bDamU21ooUJjcUzqVVu39cC aYSsCvENvlB2mwQyWlED2aJBzUFYTCq95nHHEnSmZQ/oOBF3wm3eIjvxkHgldoJ6whu+ wPJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=64G7UeLsDjFeeVvbu2xeSpSIwcgh91d94iOUcw83/Pc=; b=QArY0v9/zefoHY4sazzR7qbl9Y8Krisr8ObrfZ7XCFMZ+KkZZhd4vDodx4dA30O628 hLfWDQMyay/NP5ZU0qjAQgpP41tPy5mZDyVy5QUh5iox1Y+w4giXZ4tP2wwOyg3iOAg/ h5po4lDbcaGb462xmDc9xYFPzDPx571s6b7uHHdn6jmc4U7NoIKV7HcKEYztiLksB4AD Ik1z31kXJ3HqksCCj/kZ7uPE1QskEgu9RzskAgJgtZGZTk6/8QZlXsIqzZLwNCmcY/8A 5D+dWPiYNlmW7bfI/S0t7rm+4Ywiulzq8v1wfCDO/508dobpuvplPFKOAEhtL22RQuNh 0CGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D7dw+B7K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g32si7751419eda.330.2019.09.04.14.19.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:19:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D7dw+B7K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cgq-0000BA-Sy for patch@linaro.org; Wed, 04 Sep 2019 17:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51541) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3s-0000ri-N2 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3r-0003Rv-Hv for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3r-0003RJ-BO for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:27 -0400 Received: by mail-wm1-x32e.google.com with SMTP id n10so249307wmj.0 for ; Wed, 04 Sep 2019 13:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=64G7UeLsDjFeeVvbu2xeSpSIwcgh91d94iOUcw83/Pc=; b=D7dw+B7KLFIq8rn6jnBco3oBLHw178Vp4XZ3U+rRQCCnwbc2ZJKUBSMOYyKuuj0idp O3XL8XDVpXkat7YP0L3fBZD7VpK/oCTDox3PJhgqH+5PXKbbG3PkI5THlH6TqqUEnFya QC88DkkRpnP3QswojcLMkydDrwgrYRdtYhUO38j57BTmmdCcJ754zg6/C122DZoY31mz bfRVy0QUsmU+XocWit4ek5qkk+444HnYxNtqVV3jeAnsuCX2qdogP3Y/QlREjwNayz7J PQgtVUxz1fS5mS7u9JJ60MzlWJdW7Qifsc0egLzgwCCf2Lbjuy4/lJvdpm2eO218Fkbz MYfA== 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=64G7UeLsDjFeeVvbu2xeSpSIwcgh91d94iOUcw83/Pc=; b=IXLhknhWZC/d1aK/gL1CI/6MantQNY9L1Z3TE2dzvmbtU2p5rmRFt0ODtsb7oLNS0/ ws2iwQcjk+39Kl7WgWVnwz6W89VCxaVvbfRLZQ9e+ZLV6BMMw7Eb6ctAe32EIrNbxuEx cRe4jB3+0JZ9uIR6W9BDQppA4G/xwe67NO5QaDTciahyrx7fhNGKAcNILZa71GhADXUB g1FWi/fPkq+AO1gHR/CG7vY+kH8eqRJbKNWsBwrfg7+5KOhiEPqFaTc2o9E4wTZM0Rcq PSQO73CiwNniSi0+efQMnfJn7UVqxJheFgK7A5jGJz7bwQ8AnwanBftl3hmJzIVgQcw3 XKtA== X-Gm-Message-State: APjAAAWH4veiw42wC3sHv+llF1YAZyx2ez5v9q2xdrqwZZQJPLv7oo6Y L58gyF2Pv4tCXLa+Ci5mi8Qwew== X-Received: by 2002:a1c:d183:: with SMTP id i125mr134216wmg.1.1567629566291; Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm39505228wrv.54.2019.09.04.13.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6CFCF1FFBA; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:04 +0100 Message-Id: <20190904203013.9028-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH v1 33/42] .travis.yml: Cache Avocado cache 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Avocado tests download artifacts from various sources. These sources sometime have network issues resulting in build failures. Cache Avocado cache to reduce build failure. See https://docs.travis-ci.com/user/caching/#arbitrary-directories Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index d51125c9569..8d2e89da533 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ cache: timeout: 1200 ccache: true pip: true + directories: + - $HOME/avocado/data/cache addons: From patchwork Wed Sep 4 20:30:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173102 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp495409ilq; Wed, 4 Sep 2019 15:08:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzBx/A759Zb2M6f2AiYXF0s5mE+yvUo3LTGM0TyUxNHOW2nGTh+wqoeZWs+IvD8siQFtqnI X-Received: by 2002:a05:6402:6cf:: with SMTP id n15mr488023edy.213.1567634935716; Wed, 04 Sep 2019 15:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567634935; cv=none; d=google.com; s=arc-20160816; b=kElkpNwAjcDNglwXbDDPJGweDYKqaXlQIiihVg5PTCc/zkQIgaVl6GQ/IOUvreWzyT 7CWQY7w9lkmzg8aRf07R6AotFLpPxrHWXdwntWKD/XWamuiuS99ob8m9d2fUMUYBLDHU zWErbewX7BkzkAWg/uSYrhP9qRAVuDK72e+ZRFsMN0kmqjQCH6wl8oP1cQxMhH+DnsQB HJGwneBZYGu5FpzpuL5+XtnV1UmgSef+ZddAgvHJHxD37cs6u4w3wzIqXP37PWyR8GVz +ZgWzSux1YLO7OhHIBZANYvW0O2mHW8T1Vfh3HhPBkaTlGirQztchsSWZgEzwK/kMX5u AYVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=L4odYbRNIesstedT/hIMRAackRtRJmlkYcVFyEsUJv8=; b=c7122mfGWCssOXVopHs9WQ2c6Hvm2vMrTf+vlhsdrZbCJSTII/7PZYswMDwjJIIjvf z2qOksNGqTes03R+NhsUSpqOaAmXJV8UCTq6+hB9B18cs9kic5GYpFXy48jvWctR0VEq Kg2EtYl9wVpx+dmZPVcPS1zj/LwBWGBZqf/YG/uG3Ch4kfXXxeBqzn/wMU6rW9tWIyw6 /klbZGfB5EBJsbKsS2AHNCcu9vxsc2M/HIhkYYyS8PH+9Hh5zIyEGaGslIsjnhvllY7H QAl2stOMehQ4EUR2y1WaQWG6so5UoSZzvfXA1l34o8wLeNqpZNY1MjGRvCBYuovhWltQ e2cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r+q7Am+7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k39si64804eda.50.2019.09.04.15.08.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 15:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r+q7Am+7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5dSQ-0000jZ-JO for patch@linaro.org; Wed, 04 Sep 2019 18:08:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57798) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cWt-0007Ca-Mg for qemu-devel@nongnu.org; Wed, 04 Sep 2019 17:09:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cWs-0004Sk-74 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 17:09:27 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:53481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cWs-0004Rs-0R for qemu-devel@nongnu.org; Wed, 04 Sep 2019 17:09:26 -0400 Received: by mail-wm1-x344.google.com with SMTP id q19so290955wmc.3 for ; Wed, 04 Sep 2019 14:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L4odYbRNIesstedT/hIMRAackRtRJmlkYcVFyEsUJv8=; b=r+q7Am+7dI6hs3m4n5+Kf+i7VYTz79M76Y4aXg3geXoUjkqFox7QH0ABetCesfQoES jVFkYZfskXzKKulYFWJXiuBKgeZmxN7cBErv3foTH27BINXEZzef70zIaclPMAgZ/6bf ORGZFRXusLa1EylmWGWrAR2Jw/POX5QrdH16Z8ag5YXMK98+NlQHxjWjvlxYiy5W+zC6 hvEREiU2H9QZxXqe8eVgGVazrggnkuaTIn/b6EpRlrquiF5S5Omdi6GQxKTPYL3jSgi3 J7Qmt4oxSvsKiygvqEfmR1ODfI/tj08UL6XeTDh19pqPvxoVKvJWPcx9o33BtA3Jo/4i jihw== 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=L4odYbRNIesstedT/hIMRAackRtRJmlkYcVFyEsUJv8=; b=pLdD8gnuejxzk4z7jW8Ad+KqlBbf/AqLd0+Fpw/HoPcfNJH3lh2JoUGfTW0L2yIawe dG+c8PzmKPPzx+4NNtpUS/j5UZ46m1aghqY3cmg5QApzh385zIR5aPP3zat/PI1J0hjT 1BC9Ap6v7NGBIy/pyIUzZRugChTU++1wsNKa8/uTL5GYhzhH8iEp+Qznd61riKybzT1D NIx/G7LUx8ju4csthiNn08CcT7ZWMVHRFeh3t3kBqNxOYjgG9yly3IdpmihaThYrwyCM RC++Xm+pB+ZpFUhpqAfZPlXHY8a1GBl27+WXEe9dyks5Oh/ArSU3LjARPXYAOua9bDxr 3qoQ== X-Gm-Message-State: APjAAAUgcW1I94nOS9Vn+oyHfGu1Bu0EPlsb5oMCEmY3uYWKVJDxV/7/ ekmN8phFzWLVgBoc9NDNYoOADw== X-Received: by 2002:a7b:ce8f:: with SMTP id q15mr198570wmj.106.1567631364660; Wed, 04 Sep 2019 14:09:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l10sm38341wrh.20.2019.09.04.14.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 14:09:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8104C1FFBB; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:05 +0100 Message-Id: <20190904203013.9028-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 34/42] .travis.yml: Improve ccache use 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Per https://ccache.dev/manual/latest.html: By default, ccache tries to give as few false cache hits as possible. However, in certain situations it’s possible that you know things that ccache can’t take for granted. [The CCACHE_SLOPINESS environment variable] makes it possible to tell ccache to relax some checks in order to increase the hit rate. We can relax the ctime/mtime header checks: - include_file_ctime By default, ccache also will not cache a file if it includes a header whose ctime is too new. This option disables that check. - include_file_mtime By default, ccache will not cache a file if it includes a header whose mtime is too new. This option disables that check. We also add a call to clear the cache statistics before running the build, and display them when the build finishes. See https://docs.travis-ci.com/user/caching/#ccache-cache Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 8d2e89da533..5a878ae6ae9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,9 @@ env: - TEST_CMD="make check -j3 V=1" # This is broadly a list of "mainline" softmmu targets which have support across the major distros - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime" + - CCACHE_MAXSIZE=1G + git: # we want to do this ourselves @@ -77,10 +80,13 @@ git: before_script: + - command -v ccache && ccache --zero-stats - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } script: - make -j3 && travis_retry ${TEST_CMD} +after_script: + - command -v ccache && ccache --show-stats matrix: From patchwork Wed Sep 4 20:30:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173063 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp449370ilq; Wed, 4 Sep 2019 14:17:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyMZgBqx0Yy0QRS/ZBjskKucg1u3RE61G4FDjqhqfT+b4Wwl26mtSAMJ96l9vFZSmozDPs X-Received: by 2002:a37:7347:: with SMTP id o68mr39928054qkc.145.1567631838884; Wed, 04 Sep 2019 14:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631838; cv=none; d=google.com; s=arc-20160816; b=pZjtqu7YB9evmaPbNGo7ohCOVpS2AH9IyVQjILThypYkZlDhgOuCgQXoR4EcfG12VO ReUEB/0wHC46KHwqXz7MbXTOIHt+GwxBrOXuSbtGiMgCXJuZuZi89ctvfBYyNvXnQhR4 Ewj5zzJeLvmuEdp/jNR0orm/gt1uDTHVk+1uu/iiSObWk/UO4DkVcoI6dssylXjhDmJx aRh8ZBfQej0hplfzP+4Ry88qjHp2rjCPbVU5Ma8Ro92Ici7w6sNHM+OjLNWPUfS0scZo w770RUIY9AQUVFr6v1UVImray/MwLClApkkMj3UpYtoUVqkVPRXUjWEzmX6B7FUzngIR p+IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=RZ6UCCmDQGiaJqZTOCfEgLv5zu9MkUOibodewE9UvRo=; b=UKU3zY3EHIRt6CE/w/vZm+xoNF9teoDU5V+Iulk7C7N7DdNzPy5g2kQgQCgtyCJ45l Jpd5Lz4nBVMlGvl+zXQF7agDjkPKrdmXGI7ZGzxY4Flz0LvekcaJ4HeCTJ2Qg0cHhJFj g861QIZji0lj/K+q6r252UU9EZaYoZl4B3SbXRiiNfHA97MrEa5TEot1iwUadeQXR4r7 fm78q1XXfPiMo1C292DRtU1hxzwqN8q7z2oY3PjXHJEuld+cxjPPTgtr4Nz/0RKpgTAX KdBQYpu11/P/EV5DxT85qJj3XeLn9nTIpJ1j+v0wWCwK2vkmXBdUMA6zTRVDKwy7WFHN W5IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v30EqjJM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p10si15437481qte.150.2019.09.04.14.17.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:17:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v30EqjJM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5ceT-0004zK-C5 for patch@linaro.org; Wed, 04 Sep 2019 17:17:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51533) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3s-0000qy-5Z for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3r-0003RZ-0O for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:28 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3q-0003Qy-QS for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: by mail-wr1-x430.google.com with SMTP id l11so211189wrx.5 for ; Wed, 04 Sep 2019 13:39:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RZ6UCCmDQGiaJqZTOCfEgLv5zu9MkUOibodewE9UvRo=; b=v30EqjJMH8BmvMqwQKLEiqct6fZkZnpWRILVtdxfe0kfH6Y/Xw2F3HKVQQ9QQjLu+8 Hdim7zvcT6sebcUjHfDN/fBnwEHa38G4f6hotyxaFQcUwIvfpGrfbZaEZUpVWL0AzvF/ QDdNkz5MLGESvSFJpIDEqdSsMcGX7nAsgCZAJuMd3JmCrqG+ZQlXQKKjZn1ui+R3UJNk iqCFf8rKBjE3nUFLKk0sGeBZHr8paXg8YLASibM+IybugiLQzbfJVHJy8hdteBeoNiUW FGxIfXx+pajWzCKeh9bO1DIB/8T3tyt05Gez3TRcjzmU8SuL2fG2gKvO2blxtvyBRNy3 1wxw== 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=RZ6UCCmDQGiaJqZTOCfEgLv5zu9MkUOibodewE9UvRo=; b=jWWGU95E6cxgJcbNVlluHhTh9U7RlD/hIAeFLek1zd17d27E+XK8Kib764Z1gO+f9K 0SEkMI+SOOmtzH1Jj6iNNZJF2FYwl5sZNmJUgrLEd5SXRsbkDLnKYDFcYQMcCBNgh/E8 J6HYtkqb2NLhmE4HqNrvX7/u5wZolz1tTgD9/cMjDA56yIq1do8pNzm481PBU8h5hMMU b/2R5HnCbvp5lWFwSk5xigrME1ZlBrQi4zoQ52wz/6tEbsdoL9kB0cHMIv3jyzJBuDIP 17rkLbSPVAU1mo31ZskIHdEV04PFRXHVonYucxXhfzZ/S0a1o3GbT5dUm8OA4jf2nVeg qzVg== X-Gm-Message-State: APjAAAXQJY4uRz0eao8AYGTid1sRBnG1b+fuXiWUvWPLyJky7uQ3mmpS DGjKyhiOLmOU7YabDaeGYH/ECA== X-Received: by 2002:a5d:5444:: with SMTP id w4mr33955790wrv.180.1567629565690; Wed, 04 Sep 2019 13:39:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r65sm263483wmr.9.2019.09.04.13.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 94E6B1FFBC; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:06 +0100 Message-Id: <20190904203013.9028-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PATCH v1 35/42] .travis.yml: Enable ccache on OSX 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé By default, ccache is not installed on macOS environments. See https://docs.travis-ci.com/user/caching/#ccache-on-macos Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 5a878ae6ae9..2dd26486abc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ addons: - gcovr homebrew: packages: + - ccache - glib - pixman - gnu-sed @@ -80,6 +81,7 @@ git: before_script: + - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi - command -v ccache && ccache --zero-stats - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; } From patchwork Wed Sep 4 20:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173049 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp435790ilq; Wed, 4 Sep 2019 14:03:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVr10+eMpnetq0OwrZduJbiuff+rk8SXqANZeswLUbM40C5mXSXW+U18Vqnz6s9U/kqIqI X-Received: by 2002:a50:fb0c:: with SMTP id d12mr241674edq.275.1567631003082; Wed, 04 Sep 2019 14:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631003; cv=none; d=google.com; s=arc-20160816; b=PYycCIEJMRdMs9jmxVdsTVuBd0mgB3TIAe846Z2vpeozM4Z4lfbdKOuVKi5OiIKgVf C3nZBTDhz/AIs042Ebb7dZKP5mg412PLMvgitGeCWbzS7qorbg4KiiM/x1OLTJUNzaI8 hW9Rw2k3Z6Hjx/RGMTjuEnrFCBDaW7eDZjrSMoLtagrgTrqsoLUewtasBL8Ia1mX0Pc7 ISQw867aRnGv+q1xYQ9KbYOAiBByvQuo4e2+fC1+tf7CYm+/EG+JCMms9XNN+qLkov0p kuJ20x17/R4/0ycJyFkIUIl7IbVwmJJbnL7ixKUWkzhxKyqStWyKKyNNrnJrZVbyI2AZ 9ySA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=3YyKCQsfgzvXKSHDv5mJ/Ups/NVidIa51ccen10JgYE=; b=LIyzB3m1BN+Hqjze745BaO/kl63NDUO5o2HuUuGZ8L4JCSnPniwZQONpBw+iYJafGP y55cAuF7vbyiGLV++pm2l26V1zDDxDxkbO9yBcQtUtuHVcAgBI2IhkVbSwf89lDCU3op b9MwulMkwCbo3wd/F0C+kvkVNMHCOxGshjBPOI0LjqD0qUy8MiWvHsFBwOcIIXBC6+N/ Uyk5hwWKy/NrvnqRo7gm4xWr1mfF9tGktgHF475VAOh/HoF30pA9FVwvQB6C8ZCsNmBw XyqRQCdIJNLv8qs8AaW3/NmHIxCj9ZXuCmVUxPydSn4ydxZn4C9be0eEIQbFuI1gJuP1 M6BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ttPaSj+p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u41si9278085edm.365.2019.09.04.14.03.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:03:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ttPaSj+p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cQz-0007ef-6p for patch@linaro.org; Wed, 04 Sep 2019 17:03:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51640) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3z-00012j-3U for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3x-0003YB-NK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:34 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:32874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3x-0003Xa-Gh for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:33 -0400 Received: by mail-wm1-x32e.google.com with SMTP id r17so3372465wme.0 for ; Wed, 04 Sep 2019 13:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3YyKCQsfgzvXKSHDv5mJ/Ups/NVidIa51ccen10JgYE=; b=ttPaSj+pg0CsO+J+ADN+B9sIbM2YYgljcdeFQGiiPsYypwqS+dkCGm9wG0TEiGnv4R hnROhgSeJRT56ul6B1hpTeikKX7cC3PmvCoK3n0icuSKoQNw2vKcLaNFsv39lr5zhvNO LQdpAZswinUdUOdc5MQFnZFx2C/VN0mz7y2mbfWJ2uWuiYDcaUHhCu4YA+8g8tIlDoe2 fHPbNt+rwybRzdBRGcyT8wlWaCmebAcDRDh99cBxAVvleejUOcAIJReDkaf+bU+Cn7uj 6pe0LzymFdkXdGiOaT8ASNA4OwhVNugh618r25pZJKn7jsY/dwhbbJ0i8gBov129qfI+ opdw== 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=3YyKCQsfgzvXKSHDv5mJ/Ups/NVidIa51ccen10JgYE=; b=FqH2kzE+xWVQqNMJUWvnsuyHLi+Rm8P6hGS3UWgfevULAFXn1atuu8nRjnqfBnLweg XE2BORq+aEze6TLHUgj5LOKtFnDQ9GjJwNQ0Ie3aFChjjPVLNvI58eRKXRjJxrNqA/MW F93x/v6TIS44Nks8v1V901gGoZDf4uD3N+ADQOAfdHp2fhNXMoQZLq7KU8lu03Ivtbg0 e8xsaHszaEVIu/8qBqMfZj2rhYmD5ENkhRe0I7GEiw0TrcnLVC39F0tTn8iY23F17xEQ gzPQuqbEVi5cmpTvJZUP7J8232qCtkQ991uYKlG4NBDoOFx562hOINcTBypLd2JZylAf Kw6w== X-Gm-Message-State: APjAAAUPQPr0+md1GtprxTtTQRo51s3/DVo0czag3SoE2rFAq2NV/CrO oucevjvGBl/rJIbCdmuQeoy6+g== X-Received: by 2002:a1c:9e0b:: with SMTP id h11mr123107wme.144.1567629572522; Wed, 04 Sep 2019 13:39:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t13sm26606401wra.70.2019.09.04.13.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A95F71FFBD; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:07 +0100 Message-Id: <20190904203013.9028-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PATCH v1 36/42] .travis.yml: Document how the build matrix use caches 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We will set the CACHE_NAME variable to improve the caching of various jobs using the same characteristics. Document it first. See https://docs.travis-ci.com/user/caching/#caches-and-build-matrices Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 2dd26486abc..ab3e4ebaadf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,12 @@ language: c compiler: - gcc cache: + # There is one cache per branch and compiler version. + # characteristics of each job are used to identify the cache: + # - OS name (currently, linux, osx, or windows) + # - OS distribution (for Linux, xenial, trusty, or precise) + # - macOS image name (e.g., xcode7.2) + # - Names and values of visible environment variables set in .travis.yml or Settings panel timeout: 1200 ccache: true pip: true From patchwork Wed Sep 4 20:30:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173099 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp482420ilq; Wed, 4 Sep 2019 14:56:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqzrZVBwZumlRSfzVJ+o5LiX7OCEvGN8195J1b8qWm6Go6ub8U2eAAvAEuVCtW0q5VkW+zCi X-Received: by 2002:a05:620a:12d8:: with SMTP id e24mr41894042qkl.416.1567634177650; Wed, 04 Sep 2019 14:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567634177; cv=none; d=google.com; s=arc-20160816; b=Vl6jpO/I9IfPFVsDbeIHfCy6eAoGhfzTiaahvR4OswACO8hj6Z2BQVGpmfnBY2LzzZ hPSVml0yqU4Wr7Qhe0uYKvkwYI9wWXyZDP7GkOUsgZwduMruuv8VDdFDq7Kx665lUmtD 8dtVs1JntY2xX4/sGWYprd9nMFxhTcCGvLIjxs8MpFX3k0pCrGhdEuwWP38WSw9V602L wMEYxpHqvcSaudp3+wRRj2eT72HL7fwKzFSF21sLqTCQvv06dcRyrp8jmQ/V/sWKDLQu M8wI2e5c206SUjI8st+FsfPak5/EcF2hnXYAVN9ZU6TN4DDZyiBNLcPRBN4xusTsv419 78Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=qKLxOOykUq5mR0vUYJUVr2Z+HnNQRrDR3i+FrJMMXro=; b=D+fh35N99QyJHpuNTvtqsorZTaoHQrlL9GPathh3cOdlGj3EdQwtDfyAwI0reIp+DQ 3KzNcvTEdaKfhDsjsd0+JCxYJ1RCxGP9uf2pSqW/eIy42FqZOMSX2/x8zFUSt15nXsEo 9IIEXaTMyqXAIWYY/GPupjVh7v8W6tYeNDHqIBdvKCI4YMlCdOky1b8nxDRHc52FJA9L TJbwqlZHJw2DUm2LnFKYSdZlz7AQJsGV/ulEeRE6QZd2o1DVmHYAoe0BKmAvBEbOr/id /sZST/gt6zVzRq7cAt2qxRz8nsWgNpQPybxJdJyCteffhQJo3s3y+S9/meose6IiN0yx p0gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=A7XkMm8u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k20si14711374qtm.308.2019.09.04.14.56.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:56:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=A7XkMm8u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5dGC-0006to-S0 for patch@linaro.org; Wed, 04 Sep 2019 17:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54152) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDX-0001wQ-83 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDV-0002Rg-Pf for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:26 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38999) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDV-0002R1-JF for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id q12so255943wmj.4 for ; Wed, 04 Sep 2019 13:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qKLxOOykUq5mR0vUYJUVr2Z+HnNQRrDR3i+FrJMMXro=; b=A7XkMm8uP4pO1m8nNBXRV4F2LExqjnwmiGjtX8u32IEggqbdU7mh/BG3HQ2Vavn3wn 4/La5P85lnJQPhOr4V165XPgGY6mtMxl+aruh1dA/M4elqqoSModGiwhpgKv1wKDej1v Kn8lUESJRQuCYDUZAiax44j/LR5aDOAgknxcxfhOYlfXgdNCzNCaC8LWmhB8EUwEf4jL DhzTylpU2NVlxZf/gfB2oaemQG+xivru30arFXw5A/aZEIthQtajabxVuFDggf9LphCi hvWBwaF7jvQ4WWjwGo4hIisVXdbT1egEpyBUGBP2TMRmZlIO/qYZEh3YagJCtggoS8Hv ElOQ== 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=qKLxOOykUq5mR0vUYJUVr2Z+HnNQRrDR3i+FrJMMXro=; b=P2vDkd68Jr2k4J75OHXX//xU1SIC06jkxd4vvkVCJH+qVtfLaGa9AfEO2OEET10uBI 9RRuYusP5UfzgWT3h2eR79bLMq5YSokBjFpPv/NXf+I5DW45qwjhO78I3v4xMRIzNIqi c4eMFfJ7Rr315jV3yoQcAMYleS9ZlGvcBImeDbKzjhqRgEN/Nlq7iQ2rFouQxnek6Dxq JAoXmP5CveBYRjz2UlesVhWeTh3RX8OFyAXAmTMkq2zF1cwfqMRrcQ5NkT0YqT8Ar6K7 orAAkjQzvY/Qg7aQ6pUT6Jd7lBTT/G9LR7GgBtgaleSba/shsbURRD/tHuUatMvJ5UC9 IsHQ== X-Gm-Message-State: APjAAAURr8IDpo3sgfh111RogWlt6jmuxLoumGWe1MThyPNUcttL9vKI h/fFtT8V9z1ORyHWEYPhGWRgig== X-Received: by 2002:a1c:7407:: with SMTP id p7mr150655wmc.31.1567630164472; Wed, 04 Sep 2019 13:49:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm23527653wrv.90.2019.09.04.13.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BEF3D1FF87; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:08 +0100 Message-Id: <20190904203013.9028-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v1 37/42] .travis.yml: Cache Linux/GCC 'debug profile' jobs together 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These jobs build different components but use the same host features. Put them in the same cache bucket. Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index ab3e4ebaadf..ab4ee425e4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,11 +120,13 @@ matrix: - env: - CONFIG="--enable-debug --enable-debug-tcg --disable-user" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" # TCG debug can be run just on it's own and is mostly agnostic to user/softmmu distinctions - env: - CONFIG="--enable-debug-tcg --disable-system" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug" - env: From patchwork Wed Sep 4 20:30:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173080 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp455289ilq; Wed, 4 Sep 2019 14:23:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyROzT0d00HCYCT+vX65fgrd83/CCG00sTvOQu67KTJZfNcQYt7gQrTwi3VMfYC8R8dvqkX X-Received: by 2002:aed:3e41:: with SMTP id m1mr139549qtf.273.1567632222092; Wed, 04 Sep 2019 14:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567632222; cv=none; d=google.com; s=arc-20160816; b=N7LmZPmkVT88ROXVtuRvVH5Roy12Z0PUc/2S0ToAM1foihrjwAXn6hklHBmRBpk1+P VNjg9JV/Sclu8St53HT07Ogd4olCLzd3sDme2jzc+D0wmzcl7iDpM/f93vFfElFhih0S 5hLovUhRhmqQg73NJMesysPf/PBkRjfvjnmBJs/LFq8kjHWR9WPi6UMCmlyZz7LmqiXr nAJ/QQJakzeeFwSow/UbqKopJ4hMMPCaAScbHdo2tihMJQ+f16soE0L+TK2vv/sFef+Z Br4JExNc7kTVd968c9LAGX/fbXCFUsf24lHGU0qsdZQUmlPftBPB8oMZ44TwlzYDMEDj gFNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=flNVhetGQgd7j0XEOCGx7V7AorwZWyuhXeU2KeK5ZEg=; b=oRfGr1betx7TKK3nwCuVTJtsMZpWBtKiTSvNy/nX5a9gCANTSKsjzqD7ksn1nXGzLy XWQKBZmicq/K+RbpojQTtmTd3RL9aZasyqUdqBc9x2sh86NE2EH4UqBAsLQwUCeiONWa BSxFVKPgEwdw2XfktDwzP39FmxlSBUr8CahIVlzIDUyAi78S9iwwBnZLnn8R4YMa5tNF PFsnvXzcuHGoHkMXgr9qqSB1xsoLKz6ZbaQMtRBIM9VTBqNsJfDOtzhpqIKjCkQrRzoe moiLiu1e9E1izY6qaEPh4l0dVS7u2/5fYnt3nwt5n5KGRGUoFMaYvmlUnAn84gtCti2b 5iQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amIRhnI2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s2si169783qkj.173.2019.09.04.14.23.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:23:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amIRhnI2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cke-0004s4-Pr for patch@linaro.org; Wed, 04 Sep 2019 17:23:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51620) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3x-00010S-Ul for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3w-0003XL-FT for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:33 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38216) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3w-0003WM-6s for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:32 -0400 Received: by mail-wr1-x433.google.com with SMTP id l11so211423wrx.5 for ; Wed, 04 Sep 2019 13:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=flNVhetGQgd7j0XEOCGx7V7AorwZWyuhXeU2KeK5ZEg=; b=amIRhnI2FfpeBQ8r+Uz0vUhMYEtdn7Xsom2QPdK7CduuI1bD61ydq/8orKDC+PAHTM mbdetLztfpjcsU4opgBI5JYxvSXckllp0Q96568PZdKNsqpjT3+98b6Pwkm+I5t0ppDr RVGXygoHrxL+muXmpybNORrB6xs+F1fZDjuqBqk1QmcBYxtUPZNikNtVJWo1UVaUTDra b4sBVzCaV05V8OxkAwgSaRsvG3AT9Ibee4bVEiboN1rp3tm1yGBh+iDX+PoERuGvgDRB MhCzi/a6FMiDDToNZhvdALb7GHRhLKWoWlC9VOALNfWJpO6wHJ/CcIT5WBKoBu5nBtX1 G0nA== 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=flNVhetGQgd7j0XEOCGx7V7AorwZWyuhXeU2KeK5ZEg=; b=uUUZTwk+8QO9MboWhpz2DyNgSaof/DT9kZI95oEof2sYg6tMtYW0MkTE7yg2x/WYpe a8qKa4z9qlgZvjAgMFvXapIqiNvHBhq/eKeblBKGXFmDp6f7ivUUjdnlZu9X1W7uEsag Y2Y0T3s7lpooQdHeeVlCZEh6cTAVGmAHNcWs2vbww5dhCR8fZPdAt7k8UgSKZz/Lklil xiVypQwhE8fk33wem6HdYdfZx8T3xQmNIYs3yCHsgD9Dtw+cD4QvlkJ8zCtHHGn/wd53 t4eZTuSlMKmjKfSGga/5HEhqv91M1Cio2JOJ8PONO3vPtfNP7d84oTactd34hqzIhsjN gRoQ== X-Gm-Message-State: APjAAAUZ1EVcS8ixNw45FzwZAY8IZYJD0pxXphz4BaFH7Ev4FPTsZyxL o2EpTu/S6oCqNo2ZyRy2LougeA== X-Received: by 2002:a5d:4f08:: with SMTP id c8mr24116642wru.51.1567629571061; Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm57146701wrg.64.2019.09.04.13.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D377A1FFBE; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:09 +0100 Message-Id: <20190904203013.9028-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH v1 38/42] .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These jobs build different components but use the same host features. Put them in the same cache bucket. Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index ab4ee425e4f..63cbf41e573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,15 +101,18 @@ matrix: include: - env: - CONFIG="--disable-system --static" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # we split the system builds as it takes a while to build them all - env: - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - env: - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # Just build tools and run minimal unit and softfloat checks @@ -117,6 +120,8 @@ matrix: - BASE_CONFIG="--enable-tools" - CONFIG="--disable-user --disable-system" - TEST_CMD="make check-unit check-softfloat -j3" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" + - env: - CONFIG="--enable-debug --enable-debug-tcg --disable-user" @@ -136,6 +141,7 @@ matrix: # Module builds are mostly of interest to major distros - env: - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" # Alternate coroutines implementations are only really of interest to KVM users @@ -155,6 +161,7 @@ matrix: - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." - BASE_CONFIG="--enable-tools --enable-docs" - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" addons: apt: packages: @@ -196,6 +203,7 @@ matrix: # We manually include builds which we disable "make check" for - env: - CONFIG="--without-default-devices --disable-user" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - TEST_CMD="" @@ -239,6 +247,7 @@ matrix: # Python builds - env: - CONFIG="--target-list=x86_64-softmmu" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python python: - "3.4" @@ -246,6 +255,7 @@ matrix: - env: - CONFIG="--target-list=x86_64-softmmu" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" language: python python: - "3.6" @@ -312,8 +322,11 @@ matrix: - env: - CONFIG="--disable-system" - TEST_CMD="make -j3 check-tcg V=1" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" + # Run check-tcg against softmmu targets - env: - CONFIG="--target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - TEST_CMD="make -j3 check-tcg V=1" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" From patchwork Wed Sep 4 20:30:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173050 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp437954ilq; Wed, 4 Sep 2019 14:05:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7/rAKvPB1MumRtXZvZwmCPxQMooFGiupwqqYSxz+dzbN9olLGTfAIlhqoJZqFX/m2YeR0 X-Received: by 2002:a17:906:6852:: with SMTP id a18mr31835ejs.229.1567631131262; Wed, 04 Sep 2019 14:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631131; cv=none; d=google.com; s=arc-20160816; b=WsCt1udU2HGmSlvqDgHcWzaoyAw/OnVYS+h/qD+9HY5yWYx+XHWTYP1kZqiav7ffMm ZPmyAEgTnndJm1uKmIEeu+mGZcCFRpfpK3i2gpiE+CQdPQHTxOOQ0qDhD0s1dX6R3PFp sr1nMj1XHGZFUoWhgEo36/JQCKZ8Cbj1nGAEiTZ027Uy29nk0GXSnWFHtwk8qJrqRVDh 7XhoCKuO6nW4cLmjB9LcogKNQ35o4Hi3Vrpu4wO79DGQwJA+iPcUK9DQjLCpOUd7REEk nJeavhnoiVVjNoM04IXJNWmu4wyCa80UCeN+IihJJAfk+G7k8zKSLjDa4fyTt4kj9Dr2 1y5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1rnhVYQn9Oe6VywY+z7ygMm/a3pGbUQnt3yqRufslG8=; b=LwGtyvA2Kwz7LeR6912wWzlbDJHS47GkQlLKDMqlGxyw7L4Y1C2Oz8UY3fWcoPa6Wk NlcjzI2EJm41vFpnfDsg6xf/mJa2K/ZwdLfiJ8oI6gQJcEV2j9JUnyjoWmHZ/1Zpc7ST 5ridCB5MxAhfsVk3EnPEWvadg2Te/1Rt004E+7VYPK/r/T1VjMBiT0abva29Myk1NJNO JA1pGm0RD8LlRpvUALXtRUu/aMQ3YgufvlF+IZMvgZ4AveN1PkC0LbEHxkbN7bkQB1aB cN1bgowA+mnnOmblYWEWFMmMCwM8Kih1Ed1cMDBwie8NUCO0mn1NGPKhr6iIk/q7WWl1 xL5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mnomE3rm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s5si107234eji.260.2019.09.04.14.05.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:05:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mnomE3rm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cT3-0000Fc-2m for patch@linaro.org; Wed, 04 Sep 2019 17:05:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51651) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3z-00013g-Ny for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3y-0003Yp-Lt for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:35 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3y-0003Y2-6Y for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:34 -0400 Received: by mail-wm1-x344.google.com with SMTP id t17so221668wmi.2 for ; Wed, 04 Sep 2019 13:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1rnhVYQn9Oe6VywY+z7ygMm/a3pGbUQnt3yqRufslG8=; b=mnomE3rmloITVa50F1AfB25Cswm3F9CoVE6xOSg2JLfcglDm0SPpK/0PJ9RR+dBQN3 vZKMPSrlUpWR5q+oLgcQniVkt0KUWrDzw4rpR2Qd/rRBCQ7S6v0VqLGE5FCuEdM5/c7P qfZ+K/OoH3rpo80hS+1FB8Q6FwxT5yCy608oTT7q5vO9KgwtObZlfM6OCdt2jt0kyI/1 NeDQ5n5ujfiZ1QApPmTbQ84+8/A3z6O+4u111ZcvM3oW/xah9VphLoxzOJIsSkAUFc5o O/ScybrorzfMKVMXRXE8MjxGHLefdZpIVs3kVIgEt3LYfDkL5Eu4Z+YoXkG9gMd/FrM4 ZyEw== 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=1rnhVYQn9Oe6VywY+z7ygMm/a3pGbUQnt3yqRufslG8=; b=SPuo8bTKEEp3yOM+0o3+Ag7yXRm6HbZXI6uAya8GGPeP4RFCqEvstZSMmovqBoacny kKgfE4PmQp2/0NUxLpgaeoeUA2ZBLpBi2o8lv+PQmbcQ8rQ7HFImsE46LUMVPQ7bOZIg 18EuYz6ZAA70bjxqpgIMn/3AR/3FidxB2wAIFr4Q1F3G+k0lkH7OsCVdUvK3WwnCfkyq soIt+RUFrFa3zHrRxXle4NNUXMGzIdiCtXjkrTzRaBzbf1l3HeNf3/eFaWGKE7PTtW+Z czIQR4brI4QL/zUYUGkT8fKXmkIkrZodx/J56y8pqewBtwVmmyFbUTEKDmc2XnaQmfhz 0tPA== X-Gm-Message-State: APjAAAXJc4n3SW7zBPYOVerhlZhM/Rj3mDbVQEKA2p1BoEEtb3Gb8xCw 5bZLT/0YX0LzupP3M9hDnZJU3w== X-Received: by 2002:a7b:c091:: with SMTP id r17mr124082wmh.74.1567629573137; Wed, 04 Sep 2019 13:39:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i9sm113716wrb.18.2019.09.04.13.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E78051FFBF; Wed, 4 Sep 2019 21:30:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:10 +0100 Message-Id: <20190904203013.9028-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v1 39/42] .travis.yml: Cache Linux/Clang jobs together 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These jobs build different components but use the same host features. Put them in the same cache bucket. Signed-off-by: Philippe Mathieu-Daudé --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 63cbf41e573..17aca3cd9c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -173,11 +173,13 @@ matrix: # Test with Clang for compile portability (Travis uses clang-5.0) - env: - CONFIG="--disable-system" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default" compiler: clang - env: - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default" compiler: clang @@ -190,6 +192,7 @@ matrix: - env: - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default" compiler: clang From patchwork Wed Sep 4 20:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173045 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp431174ilq; Wed, 4 Sep 2019 13:59:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwenLC++yFVXpF/wajT2KZfqTwFMYbmFFDSg5Opx+6mEFG4SZyyr73Qe0spFsGjP2e3QGLa X-Received: by 2002:ac8:301b:: with SMTP id f27mr38703qte.83.1567630755708; Wed, 04 Sep 2019 13:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630755; cv=none; d=google.com; s=arc-20160816; b=nNbUX8WpfEHjnjBG0HfW5uGlAAnCpj5s0l1EHW3SxEiaWTNSdUeGsYT1a/VMO90NKr TY67kcO5R6EzoFd4ib8saVcFgu8UoVYSIuMLcvM6UdiliTHIXOp23DAZNi6ZutF8gAIj GOH3/ZlkPRloMZx5aGnchb/zmyikG7iddXXBoWnpXgP9v2fI08YutRfHsRp29NSYqnXj CHikpcGTNBm0XmIYNoMz0+OhpPub+Y7m82uGz4wC55wdY8uS0WFJ9g8LQzvz/7/MSKU2 mnVXQz0bQP8jt5PMOVyPZ7mw9RWLMkqfBu2yS/MmM1N9Nevr+7IyoEfQ7/xteanDP0I/ 5e+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=I210Yadd0x+tPS7Gqk1OnSUsbITy9kz4Y/547asSB+4PEzM0scTsJAIDwrXWmIdI9s uUeTsb2r67NMEyuN/RReWAFkxkiUMnO9fVCo6mtr51mPtEu35TDELEcqBYDEH3H1V8L1 D+w7xbM4o8WUCHcYFiXYPdWdC67c+E/KVZT1uKFVEJ7REg1Tfgy1elYCeFQNQAy/lFn2 Z9V+uoa4IDjmuqiqfxqsCq2Veld97yMQMBgnXxxWzmZcPAZtyETvQhL00lhV9ki+grd2 EJ/8JTiMyjcquwTatCDQO0OV9Bi2Q62VHzTGEQ9KFZxYjsxxi4pBXI5Maf/Til21KUEY 2BcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=holC5qKN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z42si56458qve.158.2019.09.04.13.59.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:59:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=holC5qKN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cN0-0003zp-Dx for patch@linaro.org; Wed, 04 Sep 2019 16:59:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3x-0000xy-AN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3v-0003Vo-6T for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:33 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3u-0003UF-MK for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:30 -0400 Received: by mail-wm1-x334.google.com with SMTP id t17so221542wmi.2 for ; Wed, 04 Sep 2019 13:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=holC5qKN5z20UzdvT6rEJ9Vj/2iK4ltydUxH6hoAFwNpriOfmGLxgwfKi9UkG6Gk1l blg4cFHHJ4P+NzbQZA4C4IK9qCf2fVsppKJL6C+KgMmypUbcR8Gqim5CbL/r5Gdt9Z7A Tx/1zVOe2KROncYtSGJEycUOFS49oO4AD7b81FI8hYFF56TyHvD21pbohBWNw9Z2tXLF RMNZV9PiaTk9Q9IkgFYtyFyIRIV4n8ZnED8C4ElgvVpFVzMS44JmW9SRXV9eRZ7UKlh/ ChkIJMr5SDhUfLlC1JgI3I8OiDZu6HEsjNWWawhcum4rKKHaUXdejj3mRy0XeOFvIONK qEQQ== 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=JTL/FheK7UxEeMxwOW9JyHS60K9JSq+RkXWJ74ocsQk=; b=ZYEjixCgzSE4SnIHYRYnmjrXIk/Gajcq+lh9hUnU5nQfXSoY0FBeojzgXyStSzyEyt /4439nM4aRn2Dt6/WUB0+eDNY6CwnqwlQtRDF3U9qAKRfngVwhOXU+rSqm7X/orkAovv KBdnT1jtdjXQ8jsJW6M8U4llnzSfcnLTNy+ui8PzZaQPS/KIvHxpf6g5IDKmOGRKkzWB 6tVx5etsutVeUTNdes5rdHr243fWehSNOMs36uFeB6DhuNGhp0H8HZ1xHZtJqoRWMbft ujV8TnW5Uc2OsLrizPFCB2+ufv7HlXu6uj2YXNBzlrA1IcxFDWkHf10s8KeOaTohpL/i YX2w== X-Gm-Message-State: APjAAAVTnWN6fyZU88lkbsAUrzzqgjPM/kJSbkIxJb6exIgOgpTRGHTJ 2E4JKtKqZDM1S28A5FwxfOD4vQ== X-Received: by 2002:a1c:9ecb:: with SMTP id h194mr111228wme.35.1567629569522; Wed, 04 Sep 2019 13:39:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s26sm19428810wrs.63.2019.09.04.13.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C7B51FFC0; Wed, 4 Sep 2019 21:30:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:11 +0100 Message-Id: <20190904203013.9028-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org" 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@euphon.net, Yash Mankad , berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cleber Rosa The LinuxInitrd.test_with_2gib_file_should_work_with_linux_v4_16 test, from tests/acceptance/linux_initrd.py, is currently failing to fetch the "vmlinuz" file. The reason for the failure is that the Fedora project retires older versions from the "dl.fedoraproject.org" URL, and keeps them in "archives.fedoraproject.org". As an added note, that test uses a Fedora 28 image, because of the specific Linux kernel version requirements of the test. For the sake of stability, let's use URLs from the archived and supposedely ever stable URLs. The good news is that the currently supported versions are also hosted on the later. This change limits itself to change the URLs, while keeping the fetched files the same (as can be evidenced by the unchanged hashes). Documentation and the "vm tests" fedora definition were also updated. Signed-off-by: Cleber Rosa Reviewed-by: Yash Mankad Message-Id: <20190904005218.12536-1-crosa@redhat.com> Signed-off-by: Alex Bennée --- qemu-doc.texi | 6 +++--- tests/acceptance/boot_linux_console.py | 25 +++++++++++++++---------- tests/acceptance/linux_initrd.py | 5 +++-- tests/vm/fedora | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/qemu-doc.texi b/qemu-doc.texi index 577d1e83764..37795f86fb6 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -440,15 +440,15 @@ of . Example: boot from a remote Fedora 20 live ISO image @example -qemu-system-x86_64 --drive media=cdrom,file=http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly +qemu-system-x86_64 --drive media=cdrom,file=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly -qemu-system-x86_64 --drive media=cdrom,file.driver=http,file.url=http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly +qemu-system-x86_64 --drive media=cdrom,file.driver=http,file.url=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso,readonly @end example Example: boot from a remote Fedora 20 cloud image using a local overlay for writes, copy-on-read, and a readahead of 64k @example -qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"http",, "file.url":"https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.readahead":"64k"@}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 +qemu-img create -f qcow2 -o backing_file='json:@{"file.driver":"http",, "file.url":"http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2",, "file.readahead":"64k"@}' /tmp/Fedora-x86_64-20-20131211.1-sda.qcow2 qemu-system-x86_64 -drive file=/tmp/Fedora-x86_64-20-20131211.1-sda.qcow2,copy-on-read=on @end example diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 2504ef01507..8a9a314ab49 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -76,8 +76,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:x86_64 :avocado: tags=machine:pc """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/x86_64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/x86_64/os/images/pxeboot' + '/vmlinuz') kernel_hash = '23bebd2680757891cf7adedb033532163a792495' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -250,8 +251,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:aarch64 :avocado: tags=machine:virt """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/aarch64/os/images/pxeboot' + '/vmlinuz') kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -271,8 +273,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:arm :avocado: tags=machine:virt """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/' - 'releases/29/Everything/armhfp/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/29/Everything/armhfp/os/images/pxeboot' + '/vmlinuz') kernel_hash = 'e9826d741b4fb04cadba8d4824d1ed3b7fb8b4d4' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -318,8 +321,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:s390x :avocado: tags=machine:s390_ccw_virtio """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' - 'releases/29/Everything/s390x/os/images/kernel.img') + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/s390x/os/images' + '/kernel.img') kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -360,8 +364,9 @@ class BootLinuxConsole(Test): :avocado: tags=arch:ppc64 :avocado: tags=machine:pseries """ - kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' - 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/29/Everything/ppc64le/os' + '/ppc/ppc64/vmlinuz') kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_initrd.py index 23be5a63aa8..c61d9826a45 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -54,8 +54,9 @@ class LinuxInitrd(Test): QEMU has supported up to 4 GiB initrd for recent kernel Expect guest can reach 'Unpacking initramfs...' """ - kernel_url = ('https://mirrors.kernel.org/fedora/releases/28/' - 'Everything/x86_64/os/images/pxeboot/vmlinuz') + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/28/Everything/x86_64/os/images/pxeboot/' + 'vmlinuz') kernel_hash = '238e083e114c48200f80d889f7e32eeb2793e02a' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) max_size = 2 * (1024 ** 3) + 1 diff --git a/tests/vm/fedora b/tests/vm/fedora index e8fa5bf0d21..7fec1479fb7 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -23,7 +23,7 @@ class FedoraVM(basevm.BaseVM): name = "fedora" arch = "x86_64" - base = "http://dl.fedoraproject.org/pub/fedora/linux/releases/30/" + base = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/" link = base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso" repo = base + "Server/x86_64/os/" full = base + "Everything/x86_64/os/" From patchwork Wed Sep 4 20:30:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173096 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp474633ilq; Wed, 4 Sep 2019 14:46:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1acmRRulHSJGCmMxdA0l7TnpExtw0dPW0twe0+H7LzE82XK2fRNjeRpy6B/s0t3bM0i0J X-Received: by 2002:a17:906:3189:: with SMTP id 9mr188642ejy.172.1567633587100; Wed, 04 Sep 2019 14:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567633587; cv=none; d=google.com; s=arc-20160816; b=S3wuTijmgA7JisPvskkv3Ctn+V8uKoRcF2mCZb55nAl1mWmeBU7VswWiL6SOdVrthN NtDwp9Wysb4xuga5pJSiKRWL34kfXmvn1P9JgW1aDwL+HENWjbZyzjBWc2KkJL53yNV9 BMO+v650/0mTSsbhKA2uUekRXKniHPrzTpc9OCGboi0jR1luzEPROb7dHWtFmTi5VcaD H60Cy4tCitncLrm8geqbjRXjrICoQyPxwir2RVE/KjwDdJevmasMj0YYRx2kDA/+xawJ dDtHlr8nkNZbgpg3Y6+KhbfUh2JfHQON4m97dA/PJxbaXlHu9hyP6zs8xftkg8pLOUaI OLxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=IMcXjKEwyw5C8Npir5bad9GD9TTDcpBdgpA+xbrkFvs=; b=cnpAq/I5DrK8K4iQ7Y20FFzsp81gg7JDrNhXGCLlfjmLmgbFMU5MNaC9JKh4u+xJBW 4VN3Z20sRvQ+Om8Jh1hqtPlGQunyJL4i5J93CDP1Qqt0TgStGFebBaC9JNvg6erB/OoJ KK+1Zd5RZ+vPpo49Um7WQVxpOX/P/pR6vAJqUXaWa9DOBqp9pc1vvKS5DFrh4pnBmpB+ J/+zzs4ckhuhSA+qeHykJJSmeY/re+mLFUaTQ3f7xK4MCXgTFEuJByoiYM6TpSCftWiL qt7gr/HytrUFLASa4teZuuKDRYtmuHdMWj2BEQRQmMMOE8Uc/Z8J4tL0Bw7N86gP+Lqs 75lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ashEI3xb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b1si163970eje.185.2019.09.04.14.46.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:46:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ashEI3xb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5d6f-00065N-Pk for patch@linaro.org; Wed, 04 Sep 2019 17:46:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54201) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cDZ-0001zM-IG for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5cDY-0002Te-Bw for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:29 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53326) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5cDY-0002Ss-5u for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:49:28 -0400 Received: by mail-wm1-x341.google.com with SMTP id q19so242207wmc.3 for ; Wed, 04 Sep 2019 13:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IMcXjKEwyw5C8Npir5bad9GD9TTDcpBdgpA+xbrkFvs=; b=ashEI3xbDEuVDTdbUssnl8Kp6Ym2gIzoexmNLh940pCW3oqTK3EH7NhBBzlhkTZ/Jd m9cLdsXpuPNSNMgWmVoXcJYbT5n1HHPWUwu2R2nuLUVWBdGk52RVZKPJvUWSXB+GNvVU XycKdh2in7GeGRB7J7lUqYLiZHIdGGwHpRCnc1oiqA6Uyx/JdktyWSRb/tTV6x+NdWHD tcUJxXUmB0meEDVf9SsOESp+9Vl5rKluEjpr19G5Lo3/39x5/THVotgXU2i5twrhs+ac ZM7QjEZEQDEB259IN5HGaEq4dP7JGIGYC7i/VW6iDD7P3wsb9JksBJacsQL4sR8rqKQo LP+Q== 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=IMcXjKEwyw5C8Npir5bad9GD9TTDcpBdgpA+xbrkFvs=; b=W8ZmGhLNBDmM0kdpRVReNwbjWCIouELxlnRWsvJDo/6B1tRJUgioWWEAeoAD3rGjnZ VMnvGE1w6Uv1d5d2RzhqcabFic5J42nfOgbp/Z3MMI+xkjngDpEGQHd1fCHjLMXAj4v/ S0udiJb5Hoe6h8rkSvI9J+eTXK+Uqej3OnuSvGBpDU85LxpsLUcqdE7nEQB7P5LD51Su Qm98EQYwzQJUBTZLAv+q29EefN3cP33e7QrjYnrQnaOUXSaw/LOhME3pk/juZqEvHS1Z lbo56ydufs4Gh8sQo/hJENhdBlQE2VbtlOeKVufwxJFtAYr6wOtHfRb4hFmP0STfPL5E opzA== X-Gm-Message-State: APjAAAWL3wTRuI24eRnRiG+NUkJEXLZyZHe8MQH1Pse7lVcXnrcUS+er j7wkuy4bqW1IeB7f2YBNmEaJ6A== X-Received: by 2002:a1c:770c:: with SMTP id t12mr130088wmi.91.1567630167108; Wed, 04 Sep 2019 13:49:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u68sm350497wmu.12.2019.09.04.13.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:49:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 201941FFC1; Wed, 4 Sep 2019 21:30:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:12 +0100 Message-Id: <20190904203013.9028-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 41/42] tests/docker: --disable-libssh on ubuntu1804 builds 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently this stops the mega: make docker-test-build from working. Once the source is patched to deal with the case this workaround can be removed. Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/ubuntu1804.docker | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 44bbf0f77ae..883f9bcf31c 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -56,3 +56,6 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang pyyaml sdl2 + +# https://bugs.launchpad.net/qemu/+bug/1838763 +ENV QEMU_CONFIGURE_OPTS --disable-libssh From patchwork Wed Sep 4 20:30:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173047 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp434246ilq; Wed, 4 Sep 2019 14:02:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpCTtLkxtUTzp/VdJGG6GF4I/m7jrhKK0BbnLwuHnNQs3BjYHCSHJ1y2KGxtbDgZ/oBCnx X-Received: by 2002:a05:620a:1369:: with SMTP id d9mr13648332qkl.345.1567630922114; Wed, 04 Sep 2019 14:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630922; cv=none; d=google.com; s=arc-20160816; b=zKHj3d19unH1xWfVHBBICC8k2LkvI9An6+9DL9Y3KztUzpQc3ldwC5nqfd9uPJ1FlJ Gd02EArohlxyWnc6rqi5GwfapSbAQhPLNNom1ShazGY4R2G4z1M5uLKFzCcdBWZL2IdZ 63rEc/sauyZa1+FtZdqCpXg9lLREU5iXqAxmNnGuiEOCP7QYHtSLseArIiYMe1yE2Q6T jfSI9nHE5aYZcnAZ+fKlOkF4S9w3m56rCuXm894YJapSKFLbUmxu+AZnub4ww3dKusae z4FymzBszRO0/XySbowBu1wVQgDhvwr4sH/hZ7BuBeKIYlWPxiBQUGyrdAbHBBoG/zMd 4kzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=hNdc0bOvReThYAW1J8YFGDoTrvBZD9ylSfMtDKRLzHM=; b=IJbDb+WHyMokPRUbPxkBT4RsXIsKAuinotAhmOwDr3fiuvBq6K9gbp1JGhwaC91uCr 2/qf9Zf76VaFcakQNgs3XgBGim7/Pd1DceqMvNxfCpgFSpG0I3WGq60r/zhKRfDykxsA GqJteRgdbsatZB//PuaFSLfDgqBEDSXQMd+NWA6tpRPHhuJ/ICwQOS7RYGCycx0/HSuQ 9sBC+g1HOIq+o0D2U2Lqbw+kanVx5ifw/7u7C+e5uAdCpkmiN7JS2orE4hPiCrN8AkYK oxsM9+n/Ey/TFbj8sRMIYqj7uLhMI8A6T24VCO2RZKJPejXFnZgEvfiPL2bYo6Mn6Sln MvHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UjDZo5LX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u188si131823qka.97.2019.09.04.14.02.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UjDZo5LX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cPh-00055A-42 for patch@linaro.org; Wed, 04 Sep 2019 17:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3u-0000uZ-Tz for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c3t-0003Tn-DE for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:30 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c3t-0003Sl-5i for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:29 -0400 Received: by mail-wr1-x431.google.com with SMTP id y8so185237wrn.10 for ; Wed, 04 Sep 2019 13:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hNdc0bOvReThYAW1J8YFGDoTrvBZD9ylSfMtDKRLzHM=; b=UjDZo5LXyP2ofViw8/x2hmCVzuMJzJ/7nMdPSJ/8cu4QEs8pgHlHFUNNmTEMqNDNeJ Z0Jz+2wI+RUzQd+nQMPUxzcnsB1mIrPsGDYHUcxc2KL7/2LoYUe+SGIENJLDKOmjwmSC e/z/qRmrFN0slVNw2CgrGF+2kgxbMczmsmQjdfw8UrHrAznTlfw+rKZojLG341wF0s20 5mDdAIScbXz2Qhsh2CvW4w/4cX3l2r94YJumDbME0XNSHgE2I6+iNqkgOSA121U5h1O/ BrjZ0AGQbjDE4BGT9XNHtNJNU/8r46fsaTcuRY0aAreJ/SbfC6eAsqT4a0bkvElEkV8T hk6A== 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=hNdc0bOvReThYAW1J8YFGDoTrvBZD9ylSfMtDKRLzHM=; b=PBgrElex0z6QeIsWQhsP/Q1L/T2a9MvA9ZxAcyhBsdA1G/cSMsfFUu59Tmnn06z1gZ /25v7kfKYCEForZKgd377jzSrbqxxNQM5FK4ynXzIpp2ErOoQdcFIgx4+dV6gFtXVWVJ Y/GJQaOKotPRyu76fIF9JcSkIQIGYLYZa8AL8wlhng7yR5AcP7Qcb9ZKy5ttzRr3Y/7c adhqur6wlh2VLRVmO5quFVmgoWCTIDunp9Lau1TH/m3Luvqs+pnVIhqFWllfz2OEYu0n lRN+aFkpYCbeAfiuCshtshImwMo6rCMBznkcj0sQWxjwcEahD9j5e9hjAQRtds2/dv5O AAUQ== X-Gm-Message-State: APjAAAVk+QwpAH2DuTHMKC1Z6xfk1hohV9i321qbH+8ASktNsyoDP5SO 9AdIOaC4EPaHYA7xgVV9BDMNRw== X-Received: by 2002:a5d:43cc:: with SMTP id v12mr9511609wrr.75.1567629568037; Wed, 04 Sep 2019 13:39:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h32sm29731448wrh.62.2019.09.04.13.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 33EAB1FFC2; Wed, 4 Sep 2019 21:30:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:30:13 +0100 Message-Id: <20190904203013.9028-43-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This was only added in Python 3.6 and not all the build hosts have that recent a python3. However those that do will complain if everything isn't properly utf-8 clean: ./tests/docker/docker.py --engine auto build qemu:debian-amd64 tests/docker/dockerfiles/debian-amd64.docker --add-current-user Sending build context to Docker daemon 3.584kB Step 1/16 : FROM qemu:debian9 pull access denied for qemu, repository does not exist or may require 'docker login' Traceback (most recent call last): File "./tests/docker/docker.py", line 659, in sys.exit(main()) File "./tests/docker/docker.py", line 655, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 452, in run extra_files_cksum=cksum) File "./tests/docker/docker.py", line 306, in build_image quiet=quiet) File "./tests/docker/docker.py", line 231, in _do_check return subprocess.check_call(self._command + cmd, **kwargs) File "/usr/lib/python3.4/subprocess.py", line 561, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['docker', 'build', '-t', 'qemu:debian-amd64', '-f', '/tmp/docker_buildjvzs88tf/tmpyvtj7ub0.docker', '/tmp/docker_buildjvzs88tf']' returned non-zero exit status 1 Error in atexit._run_exitfuncs: Traceback (most recent call last): File "./tests/docker/docker.py", line 258, in _kill_instances return self._do_kill_instances(True) File "./tests/docker/docker.py", line 239, in _do_kill_instances labels = json.loads(resp)[0]["Config"]["Labels"] File "/usr/lib/python3.4/json/__init__.py", line 312, in loads s.__class__.__name__)) TypeError: the JSON object must be str, not 'bytes' make: *** [docker-image-debian-amd64] Error 1 Signed-off-by: Alex Bennée --- tests/docker/docker.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 8f391eb278b..e5b7632464b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -258,10 +258,16 @@ class Docker(object): return self._do_kill_instances(True) def _output(self, cmd, **kwargs): - return subprocess.check_output(self._command + cmd, - stderr=subprocess.STDOUT, - encoding='utf-8', - **kwargs) + if sys.version_info[1] >= 6: + return subprocess.check_output(self._command + cmd, + stderr=subprocess.STDOUT, + encoding='utf-8', + **kwargs) + else: + return subprocess.check_output(self._command + cmd, + stderr=subprocess.STDOUT, + **kwargs) + def inspect_tag(self, tag): try: