From patchwork Tue Sep 10 08:43: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: 173446 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5499374ilq; Tue, 10 Sep 2019 01:44:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqwN7VK/lM8NAVs0Y5RZHgGBylRFkhEzDs8AVfdMm7Yk4Nf225UZGTghvzCp5fFvqHgvynm/ X-Received: by 2002:a17:906:128a:: with SMTP id k10mr6408847ejb.9.1568105068586; Tue, 10 Sep 2019 01:44:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105068; cv=none; d=google.com; s=arc-20160816; b=HaQ7eQNkd1bBV1MH7Dkv5nfyzXQMCawCwGn6RJUy4M5amuxmXZ7Wljmz6UxYeo3Uzo 1qtbahcgzOseT+kZfYhRptc+Avaz94Alt861wl9xiEKybKZsU/304Lnetn7ubsZxmV5Q eW8ADzke2y7oBiJfVdXyV/r5tdQjB5PgQTlzje47lAeCIl5GmyVyWvN1vBx/9gWOYAwQ 4FkZfEQvyAvrzBscNKVZLkUgODEBRPdlfYpV8xInePtVpvZnyZ68skI1lANkHEZTAOTY 1pLBfK8rjE3oDNx714lgESGNmuW1ewjRprFnvXqhfg2sIB57N5Vdo0fhZeotd02dsxhx YEIQ== 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=iEMfemb7tE5MHqpQBihqUqf10bZPCoUG3OSMR/N5oWA=; b=Agj/TEmC0bsEYql94qSjQTcHImx1pTeJTgJVzU/cmmsqRLZHmfXYTrZ2R4woYq4ykw maYNXQrOItF9VF9+Eq7+rxlcQpKaKyCFkEdFLlkq25tHXGlzXYSglrkOVknorpqCVjfe 3gOLk/QexcDuS2Y7o3CVuASLhZH0LJ1mhr7JYiD3vgeOdGTrCf4PZIyTvYrizJY5/WIc cmgRMStPrZq6d/SYSzNQccubXchmh0EmyzgZSYNeqwUrRuzCQlmtNNku9xx+a6XjAmf0 p+sbf9oaBGImAWFqDqhYHEOSYFVnPUgYpy/N64edNt5+fGPKn0TkJwo2w3AE8jVfOFzh FYPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XvTOsJOD; 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 se23si9008121ejb.29.2019.09.10.01.44.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:44:28 -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=XvTOsJOD; 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]:35564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7blC-0003N0-Fc for patch@linaro.org; Tue, 10 Sep 2019 04:44:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35780) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkj-0003KZ-1i for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006Ht-Ml for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:38318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkh-0006Gm-FB for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:55 -0400 Received: by mail-wr1-x42f.google.com with SMTP id l11so18361421wrx.5 for ; Tue, 10 Sep 2019 01:43:54 -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=iEMfemb7tE5MHqpQBihqUqf10bZPCoUG3OSMR/N5oWA=; b=XvTOsJODk60fMpUpXvUxNjchYT1rYMD4Hq3XCqiqkB69wPkmGmALqFcaP6m0OHjTsZ 84jX1xkOn8kno62cYehh4l484qo4pTUuFXAGlYSg2+YNLfkCKlnM/HshEiENJlTAjfhD k98RkJJoIqSRr5XOjTerrHCXMYAVewsZ0t6fzsiKuBMXOJAncJsLcZVLVIu9FDzbrVwv LOevg2yPEZa4oWifLX2Em7y2SsExyvGlVxqUVmBGkPxB6v3f7jnrUmtZZQgar3ud4Yxk aLlyAhk7tMmaH+kl8SbXOgWZ+/0OuAjlBslfk6ywpY8ZCU7/JKkOZZ3Y0PbPlsS4J3/q dYtg== 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=iEMfemb7tE5MHqpQBihqUqf10bZPCoUG3OSMR/N5oWA=; b=OT7R+yf3ybkYsH5NxbKD70J1yRxMLWwFIgdqtcCb3uLsSJU14jQIvixcKsBYevGMZb bmMSd5x/Mq/b9UFVYCLXpMxv+kggLSdJ4QXQsoVJBJNBUWZVwfWkQuEt0e5RqnGXIXia oEMg6eAdv4gZ1yJqpl5biy7awn/O9SYNbi8e4GEdEAaEl9/d8i803RbqasrG1OV0NB4Y qceQPovXD+ZDc3zpGRV6gbmN5i27zihWHX5CX9O8CWs402Q4BAEqD1EN1EipNa3ytV9l 5jPGvKLMtkcu8wc9stBDQCYV7obdJ64dPjk1jnmlgbpqTUsBg4J58g4tByvYPAyYO23/ N+kQ== X-Gm-Message-State: APjAAAX6ceLoyPDT+Ab8esvkrVODt+GYwNkCPMXoLO7YNaI5McJFfCPc GAI0VeJ2y6jNEeM/TPm6Yi47Pg== X-Received: by 2002:a5d:5606:: with SMTP id l6mr1681123wrv.108.1568105033000; Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r18sm19131577wrx.36.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 85F7E1FF8C; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:05 +0100 Message-Id: <20190910084349.28817-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42f Subject: [Qemu-devel] [PULL 01/45] 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: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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> Signed-off-by: Alex Bennée -- 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 Tue Sep 10 08:43: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: 173445 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5499361ilq; Tue, 10 Sep 2019 01:44:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5+ZT2hf7NX30rzAYi3MTUeUFIHa1G/2kt20XG/PzK2P0xpZqfai0efxR+i7xb8SFDT3EY X-Received: by 2002:a50:fd96:: with SMTP id o22mr24929230edt.218.1568105067574; Tue, 10 Sep 2019 01:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105067; cv=none; d=google.com; s=arc-20160816; b=sjj8LnUFI0ePw9/dlgD+OI8urPqd51EPtMpUoeCnhYOmxT0diRYSP5sgjkyCva+ozC D7TRFNHUiVZM2L33ZoZh+puwYsM31Z2wf2zLZceSQYbnAc6E2SXJVS+EjBhS6ZxITHrZ +97nzdoLwUXgVnjonCyE8hZdPiTVv3o9AFWwO+gmjjB6LkSjICf6PdzT6m/5Wh/Uq1kw U/+ka6hrg+Yv4avg3F4pGZxYqsSzWEa1M6lSYN6FUdGSk3HIEM8HBbQEBnZwic2jFDfn ZidtMksk3v+HCa8ua4N0+Pkk13wgRwjBtSMRY7/3z3uQoUFH02AuDIiE0GD2LHNSF6H+ 2ezQ== 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=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=LjclgAFFtf2jpOcIwX2jyZIdMM5jDlrJ5IuuaSCAqxg1kzfhNWfNuFWaj6AxsSivgy BylnPbqpRAOBIgt9ZF3eWI4YFIF7IdCiz1rAVih4o2if+Vf7dwqtSkt+tLMwLtBQ6EwG jM3oqoT46uS870SCCLvwcEAHel7MRcVMdwxiiXdidQf0HxzVaGVqsHa4p3Lo9vnI3fXN ejweh7Vzj5kuXj5WpLhRnvGcbgnYpVXVZJi1JKB9zZqdhqDM46f8hsBCvC1NQFTXPSP+ gulw8Cho5RgHZeGtCle7STGxK3P16CWPePX8kWQ8H0XxXpzUx8G/OGYhgmzmv4OpBorR pNUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oHpVkJ8G; 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 f43si11483661edf.422.2019.09.10.01.44.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:44: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=oHpVkJ8G; 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]:35554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7blB-0003M4-R0 for patch@linaro.org; Tue, 10 Sep 2019 04:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bki-0003KU-L0 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006Hb-FX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkg-0006GB-15 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id k6so6224083wrn.11 for ; Tue, 10 Sep 2019 01:43:53 -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=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=oHpVkJ8GqujKUnI3zOPCEopU9M4QyGs9+KOQozb2X15VzPZfHfVuSX4Pk4iXddOL3l slD93TBYWvmQT1S/yqMw0c7HSf16XPWZBAUR79GQzerCG+tHWJknRr3Q8C77i8VzIXGZ zvOBaomUWJWBMGhQ0H6uPtT8eirqRln8ouVmVw/MDUlVOS8vKazYp/UL37IxESQbedeF 7Fnas/baBidIL1VdPS8zKd1J2qebFDur1fbLQzu0MsyQ18Bso83tV82yO8xCvqDnmeIY HVve/yCHiB/QBmuuVQl7SYnE2poUkXpBYzBuHdVQXOGMY82wAN5aQ9lDdLfALt6xTCfq y2DQ== 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=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=Idj7aWt5eUNtFVS88L3NUHFTH60+jxPlgrdZwUeByuWYDGxoedc/guFWcnOQzRkog1 WyeN8W5NVC0jdPKFoqKXu105ISwEPdCljF6oBU3d7LtA7L7Ik+w06xtRciBj4yOk+WvA 5hg4DUc0E7aiFkGWfJ2tEE1NRC7Ts3Nt6/MYtxYQdHHvw+ozQsQy8uoCSinh1iIWULre pbbqdVrV1ak8bT9dZyhW7gYWHo/NZr0cgPZ0XPxuW2vsv2WH3E09hrll55jDhGuionbz lmvFJ0XpRQGT6s3ab6CHPxrI1LQRSXELrNfe1PSMmStkclZDokYpryOD177DQUjw30um EIgw== X-Gm-Message-State: APjAAAVE+wCkmezlRF3ZzNiztNO3ajaQcvt+m6M84JDvqXHvhTjd3hyN 1YC94IutRflm2aatXYLVBQWCBQ== X-Received: by 2002:a5d:428c:: with SMTP id k12mr25064614wrq.196.1568105030831; Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b144sm2446435wmb.3.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B0B81FF8F; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:06 +0100 Message-Id: <20190910084349.28817-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 02/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, David Hildenbrand 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. Fixes: 9459f754134b Signed-off-by: Alex Bennée Tested-by: David Hildenbrand -- 2.20.1 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 Tue Sep 10 08:43: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: 173453 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5508631ilq; Tue, 10 Sep 2019 01:55:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqwMt2SQnTfyMarO59vaO2bbZwFe0OjlJ3/CL3fbbKQsUk8RqRZyaBHIAipMK04D2Tj51vzC X-Received: by 2002:ac8:718c:: with SMTP id w12mr27996403qto.235.1568105744256; Tue, 10 Sep 2019 01:55:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105744; cv=none; d=google.com; s=arc-20160816; b=kgoQqvx43x+a1DzU7GRh9snDtujYCLcRuEM2u0tGpHM7vDoCgwLZ4b+/vvxie01W0g 5Vl7nORL/QCet+k4lwQIykjgF8h8OUTsbbTx6OyM35kZ79nrJiP9zXaxGvitOmF9+Wt/ /YTxx9o4aCRYWJ0wy8U153oK0+wzQGhrgXrJH5y15aVF8sF860q3tyoFw9tXUY/kxDU0 8dIReH6u2EC3gtmjeZvfaHQtvSeCFeim2dSdTVbyuid6rUOmPFPT9XtEmMGsc92fOqTG h5nzCG5VKvPHtZqyc6zxkmnsLZGZ6NfNK3xRQKUxx2kop9MRchYOleRtD7YK/RLvRmNO 3bVA== 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=B3leNU2N9kDllIY2m7kdi0hOzfRjQ0Y6fJjuNSOgJCI=; b=w+RuEr30+l137kRg5M39O+Ajs++xaKewu2iU0wesYkyeVo4aBBVX8zoqSEoU1PUQn6 HdLA2tkLD08XMCFi2aZLpWGiW7Q8rCpeO4mVvORjkyJCU3XaNjdyaAPb4iHrgM7f4gQy YRVBnfNDvOBCKn4N2WbH4EQrWW2dxxS+pbLSlGGHcXJBFYrJfYNm6hh4iswwuRfW5ALb Q6ToAnnQws865ch/ZfjqPXOU4qrWCp11sZM7d4LdjgmYrOtwmXWbtQRaXaTmSnFOMNHV rPcel8wTDWTFBN1JrZJZ4hCTA7ZWoa2TsdCvziEHJDkq1c8wrUjWKWeq6gwnEHpkz4Ri rytA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FtUEGblR; 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 k5si11802813qkg.133.2019.09.10.01.55.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:55:44 -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=FtUEGblR; 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]:35870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bw7-0005aZ-7E for patch@linaro.org; Tue, 10 Sep 2019 04:55:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bki-0003KR-Fk for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006HW-FS for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkg-0006GW-0X for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:54 -0400 Received: by mail-wr1-x431.google.com with SMTP id i1so17784268wro.4 for ; Tue, 10 Sep 2019 01:43:53 -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=B3leNU2N9kDllIY2m7kdi0hOzfRjQ0Y6fJjuNSOgJCI=; b=FtUEGblRYzZEWnCpnDtLLYGec9B8NBMPxRF4VgCA1ZmPWBh7+r7LAMlJlkkxK69n4/ OnAaCZ7CC09Z6aSEB9SY3Kuwqd3kNEGSN6VzpQUIaL6KiMGjRIO9RX24uM8IpDVzQdfr YjnIU+SeQ5bgogwUKjfSV/2BCFnSqQShiQAOFinkDFfaNBO/ur7FWOAdw16l2+S4k94q lexlD1lP/JQCwwv16an+7qz5K9iJGAgrxp26DzMOsNa3G16GVQPqwXUzwNI98rgVDlDq BmWC1XwTnRQPhxBF6kWhQeDfMfy9tO5JLSNgsia51jO8eOpW84HjzriWhec7gVrBSdBz 8xhQ== 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=B3leNU2N9kDllIY2m7kdi0hOzfRjQ0Y6fJjuNSOgJCI=; b=ZJey1V1IMv6DOo89lrxMeoSwWrUGK0g+peSC8slToG44VRr6brPbxyH0MqYeJf0mBM yyWPG5s8+48lreqV71Y+6xEEI2NtWAGvAzyqEe05iW/bFT8JSwraXr6bCvYguAxA+l1E Et4jDFMv+aSvewRPS8u7oaZOl7Hu2XGtqF3j+xl/2BTFCoSrwacQ6UZByJQVcOvcGgAF SEHag6e/HSwjxNkReLGpi5B86EBGQfW8BrYLQ9+8BlsZoefkCEg1COMXyOLjF5x4wd+6 6BbPzOnQM4ApfYGQIhHjuh/rFu0bwejsYmgR3RT9n3GKCuZPKAcNOxUC4mP4qyRjUNcK JvYQ== X-Gm-Message-State: APjAAAXoVBKvqaol/E5p39S3MVbCxxmygOFLxd+qv1uWLZTFNOq7utTN UjOdfV6t8cGm12IFHARMaLaxjA== X-Received: by 2002:adf:ef44:: with SMTP id c4mr25827921wrp.216.1568105032069; Tue, 10 Sep 2019 01:43:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u10sm1995092wmm.43.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AFCFA1FF90; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:07 +0100 Message-Id: <20190910084349.28817-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 03/45] tests/docker: Use --userns=keep-id for 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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: John Snow The workaround that attempts to accomplish the same result as --userns=keep-id does not appear to work well with UIDs much above 1000 (like mine, which is above 20000.) Since we have official support for this "trick" now, use the supported method. Signed-off-by: John Snow Message-Id: <20190904232451.26466-1-jsnow@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e23209f71ee..064026c8af8 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -369,9 +369,7 @@ class RunCommand(SubCommand): 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 + argv.insert(0, '--userns=keep-id') return Docker().run(argv, args.keep, quiet=args.quiet) From patchwork Tue Sep 10 08:43: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: 173449 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5505033ilq; Tue, 10 Sep 2019 01:51:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmlrIRY5BfGqrCiaYxacej6JICoZRlT/GBwinF4twHw7Ciua56UG3ZD5X54V9ioTOXyKwo X-Received: by 2002:ac8:48c5:: with SMTP id l5mr28740809qtr.374.1568105476480; Tue, 10 Sep 2019 01:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105476; cv=none; d=google.com; s=arc-20160816; b=flnIpYfxaI5hNaVdBsnkE2ydXjbOvwh/iOhGdZDdK9Kwb3V+kuYeSqZ5FO7LvW+SX3 c1kjfp0eDuiQmjuK/c2ydDw5VCnbxZ0R+AC1r4/j2dJAWPGUoRuFOc8aBlXwX7nCoqiL B4DeYP3p2mtv6JIf4A5YExmGzHw5pk6IyHBEve/BqyvUC2T73iKGmjNgzGyNcFSKWI7G YXQn0sbTnIoHlRGCY451eqWYQ8Xkni0/KMqWripzpVFz9hPWImNHWDAU2cLTaYAzGfp0 KcEZv+i8naDxwN0f/fmHjFHBdUmkR7IcUks4vUNYQXUiDiqqHxkavfR5DNdhR2VHZ803 isOQ== 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=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=fQOcYpodnPImd5vvt3XjsP1uLGcZ0tsSnx7BvdU5gKG42bHAV+Xm7hS5yZAAki9Zx1 Fs8Yhj1D8o477ifcGiBmyVnZoU2m+2UQ2QtrbdrlVCYJLKn8JeoWs9x+jz0/IvEitJuy D9C1TRNLj2npil4ogo9uls+tBNeG0Khip4sWK15X8IwES6pTJG6OyLpInu1/2vlBbVgJ VgZ741rAkMx5qZqJ5fT80lTtM70Xr9wPEZ+cnVtJQqnUXDHMJ9X1iiRXKufm7xckopRF RLWIyuCl9x2JZ6WeXdzz1oP55xnUiGJKnZ6/o7I1y6mRWw0uLhxPLBF4b0K5rN5kqnKN DCLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="v1KkF/sP"; 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 d12si11094228qtn.189.2019.09.10.01.51.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:51:16 -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="v1KkF/sP"; 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]:35814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7brn-00010f-By for patch@linaro.org; Tue, 10 Sep 2019 04:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35776) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bki-0003KY-Vm for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006Hy-N5 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkh-0006H3-Fj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:55 -0400 Received: by mail-wr1-x431.google.com with SMTP id l11so18361477wrx.5 for ; Tue, 10 Sep 2019 01:43:54 -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=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=v1KkF/sPspWW2Ysrrka2Ve23e/7jaXrViTHbCnDciHiCW4xmE4rJHaOfcV5aCLuXxx 8Va8MvNQlIW8SUOv3cvCeDPSDuTEvubMB61NuWp8Gu/FEUghVOiTxAZ3TyYu4JoODuq8 etcziCWLJxQlK7pbFIYaUYUEVsgCojCos9xS6Bcf8tbnExCR1a1aHBpP7irxXICM8sZ/ GZIiKPxs6mZT5W6ZBe5gRpMTmxfuWyvUX6kdpKCq0vfsnDqIN/1oUqbawVoVVMjM7Cdm 8QZjstABrwgClOPIY+b4nrlaw8NtdhZS51ql9JCQyd9PAfcwAWt2lsUCIDgW8X7/NT5e jtkg== 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=KDgxLmV9jVX5RP5KnrkpNStJOerKcWSl/8g+dS8UE6M=; b=YHyR1iORF3nm6OpDo2nnuupOXm0GdMCFY3EnYBL5+IUbs8e2ZIMnUArqFMU44MJLVg wb6T3+XFdVcwPx9X6L5IxuCYc2Rur6EfiCmDPYb1rZw0c5U6oNBXf4VmBdirzHqGls0F JLZkiKSrZeXYv/otAJOlvKmmGgZlhXVV6EQxF1XlZ4kJU9CojwsaqlX02spflvYvc3fl grO7an6Vz7Wj7G5AvPGPdzi19wlj5wPVZKxHVZgpIRnYDI1+RGI0x0KAw/hRTaW6kEQg Jv47PhLhj2bwRLgQO0oKgVhhyyfsLQlP6h3PG76EbWIJZaatwnby+2NSf8kvTbwaas+X VfGQ== X-Gm-Message-State: APjAAAVDth8YlRlwHVqaBUt99RzbzBWmo5UpX0ErmVRBip1T25fuiCX3 2cOG423a5DfC6G+lJhLAbqoQOQ== X-Received: by 2002:adf:a382:: with SMTP id l2mr23749721wrb.194.1568105033594; Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n8sm3476630wma.7.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C52871FF91; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:08 +0100 Message-Id: <20190910084349.28817-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 04/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 064026c8af8..1620293ac84 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -318,10 +318,18 @@ 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": + argv.insert(0, '--userns=keep-id') + ret = self._do_check(["run", "--label", "com.qemu.instance.uuid=" + label] + cmd, quiet=quiet) @@ -364,13 +372,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.insert(0, '--userns=keep-id') - 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): @@ -554,8 +557,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""") @@ -569,11 +570,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 Tue Sep 10 08:43: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: 173451 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5506863ilq; Tue, 10 Sep 2019 01:53:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqwW6FWUhWWG/Tb9Pe31afZf7MX7U/r+AHo/aGLv2XRVHwlV3ycWdQcA+mo4wMD/YvHDpB9z X-Received: by 2002:a05:6402:149a:: with SMTP id e26mr29365459edv.298.1568105614022; Tue, 10 Sep 2019 01:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105614; cv=none; d=google.com; s=arc-20160816; b=UdL9Tm5xbrkJe60WGHAvZEpLl6QyKjjh+Z2wa5bCoyHhuRLsXxmZNsoC6nUubrv6Fe F1O9TDjoXMef2caYFiuWHgpjblCKm58EeODr4TCjCTMTxQ7QKWujEdm2Pu/mgRMumX46 imoAZaZFjOoa0WcLOkIqJAojJ3iqwUpFqwA1lXHS6FebSlDoBmYjBNm4DHgMvKcE2rHV Xsl7aioQRq69OsmpCWmupYL9KVMXVN1/hE1PO9TZaDmCZQpQvZtFPE4sxkbKmlbe7F/y VbddQA2A9j+VhVZYpKaxavqVMkWyWFNberrqR60+q1/bcOxalo+Ld8xTmsxQDQBiIz+W 84fQ== 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=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=x3ACe4hVxgj2zw0SPIK7tns16JG652pV2o9onMnD7Mq6mFW36U6Q7u/ZsjvkAmVgLc r4r1LDXh0v0gJ6Gv4MCYEPPe7Mqwo7sC5v4qRdh8Mgd7EBkZYjFYX/IYxfuaSNdGL2WX 8MxB9IKZYRW3Z6TMkrOEaO8hyd7NRPXjEJoIGK4xGI3hVa00kvagyRbOJyjSgx2BSVKL SVcVJ8a1VlwLvfkrVarBGdtKEpKHb6fURbvT5v7VR0sXL96tafUCCcRtZ9lyL1zRFwfx xFGfW5Be+UuxccPLWJXXPmxbGAZVX+6nQzaHe/A2Z05A5xAfu4Jpcr35ykYJavKBy6uY dEvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OSQdQetj; 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 pv19si8806221ejb.181.2019.09.10.01.53.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:53:34 -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=OSQdQetj; 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]:35834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bu0-0002s4-Ek for patch@linaro.org; Tue, 10 Sep 2019 04:53:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkj-0003Ka-7M for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bki-0006II-4S for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkh-0006HO-UW for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: by mail-wr1-x434.google.com with SMTP id a11so8601999wrx.1 for ; Tue, 10 Sep 2019 01:43:55 -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=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=OSQdQetjxPXfUYAoh6rJU+QZXwg65HfCX0FvaiGQX8tAJen+suNgxBvP4cVaeV8Rjo umPg2pg6mIZ0iKFW8xH8C3uNDsyGU8QMqAqcWkKChDdGLE04SMpTr7LVi8ngwZiaavvT xMHAo0zB1ZE/YD4CB6321H1wz/qKb2lfiMAxP3r7Aywkhb8dmHrPtYgj2MOBwqf26Fh1 gJCAcMc4tYHTz5Rjn85pD1wlaWfoCop9nSErBrfS6Cia7FAr9J5b5+jM5TnmCzI9Vyvq YsAQPvLSD0KQOfq8b8KMOtv/6QRyOtYBJvi1Yj3guf50Xo+05ZC0fJzoo13P7Y18G/LW FByQ== 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=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=iNYCGrB0U2GuE19B8dgNvenHzy78k6j0UKVFSY4zVcr3fupd1aLmRuuky4ACmn9Rfa u0wwq6Ak3Cz+AMB8jw39lkMUCT3IHHSqwcNArKbi4FxXZEVvmTr7z216L7y2Zb2+mhk0 IaIgJW/Z5jzpPjOf0Mr1TK1PzKK5tt5p6OXJUnDdizbeqHN9iaTp1wWObdaFtDDPHqxO gz6tHT0eJEOc0Vbf7y4/aeckvg7weIJTTRI5NCLyzoiYL/t+mo4s40fZonUrKRTn9AoL EFBypGv3/NmP+ROQWX6c6fJOQ2J8ugoIxve7ee8W04AzfDtc0W3zMrrldx+8EHH6LJmf L/HA== X-Gm-Message-State: APjAAAUjepykhE56PKyHys4h6dI7EeyR7ngW41bLeoczfhaHnQwTcDw9 UZJ7ZfyY9Y0koT/kLwFf31FXBw== X-Received: by 2002:adf:b612:: with SMTP id f18mr14163731wre.97.1568105034847; Tue, 10 Sep 2019 01:43:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z1sm28989942wre.40.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DBAD31FF92; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:09 +0100 Message-Id: <20190910084349.28817-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 05/45] tests/docker: handle missing encoding keyword 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 we still need to ensure everything is returns as a unicode string so checks higher up the call chain don't barf. Signed-off-by: Alex Bennée fixup! tests/docker: handle missing encoding keyword for subprocess.check_output -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 1620293ac84..417b0cdce13 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).decode('utf-8') + def inspect_tag(self, tag): try: From patchwork Tue Sep 10 08:43: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: 173456 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5510133ilq; Tue, 10 Sep 2019 01:57:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEYsNKTcmYgGq5Y2HMuLJoaRMM0ZK3WpISM91Hfs5dfkUFsrZQ/e3R2Is/ahTxYKuBTdg/ X-Received: by 2002:a05:6402:614:: with SMTP id n20mr29230929edv.237.1568105857084; Tue, 10 Sep 2019 01:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105857; cv=none; d=google.com; s=arc-20160816; b=LYc+bwROFmpIkb/aVk4Ra8aT9qdMA9vq42CU9uHeQBxBmZwwJoMxfY9lk7TMPOhCND HxBYKK+i8qvRhH9zWaOV7psx0R3YrfOMzuYlWIf7BcFP22RvOIW9EnPZezHSJ3yoMY82 Nb9rAYDhW621dg8nGVT1WEA2bZTRnjXJnLkMqkoM1XkI6dtFTHA+virKxa8MHBOSlyOV IG271TgRz8EvbDIkILFrsAUB189fCE+SHRG1syqi5qAoTbBjASMIR86jVMQbAQnHB+5z 6q8jZJiQMyNxiCL3Spj7UVi/KQqp5YLWfQ+gXLsLpNAK30/yafdBjakAxA8sx023eEkE cEZQ== 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=lJs9UKE8HXcOx9xjKy24gbynY7ISo7SHYCDV/WLV+lc=; b=mirBPb0gJ5kARIPVzdpjOdz9Uhv8ANKooF3b/latQsNS7inHuX+8V2zS28zPDM7LPC 2VwmKa//YQBZO5iaVx05f8EV6xjqfAjXAzZwhxxo0wa26a8N0tnaWWPtTsKj23G2FAZy cimGUXnUXFBtL7Kb2SRAEqR1X66InEQB251O4T0+LuEjEBBHqd8JR1r2lXwahmm1Glzc MWFwnQ2o0PFvg4lDSKBbsHG9tUoBqtgiLazStfcG4wTkrJPSr9dOepEvCDY3O04reH+O YDVS/2TqIwGonAUH4KtyLMDknxXZ4+xRFyMAlgc/Zr+encslVRDhoHtKMx1eCQ/+Pa2N 4IGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MsEINU9j; 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 ce24si9133403ejb.270.2019.09.10.01.57.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:57:37 -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=MsEINU9j; 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]:35922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bxv-00013A-Lp for patch@linaro.org; Tue, 10 Sep 2019 04:57:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35802) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkj-0003Kt-Rq for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bki-0006Ix-Lf for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42853) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bki-0006I2-Ei for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: by mail-wr1-x429.google.com with SMTP id q14so18350524wrm.9 for ; Tue, 10 Sep 2019 01:43:56 -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=lJs9UKE8HXcOx9xjKy24gbynY7ISo7SHYCDV/WLV+lc=; b=MsEINU9jvfhgqNyp2/SlybrJQelHOXbTLMKyRCpm1cagvMnr/aheTKikpc70WkT2Md elEjaatKEctqg0Kvk5KV/Vizd8mtcEuxhooeKBXVSXKgurV2PNuMqp2tAA3lHQB4yTha fANv8Yv8y3Gns3itbYRKC80OoNmDaq7E+Z/9jhYQQiXjo7yXJGZPXpPnlIxt+nCvMGKS GBIJJnebscjs++ARhIGXj5ws5VHX06WEphr34bLv+DhyIjBReAx8KXkwRMnwxYrMCTYP AAn4+jmbgoKkua+599Z5Qavk6F7jJTEH32FqR6590rLw4bYuk1KeLTUAGftw5kDniF1c L7Rg== 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=lJs9UKE8HXcOx9xjKy24gbynY7ISo7SHYCDV/WLV+lc=; b=e61W+jN7XqXy2Si8xcBokEEu/XZjsS/CM6O2IZ6aMCC7PbYfeu8DSeDjsY3JRyLsdM U3khJx+66yNSw3Xk3aPAETyUNoGpfz7gzDnyqRvpjIvk8w+3sepX8LPRQ2TQs6I6XrRf 1NGqigu4B8t6FmlzuJIYRVXDj4Adw3qXoFhmfTySyqFYTPQ3pYnnumr1cAPTGfirDBX+ BJF7F5xMGd34Q0sEiCIkflqxj+tCxMnUUXhNYGWL/vMmX+TZ2br0SdENUihHPLiBNpLB CyZsRULBecRwcz/eOQgPBoSa4dpdGFuApK8zX56eIznIkU6SkETkv4ueS4h3v7qsPJqB Lfaw== X-Gm-Message-State: APjAAAW0NZti9zsEPR38VD+JU+8HAjuDGClyt+duqj89rq+9k3+Xcmh3 v1BMUqJe4LJ0GY9+5bkEzRV76w== X-Received: by 2002:adf:fc05:: with SMTP id i5mr19337868wrr.134.1568105035327; Tue, 10 Sep 2019 01:43:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b16sm25580521wrh.5.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F0C501FF93; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:10 +0100 Message-Id: <20190910084349.28817-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 417b0cdce13..29613afd489 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -111,7 +111,7 @@ def _get_so_libs(executable): libs = [] ldd_re = re.compile(r"(/.*/)(\S*)") try: - ldd_output = subprocess.check_output(["ldd", executable]) + ldd_output = subprocess.check_output(["ldd", executable]).decode('utf-8') for line in ldd_output.split("\n"): search = ldd_re.search(line) if search and len(search.groups()) == 2: From patchwork Tue Sep 10 08:43: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: 173454 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5509209ilq; Tue, 10 Sep 2019 01:56:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8/Qb+bqtpIhggFb8spm53WqubYBQYPBKXFPagcN2cb2upo9y3E/bY0wuA7B2vdq30ohEn X-Received: by 2002:aed:2f42:: with SMTP id l60mr27058359qtd.315.1568105786078; Tue, 10 Sep 2019 01:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105786; cv=none; d=google.com; s=arc-20160816; b=bjz01tkD4YwTcSKsK0BO7Dg685HNvJ1MajdlCKod2+Yvjmtbt0/PnfkGGWCAbFW8sE wLNNExTpmeNbYfOwprOutn+xb1XqTHWzofIP1yuYuTtGQ6IsbSr5upSe9g8rxWRr3a5c JuwaDKwJ1r9RdM8HkbCrkhJ+PbdyG7JLhGtzts+tdufyFKFmqC2vL+xOlWXrWGPFbR43 NEDFlOpkikhCtXUbk0w5w5T8BHriUZ7x0sdQXy59wUVNXYVYkVCItD0fQOZuy74WstWn I+c3PEKChIcL0tvj8x10ZF/yUVZLQt7ECsisUsUiyy/y5aoWIPD6lHiU2N4zot/dakmA SPxA== 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=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=MpIO1+HKlwCiSUxR0U3Vn99N0Dc60qqVKev3iCAoHsgPCMrAYt8Lw++3lksWY9lrEg +foHXeE0ONCPtegqR6ipSWfIlauHvfxiecdEhF3y82uk57LO93UBRgda7dh3g34Qn3P5 yrTxEFR2OfgS/42O50XXT1sIJXEm5nrbz1YRNN/g66ucy+AtClauYq+SYKmo7jMpzPcs winL7Tp9htRCtgZPZiuPoMDpIVzTBXtMahhmTkqwp448sDo1kKkMNU600c+Z2TT9ps2I 5+t+oRqxNzvLGz33fpSp+vxUHu0gb7fNNXHwgu6S6kLHciHFjBZexAAi4VmyTEdpyacA 5IYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=asDMx+rv; 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 v1si12743812qtb.287.2019.09.10.01.56.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:56: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=asDMx+rv; 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]:35882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bwn-0006TO-3T for patch@linaro.org; Tue, 10 Sep 2019 04:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35834) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkl-0003Mb-6f for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkj-0006KK-Qj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:59 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkj-0006Ir-9Z for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: by mail-wr1-x435.google.com with SMTP id u16so18412070wrr.0 for ; Tue, 10 Sep 2019 01:43:57 -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=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=asDMx+rvf67LLEacPQF3cMJeUBogR6PQcI1iVWdneklvW0OcrX+/9Cy4YUIucVkphp DDwjhcHo0umI+5HvWq/KzFooRL1JclR8Vb6HMNJ7PT+eEfq3zTzwrGmdCxnXo7jai0LJ Dexq+FWbcFfWosT5ERXKao/HPkTBxdFtSczWlhERi+Su4hxinD8FCgXHMon1duMUJFO2 E9g40jL07/fxYVehj2ttT6kayOUn+naC0MEUAf5EH/clHvRKeuPWOJFVmpTEyDue22Q2 Gg/ADBot+Wf3M2Y8Z1klSF2+1TcvaKqqTfa7nMVKwgQ8J8hRwH/AQY3CCd/pUS4h3JUV DL4g== 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=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=cKhyZFGnP0f7VwEimPII7nm0aBHsliN19iw3M8ScsTrQkHZ8T2/kV1St7MIQYW0fPc 2M9vnm1mu5lebXtDblQvi3zFUKlFpyd9hg1kNgxcG8BFZyB/loMWDNcHQzVA2LrNUXH9 NnfAOMz2V/quW++uWpBVYm5rKVY69vtRgSy1csZ2jNCOun4zRWBvNmuKC4HLeAhLbU8H aBXKZycn7OSijH7+r0iId+vBqZcjCEq/KxaRYEru01aN5W+rARMLyKYgJcxDp7fRu7Hx tRrCIuKGAy5/zWWpg2YxWijr9Fmlno1L8Jya0BFHm1q66+Ha+Rg8zNHFLEEeaTir7uu8 w1fA== X-Gm-Message-State: APjAAAUl+92JiNGfNNM9XGmVkhmPri0q84P+wgNqbx2lvg2S+37hgxAT x1areup5ZbS+ca4JCQIKsdD1vA== X-Received: by 2002:a5d:568c:: with SMTP id f12mr25080280wrv.248.1568105036125; Tue, 10 Sep 2019 01:43:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o19sm23334877wro.50.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17E9D1FF96; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:11 +0100 Message-Id: <20190910084349.28817-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::435 Subject: [Qemu-devel] [PULL 07/45] 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: Eduardo Habkost , qemu-devel@nongnu.org, Max Filippov , "open list:ARM TCG CPUs" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , 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> Signed-off-by: Alex Bennée -- 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 Tue Sep 10 08:43: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: 173457 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5510465ilq; Tue, 10 Sep 2019 01:58:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqz/VNQlPfpWo1ELxnXv2JCdw3meJUawnzH/6PDx/OHCTjQ5d3bjcQfj+gcTt4gzMuZ5rOXR X-Received: by 2002:a17:906:6d2:: with SMTP id v18mr7419497ejb.249.1568105884297; Tue, 10 Sep 2019 01:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105884; cv=none; d=google.com; s=arc-20160816; b=v+tYEA7XJzTgc37H21SOF4fe/BFr+mwE/TghM5/Aw2rU4fuGDmyk9t21g61rxYMCMA xBAHrSLLcC4o0jx29J2/N0DT30mMnADfrYV838MxWQqA590bgiziEiwBuzRjqtJzIVO9 TwFWDwZDDxmj7n+NjxX+GqqeOSOYWE1tcZFbE22XjUkUCwgHEsVQbpqZAlac8HsSrKru ugR88LtHZhFqXVQgUBXqjvhwD3YUA/qeq0/bPZJD3g3HCm5EZiTOwFNEF3Fl29ETZlRO ZgGaEBEPmGUyCf4wVUstArsch6SFo7Dgkikttp3S/hOTGJlA4/E7280rJNcCDh/VbFD0 SHiA== 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=RTgrDOX3GQcsRTevkPr9bJYB3sELKwKwlcNOxCXwEks=; b=Bwl/o0fztzgfK2jL3wro+gdbC4nymIkdbdmOAUfPzwgZ1wzB/4OjoseKW4VD1ZMj4/ FeH9APydjh637ih++95BywU0vjoXqfuvuBm7siPO/82CzxHJBpix/2AQzIT2ZEioCe7h B67HOW3YVDCyqhUopANEAJuk947gED4SuiUIOuziU4yX6RCfIXUCj1yVnPEw2VNkzUBg jfhvp5i/ppvVBno5q8kDwOcwHNY6bzrOBUyy9+RpGefNV3HhMr9V7lll8w4Ejp/J6+y8 NX+o/QJeG5Rdp2ZP8CPrxiRjsQRNZ3488s+35mILc/DrbESfiClhhuSfp9HxS2vjJ8ey AKJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SPcgI7J7; 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 z33si9744427edz.314.2019.09.10.01.58.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:58:04 -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=SPcgI7J7; 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]:35914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7byM-0000OP-Bk for patch@linaro.org; Tue, 10 Sep 2019 04:58:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkn-0003Q8-Tg for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkl-0006Lg-9Y for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:01 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkl-0006L3-1C for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:59 -0400 Received: by mail-wr1-x431.google.com with SMTP id t16so18373920wra.6 for ; Tue, 10 Sep 2019 01:43:58 -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=RTgrDOX3GQcsRTevkPr9bJYB3sELKwKwlcNOxCXwEks=; b=SPcgI7J7RzaIQ8XKRNezOqC5IbVyr+B66yQXNZOFImAaZI2jyWJs+RKMQiEF34YO48 l0WMZBF2gHvOkhpuBaKnkgiu6ycICYHhLR3GsdT7baAbswd9AM1sH8qF5u1+zxrGIAqT gW3HMekW89oDznYInEAe9RMNqogWh+/jDoFb2iMmtaun7qKswCrhFf8zEnMofj8L5Mo7 LpfRKSGH0iVYD4jUCUyLvj/OSnjuTNQN4oka28j9BagJlb+JrXb6xowZX/UIdbnKnaEP nciQZVG5qHc+eGgOV8k71NzduytzhGMmoFmUZjPD81e/uzFZ651zmJ1hR3ddt3RmnmCI 1WUQ== 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=RTgrDOX3GQcsRTevkPr9bJYB3sELKwKwlcNOxCXwEks=; b=UkX48IgOqiw8h4EzSsQjqmmcDd6X2d5Cg7efrADag0T7Qki+lCrvDXmHUoQRTb7k8w VeLZPfwYFi4fqHSOkuphy4bXfBJqNeNw72n0GWOkuRUaQltIqJ00d2L9bSUiaQPugH81 7i+bFP+5yRPSjnBgvVrCQGszlPOVgc0aO8kRO6dUkaIn752CWMJRazp/CZItMPVkTNVl mkaSYU6UQD0ukji4ej1cDp9IGkqgnkrquJ6AKBtfcuH8oRqoTU4gvU9oa3SO4WU0hjl5 ev2QJMFRmIgEtDolLSACzU2lTNoT8a7AiMOBc+T11LcNMenHm8070HcGc/ctpubzB+cU 58MA== X-Gm-Message-State: APjAAAUciv10R8huuPvA8vf/e708M253r8/J2OeIhxyOqEM0RIiA0HWP jOKNK3oNPPAD2Cm69innZcJsRQ== X-Received: by 2002:a5d:4f08:: with SMTP id c8mr26564512wru.51.1568105037714; Tue, 10 Sep 2019 01:43:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w1sm16450494wrm.38.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E80E1FF98; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:12 +0100 Message-Id: <20190910084349.28817-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 08/45] 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: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org, "open list:ARM TCG CPUs" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , 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> Signed-off-by: Alex Bennée -- 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: 173460 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5512499ilq; Tue, 10 Sep 2019 02:00:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwEk7r1tKQou8ASXI4m5vFh7PLqi3Ly9Agamgxfv7f2f9AJGuImfPlOzGSTPCXlSRQgjmIv X-Received: by 2002:ac8:45d2:: with SMTP id e18mr26474424qto.321.1568106027685; Tue, 10 Sep 2019 02:00:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106027; cv=none; d=google.com; s=arc-20160816; b=PB9ToyKDExOgKB52Lmoc+7AeCFr/Q2e6ckhfUcvQaSekdD28kXJl3NL/Fct8zRX1zd tj9o/XP06Uy5Xtr38CQf00gCEAFcnclfQg/R1WHr/UXFzu1lwwnnuUDqC7H6ul8JrWOO suMi83Yu41boHuwEry3Ho2eTSw2//D+qEmuzAzKk0x9lCjQApMLllippwOv+cX+1mxrk vWfEsgnU0FhJmYNCj42sdrv0P+kKDZMSYOxrjcKbz0sO7aJvTTjbauswyPyJAhTITMzE xOdvyZO1s4Cj/cEz/hLKPzi/aXXcJAlaHrdxMwEX2dysfLPXe26OoxdzQuQjeoozgxIF DkyQ== 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=V6UVUij2IsfRhhUaO7cNutqlLQBE4yWqcICoTPAw68U=; b=oh8DjrGa3hzB+zq3MK81F6Qo8SobgI8gW/5Ghu5oulUGp+Tib3P4X7pIlF2lrRc57u +gdOEpbcvQtBuxirMHKxL9dWIBue9Q0n3tIbLkWnz/JlbRpBUQcevcaqkziFpkHTu0FJ nFGvv6FRKGrO4/jxQXsAa/Dppv4Rj3omE4daS79sSQ9iZROJ0LSgCyxfvJgR76P1heNl dJ08q552U8wKfpgrmuWKM4dojmnfs/EcmDJqcdSUUkxwcSuEHqY6nS/ff+M2cumcc/Rb NjlKJXxRS/nTass3h3CnJkiEqCLeoFYbV8tvafSXRHkcezNQss4tC6TQNpCR/CPqTsez 9fBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZZflbfyZ; 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 m20si5046085qtg.77.2019.09.10.02.00.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:00: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=ZZflbfyZ; 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]:35968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0f-00049f-S2 for patch@linaro.org; Tue, 10 Sep 2019 05:00:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35925) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkq-0003TN-2k for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkm-0006MH-2Z for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:38314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkl-0006LY-Ni for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id l11so18362050wrx.5 for ; Tue, 10 Sep 2019 01:43:59 -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=V6UVUij2IsfRhhUaO7cNutqlLQBE4yWqcICoTPAw68U=; b=ZZflbfyZaHlqPo5YnQRqG3UjbXLs0yeylRXlUeZxclf8e8k3Vbennup9LzszUhjtaO lFiYAA681Z1rB3sHSmvz/cpjY0V4Mv47cLldehqWBNAY1pDaeE/A8bFsEQc26FNXe7O2 dlCmXLYPnVNf0M/7NvlabCvUJufWRuCgEwsRJbJP5mk5ethiLwxf5egmBN5KWKLhD1/9 nNUSWwGuWbAqER8EZpbcPVeSf52JWr1+6BctMn0/MrXuBYjCQqXjEeCYzq+Am4XezMyE 3x25DtBiyXcKJ/VhFTwd2fwydji9R7i+wz1vakc874nExARMGoN/59umjwfJ9fnYK+JP o+fg== 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=V6UVUij2IsfRhhUaO7cNutqlLQBE4yWqcICoTPAw68U=; b=SB/j29qvts87ZlJaCpGYuTSontDmoLsQLVrvG+4PmkzP2F/d95n0nxfp+4yEz6ZVmv cATTe8/5z8VvZp0Nd9eIkexUSdH48Xm37/90jdIrhKZSfFdFBI8E8ehtFNWn+uMNtksV jsOj8HswhkeXeKx2qnXcT10P8sOqcnAyF824steVA1hymL1Oui9flcxCfFoCCDzR6C8X +TV8sTgCXYQogVPVNHJIrrRISWvWQ/DS3tmUT5RhcqiO6uHIRVUS1tAKMv5QRb3NlQ3l 9XOwGBInuEut/xtOldIKhWXG5obqvJo73ps5bTkBOs06o8rMleHHH07mgifUBYpzpWha FKDA== X-Gm-Message-State: APjAAAU2TQisZTEa/jElEQ4oP5i3wILABU0ogTgI2s8RYnFUE9KNUvGG N+2eRtThFohPx6F745KH6dLTmA== X-Received: by 2002:adf:fd41:: with SMTP id h1mr5871211wrs.315.1568105038299; Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q26sm2313929wmf.45.2019.09.10.01.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 603B81FF99; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:13 +0100 Message-Id: <20190910084349.28817-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 09/45] 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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 -- 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..8c648ef3c24 --- /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 "$container" != 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 Tue Sep 10 08:43:14 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: 173452 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5507878ilq; Tue, 10 Sep 2019 01:54:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjLw97Nq11d3rILhKiFNwKHuf8qntzlMZkYcezT8L+TCynyVPhQUHLJTF4pIhYjE6ItAGT X-Received: by 2002:ac8:6746:: with SMTP id n6mr28077253qtp.128.1568105692037; Tue, 10 Sep 2019 01:54:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105692; cv=none; d=google.com; s=arc-20160816; b=s0ihJ+qhEIWduudRvp0JxHTU24GmV2CYcABAIp/ePHdq9eZ3A3WLGFaSA8NMDe/7rl /5zB8Ga+XvA0jYNuoHr9bGg9danQyzXI2r8/5zESlkYLdOutSIzqGS4hXLNZl6yenn4a iyhcnET8ZnuP1/+Qg8C4qA91P0TTG0OZtVK6AOsZdtpHbfIbgclwbVIoVkl1y34xsqCU c7BX+4M+w49Vltu4cTJ9CxbmwQ/LUZNeF2tNJuXzHiG06fCJUwHNy7gYzTC2IHtp/zv5 v9rpsngDUULvBUjvBuL57mbYL/q8bdOr5WmeXOgeC2Rf6o4qeL8Fr6etHefG28ktyCcA zsAA== 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=oNXTVMOLmuMeTRVHdN8w2fyWiwCfikFPr8AkyJlesM8=; b=DMRuR3jU2KW8CdcnTVsNWyN/DXGAOz7IdFlNSLL150IdIJNpA3poIUDAkq4MCaQxMr RbKrC/CPKzx7vGy13c7Pop+vnORMJkOBBpwonsU/6ubJ0X0RXxPurnWAJPLyNX+d/euB oOI9fNMGi3Wun5fXjpuk4Y/LF/c9Lnx8zrQoQb18/ghcXms41d57MXL77QsvyHYjxfzk kBSwVcc1J1sm1nkSVp07Fsv6rZzuOQ7DZDTEW3+oFgOgZorwlNJ/ea2uhJluP03XH/H7 tuqRn9RHGYOHP7lNBNFxflM+LLyCQ+iyMQI/MOutkwnYfm74kcQTelJp3wzsDLJsuozd kvog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=odBLknpL; 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 t51si13220080qvt.186.2019.09.10.01.54.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:54: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=odBLknpL; 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]:35856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bvH-0004fc-3H for patch@linaro.org; Tue, 10 Sep 2019 04:54:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35842) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkl-0003Mw-G9 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkk-0006Kx-FX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:59 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkk-0006K1-4l for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l11so18361835wrx.5 for ; Tue, 10 Sep 2019 01:43:58 -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=oNXTVMOLmuMeTRVHdN8w2fyWiwCfikFPr8AkyJlesM8=; b=odBLknpLVDgkCmPwBjy5pfqjSiavZhY53iEeA1hN+uEQRhXBfhZ4hWuCh9nXpi07wT NuEPB3x/7Uf/S3eK3BStjm/tBtUevAZ/8kB7jPu5H8ngBmfHa8KUoCcYBnsVwGwQpY7+ BN7n11O9oNaMBEsTOY0YN2bBWWk2N5XYGEBJScQ6rGuQfBEUKs0abdK4irusAFVKelWh WHRpxiTYywn6vTZugy3aUvXKpyYaV40PSFkw0nkI8Kl+OFfyjuMkq9y6YyWZlTwQylYt xQXN7XbTEGbjjygzYMLNMQmDwDi6gOIw3Odf6YoA7+ExXtBo2R3FlMLsm6AZ4Oj9wTRF gPbg== 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=oNXTVMOLmuMeTRVHdN8w2fyWiwCfikFPr8AkyJlesM8=; b=nAcM/KC9sjJsxGzLTvTtP61w3wcvgmjscQys9wpZHH2ZcdQL9duCIArOGPmT19wZPj YMapQZOa9CgUXYIwXgZ59DKZHX00Ay4n2EMyX2PUz5/8jVLXgaNi2Dj7nmJFzH4usJYS r8ILudfFNuN+Z3sfQBIbGLF2jv0rgoMcdE4rD3F6cITi42qvYa0Kjk+nMeDxyCs3Mo2f ycNO8m97w1cIviLdMcer6lc80zFWhFTh+jRQKNrb+LE6NkDY8QlA5AYbnN9nIg56KE3b H+a4ip3VzSHuk3oeCy8Sorf8+FyZ9wzs3ipIxJ1meQRZDn+NvejQqy3urWee2cW0uYBF Ps2A== X-Gm-Message-State: APjAAAWkHtJypvignFpZCuCNiP/et7OMxNpO5Bx1QHHGMd8VavaPAM2J i7UWdmWZ0e2MDMFb1DrjimoY9A== X-Received: by 2002:a5d:698d:: with SMTP id g13mr14154902wru.338.1568105036954; Tue, 10 Sep 2019 01:43:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm2042769wmb.28.2019.09.10.01.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 754CA1FF9A; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:14 +0100 Message-Id: <20190910084349.28817-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 10/45] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 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 Tue Sep 10 08:43:15 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: 173473 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5525153ilq; Tue, 10 Sep 2019 02:12:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+GxF3iCCDmie1JLBXjyb3Gt644Gvfb5RweZqiWXZouHRSiNVOdVN2NWU9jp9Vpj073CUr X-Received: by 2002:a05:620a:10bc:: with SMTP id h28mr27957592qkk.476.1568106751754; Tue, 10 Sep 2019 02:12:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106751; cv=none; d=google.com; s=arc-20160816; b=L2Kjv14MRimdhgb7iv/NfJiDBadmnSvE4+DMnTro9wW3HH/aL00gnEON4xKPIm/xbk pKZTr2RosV+IJTN2s31XOeOLVZ09z6YQv94NE/rrn2rwhCc3c5PYLCp4P1u6tCo7TK9N 5MINPpHhOpx6qxg3gqImQe0X0DXRuMjaVwO6pAKaDT3snKP8tfE/PYOPUNUY6VKfyWIa Ta/mjnxlF2OOVgbNtXPR5sv/qqPCP6FrQMHKpy9aeGBcZZtBNSJWD0ylPc1NFqW80HPM WH5VefcRINWIcq6zE6p9njIynuRvo9NiK1RUqxjbzQdrmK90/IHEoPlOs4JtsEea+tp5 6ujQ== 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=WUvbSCpVrhgaso7nfdw/Ni5/eDIE/oeaqBdvwq1XqL0=; b=k8/816IG/ToZkYkmrbnqCN/yc8iLJhjP7OwfofgK832/Xffj4FN1DfsmEa6rIHL4y8 dGOPxHmHe0jjGh9YV4aMJpOzquXjfrRqmQYOljy2zg/pmKLBQ/KLGcKN0yYwYjiEqIyl PUvrFJA8LOK6GUnVMU2fM2BcN0+Nz5edzpoAwYYdS1SB098bCmqODUYPzNNJX3OP/Nry 4Ad9tqxqmdzxo6qm4gvI0CvYHgs4saeLM04Du9Ppobtm4ACpUDnR2LwaEuKnkBtM+xc4 XlKMPtPD8WsKss9bEmZXhDa8DfwmAC7J0zdjPY3RcSCbkmmY6nsoTDoh2tgnZI4E7WqG 8gug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vgUBdvJ8; 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 v8si12556715qkj.301.2019.09.10.02.12.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:12: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=vgUBdvJ8; 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]:36250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cCM-0001VX-UH for patch@linaro.org; Tue, 10 Sep 2019 05:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37365) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7br1-0000uY-FV for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7br0-0000gc-DS for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:27 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7br0-0000gF-7I for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:26 -0400 Received: by mail-wr1-x430.google.com with SMTP id u16so18455052wrr.0 for ; Tue, 10 Sep 2019 01:50: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=WUvbSCpVrhgaso7nfdw/Ni5/eDIE/oeaqBdvwq1XqL0=; b=vgUBdvJ8exFZxHNaJDMng5PKAdnamSm1Jey2SSNpsm+CWr07oXNisAIVCS2YwzOm80 JjqoH5S9xLJH5uVER98YH+W/1mF5c03mQJ8Q+ulLPpM0EUTj0Fui7b1TpiVlXbFxgx1U uzHrqEAKFiRSmGjzSWVTZ4JwELIBmwgrAs7Z6SjsQIoFTZkbTvW8VM6OJIleZKdYJodj S4nPtyLvSxZjtR1dbHwVPoYikLp0G9usmW8gIjEPN2XDsObyk0vNQEpkq3a1eMZUIVIA HHL8jbu0bDj1HYXY+7765TwbMKZjKjijjeluNOhsO1VMzeleOG6eUOJwzycdeozobLve Wrhg== 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=WUvbSCpVrhgaso7nfdw/Ni5/eDIE/oeaqBdvwq1XqL0=; b=nMfJbcNwxGZ/0ScDSkCUXFi6rvLgHKIuJNVMQzIaTCKX6vIhfVcE+EAPiP8S43xseL Xk+hJr8HrfYIvLCDKSzbcet6FQNbTaiihUHD+U4V+eYp4roQ5KJuk2c77hzCe+QaFxvv Kcw5xGuz6Q1lysU62UE3eXHPDcOl906LxkH6tP2g5kchjFJLb+YMSSgPS51ylZFafD6x LlRrU9u/dcCPlI+M2Dw70y6t5Ao1gfBoeJV1LxfFB01n8YGktejKyd9YN2peTXyyfrYU y8Q9oZb0yJX7tVJIO2LqMegt5mB6YUZBCndJrlHl4Bkq8smQ2sBlEnrr05rYEX9mzRdJ IrSA== X-Gm-Message-State: APjAAAWv+WP2op4F0S0fTIcc9zC4xKj7UOOLyGrrWyxCHVqFspTt3kzc hurGza0Uwup3EfFe5Y5Cxw4twg== X-Received: by 2002:adf:f502:: with SMTP id q2mr19501122wro.186.1568105425223; Tue, 10 Sep 2019 01:50:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g185sm4982521wme.10.2019.09.10.01.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8CFFA1FF9B; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:15 +0100 Message-Id: <20190910084349.28817-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 11/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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é -- 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 Tue Sep 10 08:43:16 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: 173477 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5529635ilq; Tue, 10 Sep 2019 02:17:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqysgaHn/Zco5qq48v/nuda62n5DRblD9B1A4BI8tM3x483KzV8ZNW0J26totw6n6xutUFVj X-Received: by 2002:a05:620a:6da:: with SMTP id 26mr27716508qky.232.1568107031361; Tue, 10 Sep 2019 02:17:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107031; cv=none; d=google.com; s=arc-20160816; b=yZiSgVl+r313TS791FEQw4F1fECBwJxYzRtL725AYbrZ/W+T2iq66di9ppCWoFEesN 2MKyXZ793z0NM5Wz/zalmVJEIwIr+weFxkduiJ7zGsGxxSBimIY+keCg7jODuMZqz7Qa H0cf39cMxDxMlqEjYmYsZg0zvVIe+oRC4s11gAGrjDMe9Q16SuVAGsnEr0qd9InzN7cQ cIbO9Irt68IQWst8Uw8XXexy296XThSkNFRrOSaWvY1Dz1FA7l0m7gNNhfPJjJM6kWAJ OCjS6YMnIf/uwlmmwwPN1GJOxUzntdaiYzDV4pl6NBSx1/ROzFcRaQOmgzXCALmivLdX xh7w== 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=8rTETEcYS3jec87Xegg9zkrdJAv4L7q/upZyeHVm888=; b=q+0NhLMCFDE5stPEAEWySRR4NhU0C6xpvvIc+lVBDI1FZ8RobnCe1SOWnXC/z5W1bl kVvs5sg3jlNy5m2Y8u4Q7WvC0v68ZIeBz0hRCRkqs+D4mU64kraoInV+kTh4NbXRMGuZ rzBDlJXDDeCiWaUOABvADadjLRgeijNOffYhPuKo06YPbmIqSNUfElPDniwrZwjXEN+X /7OMz9kcoB3n8iyXBN6V36oUaGyn3yIxpP93dfo/V2GzQP+lPPule1p9XyGf+3wUS2ce Pd6AtttqRP19Vgzs3aNAFzy8HeFabPrXZ54eL1pOfWjXUquPuTXxA9J4xDtBmhxVvg+I PU2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SXEhvKZ4; 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 x127si12209732qka.237.2019.09.10.02.17.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:17:11 -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=SXEhvKZ4; 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]:36316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cGs-0006Ag-0A for patch@linaro.org; Tue, 10 Sep 2019 05:17:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37313) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqx-0000pr-HH for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqw-0000dI-34 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:23 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqv-0000cp-Sa for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:22 -0400 Received: by mail-wm1-x336.google.com with SMTP id t9so537654wmi.5 for ; Tue, 10 Sep 2019 01:50: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=8rTETEcYS3jec87Xegg9zkrdJAv4L7q/upZyeHVm888=; b=SXEhvKZ4ufCoC5U2GFzjNNG0fEz8wM/gTZAUi8ZHJ+sgORW7fJXwvP21GYrJO4QEeW FWj0ZTrxg7ixt+NwftTgJhID33PyNYherJA06jgg0GJUHNgOmPvLcDfvv9Lk2tbsph5V CcmWqvnXh1FBIj6GyHG18PGRuiUWA8AYk22B0OnuGrlLJJe2jGJq68MR1T4+Ln9LNYIv zV/akguiL85hO7PcP5kaTGO5xbb8pVLVPAgdYYDi0P/yFLDx3flq/D9SvFYISHxLpeax VOfOrovZTdiYXscii+clkxp2XPUZgLbrsr/NFMMiUpIhm52gIJNAx/9mOdQX0CSxnN8x nhSA== 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=8rTETEcYS3jec87Xegg9zkrdJAv4L7q/upZyeHVm888=; b=XqFqxA/dSng3rcOKE9phRFGJGWOtY9/fHyTniN2ZgNhyLsz7xVQZi6kz4+z9TbDArs /XRV842CMYCO8FnneMT7bDPCi5kPUjqEKSZ6VmehF8z32QdwqVTdpTo5nRqWSkpvdIc6 lH6JBuon5TZf1qJwuJk+QCdt+3TPuYNJpDG09+vHd1NJBZjfecSWXjYK6qKIh/x//24v wCy/6Io73AHT6lG0vMY7rUzF8HORo+USH+4Q/NChXf3Epgee4MZ1tO3R07Nnf98bMhvj lZ/Yi/VunXrafZXbApi1IZ99V8/SJSW10/U1Gsy8gTSL++ch4vv0NUAWKEaZTYKbfbO0 OHWg== X-Gm-Message-State: APjAAAX7QnhAZq+ogKCO75YdBc5jZs72cPagIOlHeVL8IUOC4iNg5mDn zG7KCYPpIPfjDfiTwJA7vjOXiCt0Yrs= X-Received: by 2002:a05:600c:23cd:: with SMTP id p13mr255098wmb.148.1568105420715; Tue, 10 Sep 2019 01:50:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z189sm3154475wmc.25.2019.09.10.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA20D1FF9C; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:16 +0100 Message-Id: <20190910084349.28817-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 12/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 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 Tue Sep 10 08:43:17 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: 173450 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5506392ilq; Tue, 10 Sep 2019 01:52:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfcuapdMam49KiVdcuWBF36mTzSCCXWjRji7Z4hIonP8Na804D/5kvk7rHWlTIrqoITvTR X-Received: by 2002:a17:906:a38c:: with SMTP id k12mr23764472ejz.181.1568105578969; Tue, 10 Sep 2019 01:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105578; cv=none; d=google.com; s=arc-20160816; b=k8h9CzoVSI5UFivdz35Ov2Hci8z3uiSuUylnpefyLc4l9ZV9sE+DWdCF6+n+5JbFqp VtLSsvm9wF4F/BnXyazjlX+zoyjEdAZyPREY3Sz/Jp9ll2nrLcZelXEGWSRYs8KZUlL6 gvM8c7e4Y3fz3uNZyrQeo0/3NfwN/juj0+aoR7t8YFBW+Ll8LAHmGc0EotOZyTn8g9wX Y3fPk9fWWYJb3vkpnYBhuW+HBez6JwPtcdUbN1XXEqC8JkGJf/Qf0tIM9K+LrszZMQi3 NnkD1YvoJi0fNJT5tYiWBSOtslG6ulmSXlp3D1p7UCFZEtz4e+oR7QpNe/LcfXH/XZS5 S0/Q== 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=h+Y+t0dpxJfi/9GTwgQnzZfP7op/VsJjQNNxO4mFlAc=; b=zgy7J1wSONkdLv+1iFwchFgjTweWqwDP21d3RTDdhjPsOpRuEOfGC1PJcDgHfNTPaL VysQJUXCwy6pgfBXAJDzQpblTJWWvDX1/3LbyBs4WiBQRCYb6MXEnDPToxVLPS9FHlkt 62qraXKzlEvq3gk6GZTYB8T8KFeKrAEykp5JfROgyK0r0Fn4JmXzX0ZKl7LBscLZ7u+w 39w+VsbMTFsQ3gQ5K7l588bzquWi9IhxM2lISd6kyrH/ZHziR3XZNa3z0ooladtVoFL3 dx6Lm6C0VnAf0vUcSwjWIM4x1U8cuiqxNrNUj+VLgrbHfMCtSO7QVNrEw8xE0xnYCbg2 glgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ss2K+B11; 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 l19si6387927edq.450.2019.09.10.01.52.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:52:58 -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=Ss2K+B11; 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]:35842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7btR-0003AS-8a for patch@linaro.org; Tue, 10 Sep 2019 04:52:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkp-0003Sh-K2 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bko-0006OB-Gi for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bko-0006NV-AS for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:02 -0400 Received: by mail-wr1-x432.google.com with SMTP id a11so8602726wrx.1 for ; Tue, 10 Sep 2019 01:44:02 -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=h+Y+t0dpxJfi/9GTwgQnzZfP7op/VsJjQNNxO4mFlAc=; b=Ss2K+B11QdQE0oxs5X7l27fDEZQxvXACr82lPYxkv+ZHekN+s+xXdU+ukymOKzMqPi sD2CleetU1uWqwEsAzY0f5rIkBMPgaGoViwnDJR/CcLGYBYwNqObjX8GV2lA4NM2BfsY 5kVchudlTZ+h+f0qaq/p8yeHKlIe123WW9dA+Kl4S/F4Mnvst7dxh2ao/fzWvms3zSC1 LqdC+zaS+a/K7V1DKZ8UwZJo4W8qqM/FDYm2SeNmx4jTWKhePNzFpSjwhCWA1oiEa+Gr dO9FDF6sCY9MazdoGi+/y2gCvu2hw7+i8y1otN0EOvxoY/K1UI8m4aSggEdjsM6hMgbB +8pQ== 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=h+Y+t0dpxJfi/9GTwgQnzZfP7op/VsJjQNNxO4mFlAc=; b=rhHiUe0EH/17WVr0xmnhJyoDKZCrguV0Q/gBYIIZJcLEXgH9/qbX1NanYKdBhxO06V +45DKZAH901sJIKi4THww4OuJTtHscmnC6XP0IdESPIKTTteRGI4FqpD6eE7gR49gilJ ulDC4J2Bdx1JAzJpuaotvxNLbCnfOL8SNuXLp/BMqYivYLuDMEKNgGr8SzfWRwm1jGLb SHLq/k0wygbarvYOZRGR8f3bO3IQfghEUXvYmvGjngmLvWtUpyx8k8llClg4tDYwLwmc Il6IFmU1+2vmM3wsrtLeig6tE1Nc121+MBusHwPwFxlmc5lD1NINmpjlok0HSVY5Lda0 fg/w== X-Gm-Message-State: APjAAAURIyl3EUhIY7fmNteUx1FRF4oxcG6PwHeaCanAeP3FnYLbCW6i jJo+QV4BcRt3fgZJS4X8DD8Xfw== X-Received: by 2002:a5d:5345:: with SMTP id t5mr4809263wrv.30.1568105041244; Tue, 10 Sep 2019 01:44:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a205sm3066063wmd.44.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE5331FF9D; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:17 +0100 Message-Id: <20190910084349.28817-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::432 Subject: [Qemu-devel] [PULL 13/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:18 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: 173462 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5514510ilq; Tue, 10 Sep 2019 02:02:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVVnVABSLdL1zaKgdpaj50/iqaiONww6s4Cc/hWSDHO1yXNZG3Gsj+OoOrR5HDazepIxEe X-Received: by 2002:a05:6214:12c9:: with SMTP id s9mr17233030qvv.26.1568106134207; Tue, 10 Sep 2019 02:02:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106134; cv=none; d=google.com; s=arc-20160816; b=DxQiTv6eXefHjOzV0lD5s6yoO27V0keLBgzDiISy7c03baIeE0x7qH8BB7+rpuBc2I GxLLEVoxH7Rdott7H9+gvOo2qZcTy6Bq1tU9iIyxh1bh7Zwdv6zoU1uX6AluRIYfWuJ1 ndr8fS0J+lqvGG/1xnXGgL/q1p+fU6eiGbtW/K2SURftAQQrXdwdcnxoB7oAA2PqmwNE 65McbJi70ITAEm7oOL/1uTPOR5ZymD5ZVIeRIQTMeC8o8yQYJHIFO9vBhQzVGkqWrQxJ FVjBcuB2AS/hURV22mG4GztcrUn7d092JT3QxuGvHuTlyi2awHg4nrAZYtTELC8fTLzR 7G0w== 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=mdCWEzeqB/NJreuqbYnaAE61zGJxPS13UIEj9hf0Lqo=; b=oGiptIYSVJ7gFsCzX3wZbY/XGkaD7TQ/Lfd+US4gwISM6gbD3AjG76ZDp0rrsVuYM/ ix7+niEJCHRojzb0ncr9hRfxaRcfwww1IdLbPwh2I7U0Ww2wHKpQQuXmQoOkgdcEvn75 Rks774lY6st53FSvLvBW/giNPybgNBYNL0RXFafQDc8MYFe/1ujy+yznHDK4e++ab1MF 1qoX1q/edvnyk4FNmFu3N78peuAttInTycOvkyfDIrXFg55WF/k95qLFuLfmAc1Yuu8m qpztZoREYR0OXzlDMjVZHVTbWkpnJpKrrRx50JQVvIZHiAUtqhz11VQhH528u2rFrGU9 A3rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kVi1CURH; 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 a3si437188qtm.371.2019.09.10.02.02.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:02: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=kVi1CURH; 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]:36054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c2O-0005kb-VX for patch@linaro.org; Tue, 10 Sep 2019 05:02:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35946) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkr-0003VJ-Eg for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkq-0006PK-5X for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:05 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkp-0006Oc-VC for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:04 -0400 Received: by mail-wr1-x42f.google.com with SMTP id h7so17351479wrw.8 for ; Tue, 10 Sep 2019 01:44:03 -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=mdCWEzeqB/NJreuqbYnaAE61zGJxPS13UIEj9hf0Lqo=; b=kVi1CURHSGWJh2ir6b7dsOTDFoXH/zO3WIkPAk4NBSFIZl+a2XXMgB8cFeRBz+eeNB PZ3F3oGoXRFqjFH9HUCsvU0Hv728nr6Q0VGYJNWhgBmU4vkmHZqQcLPGHMWmWzuI5XMf 8HTSbgMHVTFeXshjAIA+Rvz76qYpQ/SsACaeDm6WjXGCcbwZF/5zgog8j1aQkUN0+G04 80qG4B+nc3Cw2CYyvOWQzvC7Wa3HU5GLBH7NrL94JRG1SzH/8hNRdWwfkMVTdFZGafKI 4d5esLryXzPTvMQcH8WhKK0bpnyi8rGUBOycCHHK6VhKXqlM+teiKFjJP+iy3Nz5E4g0 surQ== 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=mdCWEzeqB/NJreuqbYnaAE61zGJxPS13UIEj9hf0Lqo=; b=RiYDFwwyIb6JYBTcT3szHbZU0KWWgFBhfjmxKH3pEWbAW1WOuNrGI9KPTvCcv/P28T xGjl4LZRPG8zlMEDqnqiOzimipjMVLJjLXXwXKdXWiqnE0RcBdiKPPB46dNkZol4BlJK s7DP0cPaRiupN9l+PvBJeBK41BmB70yJREBUVzGfdGEYlIlLFFkyLwm2biXI1rJ27rGr bYKt2sVxBbg26yNRqahT32Oqtj1yuw56qQ+m5v3QXcEo7gUPAORCgOnl3b5FrohkYS+5 8DcqLR10k0YoiuheDrTko4DccZIKHNneIiIZPbZKW1oparVF+9hmd2jCKlJk0noX+mPf jw1A== X-Gm-Message-State: APjAAAWRZ2+ByZP4y9LdNPMfAT/VSqUBftjtLPTb9RLLODYXgkrcjnat IMRbt1c3wOgtULmdU+XW8zZCZcoH9dc= X-Received: by 2002:a5d:4b8b:: with SMTP id b11mr9525156wrt.6.1568105042898; Tue, 10 Sep 2019 01:44:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q192sm3020933wme.23.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D74C61FF8F; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:18 +0100 Message-Id: <20190910084349.28817-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42f Subject: [Qemu-devel] [PULL 14/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 8c648ef3c24..b8dae18d1cd 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 Tue Sep 10 08:43:19 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: 173458 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5510685ilq; Tue, 10 Sep 2019 01:58:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqz811zrdCnAqIQVtb+3LInDT9WuAI7ojujCE0nAmvQzGKoaDsfvcj22wthal5XOcBa7fWQO X-Received: by 2002:aa7:dc59:: with SMTP id g25mr29425806edu.183.1568105898114; Tue, 10 Sep 2019 01:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105898; cv=none; d=google.com; s=arc-20160816; b=gUFGRmR1QHTbFMp33S7312lCcMdDKg2/0/CqA+Xq7CYMVOoTW87xCA3wVZ5btkWLJb 9PkF7xN0ljOJZwUZOm7nED3mHyLLMvFzqjyYQPeiiaC/6SJqe5k0rWBlTq38y5+QV08X UQ7AsmlxSPZ6O9O9OHIdkONN0hP2JDTmiOltJPQHdoiJf4btzNRUp6jFNGJ5v16anLcM iT1iMCafU+xnfLyN89N5NHT5MQwFyyAjigx0sgjaFFmFxg77OQIeR9NZb7t7RGpdr29j 0DXb60BkVlDY6a08vUXFA384NdpHoTTheTv83PDdDRS93iVgBZVnK3JqaE1a3fcqq8dz CyGg== 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=mWf/isVu3SS0Rczmwc2uroa954lrwbszbfgDt8fNvlU=; b=wIWFa29Gm3htCjJ3LB/YtBETa9MTPhpAKMULFusL5ZD+ei02SGBFDpfXRJeKBJi+mD +W+ssYy5wk55eCrRPwxSAjXZHr2/QY1JMfTltkMwEEB03uCL4Ff+1BQHJEjCXTVHLyV9 vyH8xDLA57Ps3g4w7ZAUsqICrXUdwKBufZdnyU6gb2TZI5z08ZlHUojV+66YjBTBsjI+ /snHlNEStkZVSs73qxkCPeGS22mKNphUOWQgE5xKmHY4C5qIy0JGeShTu8bLjrhZuF2x RqSjsaxxhVnhESwHIEe5DvOgjz8R6DNxaO8ZxKhXmZY1thdJfjm8w0oktxD2ACcjFPD8 pFpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=r217ERns; 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 d13si8934812eja.320.2019.09.10.01.58.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:58: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=r217ERns; 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]:35936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bya-00021o-MN for patch@linaro.org; Tue, 10 Sep 2019 04:58:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35938) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkq-0003UD-PM for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkp-0006Oi-Hw for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:04 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45803) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkp-0006ON-BW for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: by mail-wr1-x431.google.com with SMTP id l16so18309850wrv.12 for ; Tue, 10 Sep 2019 01:44:03 -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=mWf/isVu3SS0Rczmwc2uroa954lrwbszbfgDt8fNvlU=; b=r217ERnsUXz/0XYVTC3QgGnfyVhTKay4pRMQYO+LZO0MumfdLZEg+sfwMWE5XTep+p gkxUM2jOJ+0Xgh2gaNAX5A86OUUb7IZA0Vqyjw/RC6+JItO81fJxf69sOmqczutWuE19 Qg9qH9N2zmpTNRmFmI1+Jh6l7oRyF15A1pb9//5s1E8Pgq6biXQdhYgJiUi6+VF+Rq3s G1AsTepvn024gxHzABUqnI+rbSlW8HKaH6Imiek1GwwXqzIyx11SA7Mcz75xtCR5Yj1F Njeq8oMG9l+hHw+e5SWkH8IkPsoZL1FQ89TNGJr7KlVvc7QixcluFquvsXWAQMOqeEEt IHvA== 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=mWf/isVu3SS0Rczmwc2uroa954lrwbszbfgDt8fNvlU=; b=U/GQ+a1U20+1HZfkSYqAm80IHKW1+3Jl0pnuJz+PUVb21z1KUFAeUV0pMz7OjM99ZG 2aIxk6284mQi32nrALkJLO8K2JOxV+gEhExkDoJbTUyfa4SVod2eVW5m5ZrU9YJP3eFx veJhkbBLR4hDLR2q+lljFTHwmlKr/1E8FtdrSE3kyJUEcXn6oXDXgGlDTHUIQ1obYw0f wItUWrG/CjjigrxdkBkrkW8S/0qXd68QYfFvD6DzId+q+CEFvqdZYBWvxpXcP6NIsDD7 panqg01VWKRdPGQv2IwUpYlF1WJPLVLo5jzT95L61U3hel8nnglmcNiSIiPLNLXnHF3Z Sn5Q== X-Gm-Message-State: APjAAAWorCE/+5zNGRzt0xYJ4RjVukSdhTFY5u//6+w87dgO5qTcjyqJ 0OoP9S3FkwkAv3+ku2cmagMsoA== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr11499024wrx.247.1568105042343; Tue, 10 Sep 2019 01:44:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q25sm2023953wmj.22.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ECFEC1FF9E; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:19 +0100 Message-Id: <20190910084349.28817-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 15/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:20 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: 173461 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5513075ilq; Tue, 10 Sep 2019 02:00:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoG9zu6n0tlImw3CwOuZMmAfO+E5XEE9WV6o46ClIBt4I6QsxRiz2dHSN/NY9dPEuzj8CT X-Received: by 2002:a05:620a:146c:: with SMTP id j12mr28800943qkl.105.1568106054409; Tue, 10 Sep 2019 02:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106054; cv=none; d=google.com; s=arc-20160816; b=so9X6XvJqfoR5j6F94xFw0y/liCyNspaIYtLU2ZADrEm/zkldB7LrVIImpIaDhO/9b l9Nez2THnQ/DkBU+C24zpO9Cg0pKLzbDBfstws812icHQTwAlzjgjPD5JPf1rMPs/W91 JtJLZvGXdqMsV1Rww5OmsA8KPaFA088paeLCUS4VoIjPBRTF2tRWpOHksuvKXEXL2cgX cbI7HzZuBnNRH11tRmeA22hMBuQt2E4nGcTP5zhVoVXcm3jL5kZbILp7jOhLVSmnAgym NCijh8Z5kEIG5rLiFyoSNJvH5oMPPGwVYEu6vAxIYZwos4Sx0NDC79tTuI2khbRw3sNG VCdA== 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=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=u0MB1SJ/v/SeL6bEN7fC8XtnmZgKlnuuf45IaRw7N0BXxcqEjAigV+MAbVAYx2+t/U zcSx9akAdySX1GNzPyeuHvcTjKiOLSmfZKIcj7UjRNKwe5HoE/4i9zIhRFDgkrCEBAae vsg4lnQ9tpO5jexMayXdxawFdRWb8U9jRsZTtOJs1/Mcztktvc0mfjhu5Rlwv3s0lyZP n3fvYeZ8vnZgd9a0q4Qrl6EkwxF428jsvsg34+DwVpjK4KEry1qB7Nb0crjzBW+1rU0U 8Vmd/ofuQXlOhdtGvvAzkejVbv7QEqIPtD9XBTC6/k3WvG15EgnGbqa4iq8iCa5WHsIU r2yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qU4bPTeg; 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 y46si12669603qtb.188.2019.09.10.02.00.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:00: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=qU4bPTeg; 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]:35988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c17-0004WV-Az for patch@linaro.org; Tue, 10 Sep 2019 05:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35884) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bko-0003R1-E8 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkn-0006N0-7n for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:02 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:41208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkn-0006MQ-1V for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:01 -0400 Received: by mail-wr1-x433.google.com with SMTP id h7so17351139wrw.8 for ; Tue, 10 Sep 2019 01:44:00 -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=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=qU4bPTegIGs32n+szlRYVazm6cXbJ1U7YJiBgIya8GIFOtYtBJqsy3cHSHRaADnaB8 DvQLghSd44xxOR4sC01cUtaYnsJLAngt0ZRiTQvO0o5iuX/uQD/5FvxXCCr9Q40WI5Ch 7GYcPaJe55rrxr3k79XuUoICSNxeRKAP9xCw91/FgUX8zmWTR/drljePd4s6TXSiONKD WBVwN3N9/3s2m35yTznHScT1HhP9NrPKnWqdm7KR4PxxJnXLeOs6Ix1oeMg9KGpSEss+ fZePPNc1UDfvWUjEWQuEB4U3SSUhI07Dh36y07kleBdF0ueft1R45YD5ooQ+ygr4dMLx EA7w== 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=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=c689aAV9WIjDY5/99kssCAkH5F1DkzSoNT+hU48AaBoij/1GngEdo4tRPSiZixT5kH j3CgHmYh7YaKA96lIOqElFQkNfrbL54nPRyfyNjdKQXvwWRLnVdFj0+i4Pe/al3mXwlj QXwh7LJPZOr1kStZ7nGtuc3oewKYku/ZcR1TPq5IiQFkEKzHEuu4y1Y9ahLhuQWtBFrN R9bbbqOIEN1TAdprKzMKYQAJSNRgeZWLscoeT3Xsrw4mWGpzTHPbup2nrL0F8aJrq6wh fhrlV1xSfCOb/JFSmJWyTouLPl+ZxOvSpMHILL6v3QuhpjuvWPd+uGp+ky1c+85saPiJ kRxQ== X-Gm-Message-State: APjAAAXRvVIltHm7xZOKGh6ykq26sRoRWBs0GvJ4n1Qhx87CD+8tx57P kEwFnFajkEARMfFlIVpER6uxIA== X-Received: by 2002:adf:ed0f:: with SMTP id a15mr4760582wro.49.1568105039941; Tue, 10 Sep 2019 01:43:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g24sm26485161wrb.35.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 10B021FF9F; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:20 +0100 Message-Id: <20190910084349.28817-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 16/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:21 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: 173486 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5534915ilq; Tue, 10 Sep 2019 02:22:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGRTml4dVxNsHfyegV5vHmWnQILapf8bagJBs92XW8dJSo5OMXGVgU2YlqMGhIHBgYaSYW X-Received: by 2002:a17:906:2288:: with SMTP id p8mr22972135eja.250.1568107358614; Tue, 10 Sep 2019 02:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107358; cv=none; d=google.com; s=arc-20160816; b=UAhZmJPWp4u/l2lneHTs1z5QkYrwBYBEf0cX7imIp0WZoSfNGrnPcAuinScZmCzB/d +fKGGBxrtYIfRjjvVXt69HDKKjFPrXIJDnpjboE5zuxnPdrioFC2wqANLohSgme2wLMO 4Sj1T6AKH6OBj16l/IlOrd48isAVWFe/6QjC8xLRj+CTJLpcFLI27mwK/gcvyBJ3/2ik mbT/8qbFIPfNpmBudz3XyptM2UislPRDZxUnMroG1Ma7r8RnoXeFYnBJg5Dxx6nlt9tc LUoY4ezl6pX59m688ekshQUJZXgBjkecM+ZmB5nEcolEb5PIlOmhaDatgrPURjhV3jgQ DFQQ== 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=8x8NV3vKCH5acmfgm6iyCsOgI+rOqDu8wV4z7vxG0mk=; b=gg/a0uOaBsxgfzhvoyS9OSiKLhCooChI9IluOGRnMjOhOi7nNC+SlOpEj/9GLYDZRV IPrU5IqAyqV22ser24FLRDaKcp6PdsSvGjRra4jSFvtMkM7mGLad39/wZ80yaeZUXnLW fZc0b55vymyln/GKHQK8OM83JsPB7+EJykCpcZCqwAieDCxzI3MUeRPDO2HL4Qiwdgjf 6Xly+5DqVLcbnzCj+zaS4KPWI30BuGMUEy5ntNfZWv9YBDyGpFuinteBn1isJkiBjusM o7cPUoGo3hc8h1qYSton5ua9VrG29a9nbiadAARJriTYIZgrd/XIlhO4rlMFEsntxHDA aIBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wTEgFCTV; 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 h2si7950846edw.17.2019.09.10.02.22.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:22:38 -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=wTEgFCTV; 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]:36444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cM9-0006wh-49 for patch@linaro.org; Tue, 10 Sep 2019 05:22:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38961) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0Z-0004aL-Sl for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0Y-0004p6-LJ for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46953) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0Y-0004oF-Cd for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:18 -0400 Received: by mail-wr1-x433.google.com with SMTP id d17so5727581wrq.13 for ; Tue, 10 Sep 2019 02:00: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=8x8NV3vKCH5acmfgm6iyCsOgI+rOqDu8wV4z7vxG0mk=; b=wTEgFCTVbCNGwd90U12RDcSxx3m0j8CijouJ2jz+LxCM+JORiA6C/v9LzY42MwcJG1 dEuQMunjAM42a45yVQTiQAEDBrYEr58sw7brYrLgLS6KyC8Tq9IGTD3xJzb63EpKIp70 sq/drUzERUqsMT9fhEHCL2V4X4r0pOo2/CWMN3HeqVCcPQwEsQmswDKZJTmdvQiV6lFf mvDxsRZB6Wn78HMgxoR40xiL1fuWTs8WIlYv+Gd+SK0wg4Yv9/7+edPKZNvQWLmQMUKk fpKBT1aWQ3kcjgSv5aN7cTGfWjWl2GxUYiwAjAjo5o4IReAHPzVJe7lq7ZdaBivQtFK9 RcQQ== 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=8x8NV3vKCH5acmfgm6iyCsOgI+rOqDu8wV4z7vxG0mk=; b=AAI2N0MdKpsYL9d6z9jgJXFeiqx1rd7DNOgT9LXngVYOo8MwzmJ7KZjtYZvgggyojG pAi0USySrOzDSChevCVUSQBrEmP3CNw6/uOZycHipwLuI1FKCVJxrKDQKoqe5wxYzSQE xh0RVufww/JpZBsqy0+dkFo3nLOoNqGT5oxsURMJjDiDFqw24xNN5bI+9hnu8YB7dRsW P8RjhZhNyOEq/zwgkBgkMHUFXjn8fX4pqhNA8HZvw+YdaJk0iGO3eJXhVfA2EjVIF9ZR 9zSCYvUnIWqlX6v2lgAeGAvbhHZs8i5oC3DLTMYy4WYKSl4Gigd+BQ3cyOVR2K80Jbtx ioNg== X-Gm-Message-State: APjAAAX/rXBYpfUm5N2JOTffj616q2l6GuDOkH+TvpDEWYfn6PiGXe+w 9EvI21vJC53G3FvLh71CxQfrEA== X-Received: by 2002:adf:ef49:: with SMTP id c9mr6337951wrp.122.1568106017354; Tue, 10 Sep 2019 02:00:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n1sm21300986wrg.67.2019.09.10.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2904B1FFA3; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:21 +0100 Message-Id: <20190910084349.28817-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 17/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:22 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: 173448 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5503622ilq; Tue, 10 Sep 2019 01:49:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzrwXrvdffSfWrg2w17XZAoREox6Hkytf8U5mGVdOQKp1DGa6/DS4M6Ok0TBQYr2vCjS3gv X-Received: by 2002:aa7:ccc3:: with SMTP id y3mr27638689edt.1.1568105370114; Tue, 10 Sep 2019 01:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105370; cv=none; d=google.com; s=arc-20160816; b=VgLZJLlcTHcyEghGQMe7SgkI/9GZlXCYtgOJaqsDkb5vFH78/QE//Z69UF5NwjKoWL 7fKb1hWAayEEOYWeGRbid3PqbI3eMbMMbEsYzqSy9L6SlciRgNwL4j5qoCzw5S5rbOrf 7v0dJbghe2L/jpbf11OHlfDE5yZ6STCKD3FvnIpL7j7ox8Yo57l6ixxzF+/k0Mh9Dv1u wcho4JRLxxEzCM6SfeEgIy3wCAajoa2EFFu7QsfMyQj4kFgqcpcOpFddB7j3fUtvKjd/ 6j2o7pr/tXbmqj0mY7sDmNzWFBIlQueSCF53OY6SM7qSOxPpgfsxkdI6+RZwtPbIg5Ry 7Dcw== 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=fTRJKF1ILnRPS8xA0leIPjRzRY9B1niETk5vMsQ06xw=; b=mNEIdBzQGWEuutGNueCohjIVD8scVtjRgRnskCxuaA+IrQy0OS8pnSpaXRg9vAgGGZ vNIGAT2JFDcwY11REE0FqDiuIEkaBLP97dR+B6xCKkEL3g2JW2S3XNGA/TTHPidNtMb8 XMGfXIsoW+r0P53/OZC1VwRs40GfQ+wUkUTYISnCUas2PDTLE0e8CKrToxIPi03Jl+AN F2SsWzL6+gOLB3jfLM6Ps65S8ke3xnxY0zdUEL8lwP9pmW++YTrWXYnTFqR3DPUtRY79 wVcNpnSUp+25LEdVQEzMtZISIOMySPN/oimT5el5qMqIYsIQwJmNCCAzNvNGWMUn81pY PCeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AvRfI7qd; 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 d29si10808283edb.203.2019.09.10.01.49.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:49:30 -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=AvRfI7qd; 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]:35692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bq4-0007qm-86 for patch@linaro.org; Tue, 10 Sep 2019 04:49:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35890) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bko-0003RY-RI for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkn-0006NZ-NA for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:02 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkn-0006Ml-Fq for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:01 -0400 Received: by mail-wr1-x431.google.com with SMTP id q17so13656740wrx.10 for ; Tue, 10 Sep 2019 01:44:01 -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=fTRJKF1ILnRPS8xA0leIPjRzRY9B1niETk5vMsQ06xw=; b=AvRfI7qdZ/519v8vIB+rsHVFUD1BHo1Y6bEL/WrX9AD5+ExdRkquBS5R13V07vrd6b mb2B3pTx5Vl2Gty7Pv68aU/lAI38Ahg9m/e/s7BrqWVcR5Zw43sYjXgpvqB/oFGuJKen KT+ViCm6Ae4XAWie4fCFyP/OA/Y26w/l+CZ2FZ/HuMDfxjJ3LY5CDfHm2f9Ng1UFJP29 b2vX6sNCV3Aw00rNvdiUddfDSrB+jZ/qqVSBJjucL3oT9VwsugBYW+Mkb3BuR66kJLMv Ass/ZptV4w3LvMS1QRa3NSshHJ+SPex+jH0mFBuJOSDPhLpABYI7EtfQWo8lR4vl2HwA DPgQ== 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=fTRJKF1ILnRPS8xA0leIPjRzRY9B1niETk5vMsQ06xw=; b=b7pA2et+S8SNts6nokYPLKuD+DrvxlTadZ9n9VktyVSOhX8t5DYa3Pb61jPkXhDcvP Mdn1WI2HcrX8IqNVJKmR1H4EJfRnimK9E2aKSGeUvZa0BCAK5VhRJd239uYTv99A8Awm 73Ij1MBnlYFmJ9FwltwUcHhz1YXSmIHRZzyhj1IdsJsuP8QJ2HZQc+nSmcZx1blRZY4d lOO6D26QVBOhq54oR0cZ0iE9HM79d09wqYtRPRIt/tyVqPXcFh/ulTgP0UFleqUdKC2w gelpEeeafyPINAm294PkrUklgCb7n9UKfm29q6YIwEKceIkoClP2na31J2ABePpVRBgA Y29Q== X-Gm-Message-State: APjAAAWDLFhTPsd2uwiGBIvVB00hXH14tt+9/kkpweAgVoZ/+tFDcXSH 5N9gj6isbgQ0DH1ghL9+AN3Sa3iOOlQ= X-Received: by 2002:adf:cf0e:: with SMTP id o14mr4929327wrj.277.1568105040476; Tue, 10 Sep 2019 01:44:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h2sm25552700wrb.31.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3F3891FFA5; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:22 +0100 Message-Id: <20190910084349.28817-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 18/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:23 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: 173455 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5509596ilq; Tue, 10 Sep 2019 01:56:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6S2Pfxn8x4IVfL1a02iL5/WcXtA7UFEh8lwppvzYc2Q1SOJMqDib4fjfFzO7RG5AJQLn2 X-Received: by 2002:aa7:d456:: with SMTP id q22mr21174163edr.262.1568105816838; Tue, 10 Sep 2019 01:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105816; cv=none; d=google.com; s=arc-20160816; b=ZLFhMcsiNQJxd5VuUJDe/tNxtBQSaXsYh0dCf3CaYPlTn28lP8Oh+wgHUQGWmd9Ovl Xe/9gMOg9PsYUs1zIwnsww/No2lvjLvD2n6Mg94WCB2QP6hw/R3RQP9EEr/EbryfdpGe GyEgCf7Nzf2A5jXhDGLMCp9HMFZFueogUox0i8NDlyyUb6u9EA+MI++rpIG9VPwgetEr 3+vPm2Owexy+UzDZX0uKb72NKn3C/TOpS4i9Bex0cHlxZfJhQ3bxcsnF7xWDscluxexy QvWqomSU8brTpXC8RSfSwVEY5IhPOb4hucoCax9pbyVxqu+tTwDVL7vQxoIK+HK8gGLf jFtw== 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=mj0FEYDHS4vof3dkSOxUfn9pkgNUQ8rYr9j9H50hm2U=; b=UZ1LEYAoTR3QefRryf2i9DIYD/wSug9SSN/Me8e2N3RUGlbLHf8JSbccYauhI9KS5U fZAh5lC9pCkr3EKwFSMwJFRFX6q3SWfbntry8DSY1VCIKIVB1sfZ0kPfxkSRlv17H9DW LyLupJtBSmaw+a1kXnc+jdWuvaXOV6+No2pRKYExhYfojk3c3J6+4kp8YfxaDyauuomh mD0qjIlbU9qgVWCGXPD198CEviqf5q6vJKKLFORJDSOpFTCAfRNRoX5j7G+X4C0+akAJ MTzd+LLJ3Jy2VjRV34zV3V4OYaX9DjvNHJ2SbLu4xpU60ybUuZroj4v/HiJqYWL4ro8g oK1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sWKn4YL+; 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 i10si6742293ejc.83.2019.09.10.01.56.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:56:56 -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=sWKn4YL+; 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]:35906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bxH-0008Lh-6m for patch@linaro.org; Tue, 10 Sep 2019 04:56:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqq-0000gE-CF for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqp-0000ZH-9K for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:36476) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqp-0000YU-2v for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:15 -0400 Received: by mail-wr1-x42f.google.com with SMTP id y19so18419610wrd.3 for ; Tue, 10 Sep 2019 01:50:15 -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=mj0FEYDHS4vof3dkSOxUfn9pkgNUQ8rYr9j9H50hm2U=; b=sWKn4YL+ApBkzzIuaBgtmcJdQABNOCVAQsezyLzOlgqpRuVw5AiLTC5jzCefTu6XUN cbCtdmhBjbtUhwg4shPxL5rCFDcSwoTy+bf6y3RibWR14zSqL1720T0nHMRihcP/rB2T x41Ji7EbzKM2CFuC1uLw8/P2DRZDzhgl29iORKwYsi0O3nrN0t43KAuFJd+WwMI7/H4K 8/ExAUapBdlGcy9zhJxqQOCaRpnrPsKtgS2y+s8I+hJvrFkkhlz/PJN2ZlUMcMaXXj1V wo1eR8lfeZAMgzGL0GTFOKkU3jU0LoiZbGckzjBXINDHd+klXfaumVuRJaPeYP2OWzRC JT1g== 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=mj0FEYDHS4vof3dkSOxUfn9pkgNUQ8rYr9j9H50hm2U=; b=PuueJAvPD3HxXr6c0ea9BCeCOHx7Qm7GUo/RNkPEPe94mmh/AVFIt/vyyFBy/If91T h4XBNEgfKQb32YbS0w4AjdxlN9y6R39mKO0cKjCoWrpIP9oyQm3Zl/V1kUCMzigvWF48 d53NwDSahfBg8/bhA2SDUcTGPDa1HqZxMvC+iwQ64P9HU1THZ9KOpNdu+g5Lk35uCPC5 5jM3H2Y8tlluPVvhWFpR80Pj58pxRyJrk6iQQbubuPgfUNvW+MoqJuFHwSuV8wVmSH9I HMmx81KX5zxKipYoCQRBN5kqFLpY4DtrzZ6QFLm0z2+ki3aRjjEvdOo08+BeTVSM9f2X ylQQ== X-Gm-Message-State: APjAAAXdRv9eKZqo/CUPPN5NyberviVkhu4kNUt1rF2Q8A05sUW/1/Zu 3sz8MQHRNBmUEstFsJOJKfKyZljEpX8= X-Received: by 2002:adf:e488:: with SMTP id i8mr23744547wrm.20.1568105414047; Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 17sm8776070wrl.15.2019.09.10.01.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 576FC1FFA6; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:23 +0100 Message-Id: <20190910084349.28817-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42f Subject: [Qemu-devel] [PULL 19/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:24 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: 173475 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5526777ilq; Tue, 10 Sep 2019 02:14:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxxDu8HWR2y9LECLlWQMrE1tepCgJm5XYgim2cEa2UFFyZPpH4eQ6mcEazkKeBolwKUWN/j X-Received: by 2002:a17:906:25d7:: with SMTP id n23mr18240352ejb.269.1568106856424; Tue, 10 Sep 2019 02:14:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106856; cv=none; d=google.com; s=arc-20160816; b=D8zOl9PG3W+cR7YMo384gcMVEkfd404WC+XSN7qu8g62pbEERs2xxIppED5iX3XYPT j4VaH/1qcm7JcOYtpUymV+sW04r0IsaRqHWWj+acBUoAdoaeYN8EOQ+LbME2BUwHJJGv 6/JqtwqcwG3g29jVYPT+sTLI5JBuUzrz0+9wzE9IA/3lwZVV3O6o/CwBV3HN6/4JrBYW ly7wDxOQSkrJDBgxbNNtc+hROOCee3Ab5uZU+VIDAVLGgcCFxqkoe6xPCmRa5dNbuDGe 0fSo9YJBNN5FTPGqDExFW6O6WhwkUCTYtH/hJXLw5dlJ0y9cYAaie+qb8MCXIXQVphuf ACVQ== 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=7YP0ftcr2FXQMfJCJokh8qETOMycMBIgpMRzzjrBHa8=; b=Qw4+oVtioZG9KYOZz/IOG6aMh91FElQ61f50F0ykGEMcwtOXhOs5bS6d9I1eS1ymJx rTiPSKLdTNKnaCPPCgO8ImoRzhR/01Jv0gCRT/4TTHovVUndDEE/JyDYRBX8ebrlevXD TnaAdFs0liQhC1DfKPb6wce2wlGdn/BVx0shRO8xlrRrx4yDndhyUNIoDRfSEcri0k5u sXPiUZqWsNmO+OKo5m5M8sy8P9JBlywG2Zkp0R1mN2Da1sh5kYVG/36lKWQ9iV/3uGok dZk45/sAWItj2LlLubka6xbTClhm6CbOOxLCt8E978/3TbiQ/BNLdFWSas6wMpEO7Bj0 YuoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SdYcgGAl; 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 z22si740813edr.446.2019.09.10.02.14.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:14:16 -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=SdYcgGAl; 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]:36268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cE2-0002Ve-RU for patch@linaro.org; Tue, 10 Sep 2019 05:14:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37209) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqs-0000id-2x for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqq-0000aI-VM for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:17 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqq-0000Zq-Ov for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id i1so17824193wro.4 for ; Tue, 10 Sep 2019 01:50: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=7YP0ftcr2FXQMfJCJokh8qETOMycMBIgpMRzzjrBHa8=; b=SdYcgGAlDAUfWySmmBRMQ8zKSlz1Et8GLZpxhkxt94ntclGNGDgo+REt+KAVjlJ8Ym OckDW9vwwGRfVscd0W5jGDJR4G0ysH4bUocxVUwp/9ldQerTDk4COTo0urucOPgHWw1I juexghakBQTwEkshy2s6DsSezYHoNcUVqQDqiHKRyeq6ClkjvSEDEmNFRkx1Idi7QYjE uf/Tr5wnzl1w+H1vjXHPdbufOWLWR8gpPRGhQiXooyFle51ZN2CO3yLl30V0ftvvpZGf SUOKbVGZk2ECkLBmMrXLku4O9m5VI0SKQAIXHl6gHjru2P86M4gZ3pgkncCPM2Gy3zk1 Pu1Q== 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=7YP0ftcr2FXQMfJCJokh8qETOMycMBIgpMRzzjrBHa8=; b=byXvEyla4Z5gXPt/2YfWIbV9Rrgay0cFvfyoCuxERrYuVpPJdPhk6Dvru30su7HQPi 1O1RldAg1EvIRIuc1L1jGrL0ncPnU8MKhso7QXHnoOCOrZJ2qfik9LfqxD6piFo3TiyI fnxKV0AJYmFs09/FugF9uvBdABi5QQTTx5I/jlewD0gA645vp01fpCPbMR7wl0z3dp7e 4ndrcGaH1uyE0SzvisEVbF5ryqbj7hfeVEhDlO1IlaZVezSIjP1VIw956yOqSOogHZ/C rmFTilFIdpz4Gk/kHO/TRSXEIuYoBoi12t72Ze7OYl/Fz1thtaTNNz7vwZXDtNEuxPFE s51g== X-Gm-Message-State: APjAAAVrh86KpKBSM7Yp1VxKGpXZnKx/+FXmXUGZ4sRSuwfhMbdy094s BSuiLpfPL5hISs+OoVgbjlFXvw== X-Received: by 2002:a5d:6ac8:: with SMTP id u8mr24670009wrw.104.1568105415725; Tue, 10 Sep 2019 01:50:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s3sm1679008wmj.48.2019.09.10.01.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D9FA1FFA9; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:24 +0100 Message-Id: <20190910084349.28817-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 20/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:25 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: 173464 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5517662ilq; Tue, 10 Sep 2019 02:05:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDKf7cp8zIzLUJCuotCi8rHXXrk/nNj0Dl4ZAZ8Rq0OzeecGSjGq7TLSh0kh+xSZLU2X8t X-Received: by 2002:a05:620a:794:: with SMTP id 20mr27535613qka.320.1568106303875; Tue, 10 Sep 2019 02:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106303; cv=none; d=google.com; s=arc-20160816; b=CX70KV8NHwQU5VGOuPoaMEUfFRGLwtkhrhQau2XuClASND1LOYvGrQxvnH5mLkuGSz /DeUip6wKYOk7aZ6Ruds6TH2IetRbHlEbHZNrZ6u5++IPQt+kbq6CVtwefvwFWef6mvn eItnTBuphHrlsLEH8PvB1fKl0+5Lm52xKqYr/WF9IJX5JheJIqW9VKafQPgruYGfkBHp rCQfV0sEjXZjvmZ2+a7l2R847zXb6bL3MKQmkPIn/3zasRV+QoEoG3HLQO2qHrhWzle+ m47kFrxltdx0bnvmZgSGuGuNCFc13EobHZCVU2zjtyrEXLD6tvnmsricSb+NShcX1+Mj 3FWQ== 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=oT+YrOkp3Z24zW1uGAxyIpgJg7/bVGfM+TeagJEdgqI=; b=EkuJmgFJKGBMaXo1DGcD20bfFJZS/LzfWJR5Epw/zWMSXCz4Q5VQMH3wUHULv5dAbi 0524Ua/LLQR1+SdFJzmTjNKQTkH2285+tiuFeEhGYQqWbNrpGr7Yx1Z/gQ6wzRLDoHsh OF6qOWsjxBmqKtwuQ/v7FWEcFGsYZ5+r9YMP6AQLvTytwq9OVA4tSDwpaTlKile57Mjs 8PCmEuuU3pgQNT0hbL1loXgLVf19t5o4SyVpkc1du1aJzEN5L4CX4GE/FugKdkx1axtp +/BeDDyBaSG8ZiCjw9GyBkbd5pIerr0m9zTQTiAjKSdFbp0BLDchH9Jbo6t/RWWHufH2 BmtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LwlDqjpP; 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 j68si12629985qkc.379.2019.09.10.02.05.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:05: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=LwlDqjpP; 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]:36108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c59-0008OW-01 for patch@linaro.org; Tue, 10 Sep 2019 05:05:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35967) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bks-0003Wd-Jr for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkr-0006QF-DE for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:06 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkr-0006Pm-7O for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:05 -0400 Received: by mail-wr1-x436.google.com with SMTP id a11so8603084wrx.1 for ; Tue, 10 Sep 2019 01:44:05 -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=oT+YrOkp3Z24zW1uGAxyIpgJg7/bVGfM+TeagJEdgqI=; b=LwlDqjpPhOBn3EkV+fdG7/LaIKNB4HGNdRD/IrYtAibyKWmHmiwioJTEwPkenYhegF EGMek+rmGIlBzTg+/e/P5g0ZogBJgTi5vTzVwUMHmySJ3LARpKLYMM7szz7z+vbh1VN9 HsOUR3BaItEzg9v3ByH7WhHLI+W2VGTzr5f2vSdnSJ9aGUusxddFS10BFWJhJS0wyixT S4jvJVgctUoF4T38b3bZ5fTY1g8FG1In5C9B7VtZogL3jrCuieO9678wX1spBWnAVZk5 aampqKj6Xzmz+qx7313ICOzlqDsRuh/qKvyTLLbIMHojN/8REXCOFhBSIWJfGx4yHIgQ tjBA== 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=oT+YrOkp3Z24zW1uGAxyIpgJg7/bVGfM+TeagJEdgqI=; b=lQX8ICRfSqRKRf1DuZYTrM4O0tQKPzwt5mMSgcuVsrstoHyyP68789BRrttAiOCY7j wH4mUbG9EDaSx3fvSbrspLcJ2enRfUsAI4R4lFDLCS16emmKqxZA5mG/YWr4vAWgaTv8 7mEg7B633BXeysoHlUBFk3V8IYDoEWGxlUEALVcAA1e2x3pcmRxRAx5WzTYc68grLs1g flBdMsy4lBHW1UduWHRv+UHlFsDCrHFxGBqBHA+I8a5Mg/48bUX4POM+2lDTBoy7IVpd 07fuNwg8ng7XilIxy8JAKWIUqH8+pFcv8v22PO0AlvK/zW8CV/14O8WKztRido5EmF/2 /HJA== X-Gm-Message-State: APjAAAXUGKC5le9gbIQKY34p1uSMNjln6MnonktKw21jGfZ25Tr4C+oM 5c4Z/HlZPb/0h+jGsNWCR4WoSA== X-Received: by 2002:adf:e44c:: with SMTP id t12mr23101031wrm.251.1568105044144; Tue, 10 Sep 2019 01:44:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h5sm12832294wrr.10.2019.09.10.01.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:44:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8457D1FF87; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:25 +0100 Message-Id: <20190910084349.28817-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::436 Subject: [Qemu-devel] [PULL 21/45] 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 Zheng , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno 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 Reviewed-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:26 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: 173467 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5520694ilq; Tue, 10 Sep 2019 02:08:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyu98lO0vbi/PTkL9QR1r1z1LQS42Xj+T36RgodSPZk9qAiZqGy+BtsQfw7chIX55dYjYkG X-Received: by 2002:a37:a696:: with SMTP id p144mr28836901qke.435.1568106480091; Tue, 10 Sep 2019 02:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106480; cv=none; d=google.com; s=arc-20160816; b=A+mDw9FNeCdej/qcZnnFUehxdY7BlMiF9qSvy0enAcxrrKGimhxeKdTXw0Q23do+4P BF0uC0zDkZffFEZcFULZEKH+Pw6TjUR7/nrHdhJzPNLjWMr3EXPGlE/O3ilp8qEGTUVp SJADBWsba/0lHVJ0QOO8D9y12ricVOfNNSuI7XYPM7iLVoYrPR6ScHRxmxJFgb8ctgE9 WyZj/Mx3UXKqAE8gIXuq+9Uu/SuQe8LgE4xXwPIlQXqPf/RBukw+vQLpUfuMyWSTnw2d P1tHOf6DLzb3QloNN4p0fw4DIt9Gl7K5QH2iQ+Ai5DNDJ+AqDWWsnqzPNJVaqemKHjeR Jjrg== 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=wIHRhiiS+MkSK/ZUnrDx5gR8gQD5vefos0xkr3Kmw7Q=; b=wCV+HlucOyqovf90cP7TQ8ET5KiCVCnmYQq0/lNZ7aMzaycdD7FcbjALPOJcdJcQNh eb6/kyM0gZ+bAql3Jl4Jd2s3CRINpkYWuXVdFmppzBw1s4qj8/Vw0fCdrNXau0fm4a6n ek1TonSC2CZaELJGj+lWXd894uz0b3hpQdRA/yS/IuBSZqZ0aIpuyiCrYU25e1J4VEZR xYbz371zziaZIrRITTTOu3UI2uiR/c1ZqjzVmu6ikQ/ct9t0CLM5pzAKWTH5HqA5+ixr Zjy5yqgHw+j3Uk+zbWJ/bzNJ65q42JCa7J8yyQsYTEwgSNC1GJV1qEZzLDFjp7ovvA91 AENQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c7B46hVZ; 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 a15si11861689qtc.329.2019.09.10.02.08.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:08:00 -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=c7B46hVZ; 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]:36164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c7z-0003ej-Dt for patch@linaro.org; Tue, 10 Sep 2019 05:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37157) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqp-0000eF-7G for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqn-0000Xt-TT for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:14 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqn-0000XE-Ll for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:13 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k6so6264185wrn.11 for ; Tue, 10 Sep 2019 01:50:13 -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=wIHRhiiS+MkSK/ZUnrDx5gR8gQD5vefos0xkr3Kmw7Q=; b=c7B46hVZmO7bsQ6hLgO60QTDqJBZ36sMm8YIcTXONr2pz626+px32tb7HpDcEVcwRO zRzN41uSVVpuqANLoeI3m/2GGBIdwoS8dSpwoRahMzMCZ4z+ipS5DkJVwOpR9AZf9Qxq /rlTjMkqU+Vq1YxLPr0oQkn1HG1Ek7djwdXXbhiUkQ6xXPdz/aQthVLR53oTAgTr0WJG S3whGo5Vqaq8Zq6O3hx8wNT/qqRAp3k3i5TKsDpvNltOvf7dMhc56NO63AgZDd3zka8b 9vpIYitPQhsxMA+v/gfQY0nYFbANqz3qFJHp/tv8uZMaZ5PMtxWpbVXWm47lpJFv26WC 5qKg== 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=wIHRhiiS+MkSK/ZUnrDx5gR8gQD5vefos0xkr3Kmw7Q=; b=Kn/QpLo4dqFzoWbCR3f1Ywht2SEQXASsf/vG1SPmt9KH17EhW0pZS29gsApyUmZmoU ANFZeEevqMJLd2OEw7KmlA+TZMPI/Z9QXP2c2z9eZXQ6BhbP86HCv6zp7hFHeP4nyaLK o1IcA0Edt5rfUvnVdKd2RNOPisxcdH5Nvo9RY2Rux+svgPF7uMiu84Yu2TzW0cnt/cAn zkcWbQZWKbVPn16J6d+cfK4q0/oBy/npEcfXM5f/cC7F5AnN3PGyR1RIpDP5varq1qNs Fu8SMv9WwTXxmiCB0RLrjEK73hgc3BARzeWHcgr5sy0nCPNKHAdBZJQEIexo6wQMfkb1 ElGw== X-Gm-Message-State: APjAAAVx2vVrqZ6uE8KphZG66poHkpMkMl8ohBamzaW5liLhiNIptt9p 3ZNkLFN9CpKWFb++5+3G700aiQ== X-Received: by 2002:a5d:4d81:: with SMTP id b1mr26267045wru.27.1568105412601; Tue, 10 Sep 2019 01:50:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a6sm8352694wrr.85.2019.09.10.01.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B7C41FFAA; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:26 +0100 Message-Id: <20190910084349.28817-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42c Subject: [Qemu-devel] [PULL 22/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:27 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: 173481 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5532361ilq; Tue, 10 Sep 2019 02:19:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdchDDMkpt3ihOhjweFDsl0kbAgcI+zADxV/q0vpn0Bh+jV0PxWf5zPXSd5s5GVTu70nkp X-Received: by 2002:a37:85c7:: with SMTP id h190mr6682299qkd.233.1568107198990; Tue, 10 Sep 2019 02:19:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107198; cv=none; d=google.com; s=arc-20160816; b=orh6kdCSvvQMJfnsLCo9T9TjG+TUQlXY5ZBGwi7k94tdUhBTwSXf25HnHwRaoGzL/y Ou/k8bWVpOJXBO2mnanUHQTby6XFRv31AOJPAh63p9S1ZCrZJ0bxz11Bu6eQ5sBoOSYD T0rx7NwEWtw3PYJCqJsQIctSA3Y9bw5pRF0T9KKDhVVyEEFMEc0loK8Z5Y3zfDuvpCyo gIzz8O6eXsWsqkf8BVhfr5+mc+tmPn7YjIiiQRPGaYzsiSAzwJH9PZVysuir3EEMExbt becCyv5FgHjeHCg0kFWGT8hF68t4ynbDN7n98g/U3RmL/39ZV8xb0VMLEyat+8dpaTlw GDgg== 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=w3KXGO2QeFTAyb9q+f2s5ge/6Z1X5aYnAHJ4MqwDXEo=; b=X6Qll/N1QjC0mo/EbiPu0cqqNSLXjvBHpb0hdcUg9Vkgs8/FuYZzA2HZwx/rOkPFNh uILUfEMbowQTYlwHDRGB7CIgpZvXoXRtCe0We0yQ6lUeLZa6Fy1dPn7pdpSwsI5rqsgu CCZCbqhSUzrbX5VQZSugndjQD5pzLX4wt7JOLANsJFwc7fGeHm7yOMgq0v90FrlTyQI9 WY3sB7QKtZCjaD9X5mWtiusYho2XysS9QVzaalV3SO6/A3aZHkCk6nriG20pafzgbQnF P1xOqQRtwJhUkGu/Y8aXILo9EO8OwT3pHc0jZrlUUOQdPsLUWOfM2BM+2JXx1Puu0EXl Gw1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rBji0cc3; 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 56si9329839qvt.110.2019.09.10.02.19.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:19:58 -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=rBji0cc3; 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]:36372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cJa-0001bU-17 for patch@linaro.org; Tue, 10 Sep 2019 05:19:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37346) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqz-0000sJ-Ef for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqy-0000fO-5d for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:46791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqx-0000f4-Vm for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:24 -0400 Received: by mail-wr1-x436.google.com with SMTP id d17so5663032wrq.13 for ; Tue, 10 Sep 2019 01:50: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=w3KXGO2QeFTAyb9q+f2s5ge/6Z1X5aYnAHJ4MqwDXEo=; b=rBji0cc3Cj4PdcMNYzXOjIyBxlezkbnW5VU5rLC0i4PfUk1kWGC1j3AZwEmYIk7+oU e9OqDM5QK080m2oqv2thBlCW6kJrGnPa3bFbCsjDKJs7gvlYWcnd52jgcyO7nAeW/PUg 6HUM85QSBpkBVarMCGldl+P/QBAM/i2l30HVSzxnKOU5hFEi/ZifeBygM+BHMkxTO7YA BQCX4oBfPgoZdfY3sCHTC2dC94p5fVOLhA6usKsJCnjVBkdxw82jnHHkYSAXRCxZHoI3 FHLGYyaHMVGwgKyt69T/Ih9J+m0BEjKe0avNSdeddhQXValpkUdw4TSxiLSy7W1getIY lidg== 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=w3KXGO2QeFTAyb9q+f2s5ge/6Z1X5aYnAHJ4MqwDXEo=; b=cvJILtDQQ7wgb3YQMhgqT+QvWYnzs2NmJw/kzXpQwbB5RRF/moxk1vTaIgu4tzxwHb iOVhgCbJJJ49CZthzppfTS7KoGrlxtf3OPofd/J/eZR2+AnVm3h7Xt3X3AVh90233F6M SQBAQFaa6tNDLNiTmohMXnFLzXhJqN4wl3IENVldzafIhco5JAhCQ1wFUsaZyrS8BWfN /4g64QKzTIaC6WKXj2YIidh6YW8lohcD9J8H00MWqTbOaG/jpIOSDubKSyWbJqHgqvQl 47GMXk5zTguMahpVK7mBN8H2FO06j71Fbsav+ai0AxMj9vjLTAeaWQ/N+rt75leyUxFw Q4lQ== X-Gm-Message-State: APjAAAWG3IBFioJUmftmEiR8EWSQb1tgpSRinMZIMxePnmQBpuu5Y1X/ S5Va9q5EEpoNAfLQ92Z2ME43W2kTqPo= X-Received: by 2002:a5d:6604:: with SMTP id n4mr24447999wru.267.1568105422932; Tue, 10 Sep 2019 01:50:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n12sm1819993wmk.41.2019.09.10.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B31671FFAB; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:27 +0100 Message-Id: <20190910084349.28817-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::436 Subject: [Qemu-devel] [PULL 23/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:28 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: 173480 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5531897ilq; Tue, 10 Sep 2019 02:19:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVghd7mtV5XEO66t6rVitIbGCe2rItOZ5sY+YGZZQWNLh19Mjc37X3VQMvjg27qba/jsc5 X-Received: by 2002:a37:a182:: with SMTP id k124mr28260369qke.354.1568107169552; Tue, 10 Sep 2019 02:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107169; cv=none; d=google.com; s=arc-20160816; b=qP1IwG9zswNqrbQEb4bFIXj9fqPzmvn4H9Gog3GRhaGgz6vrJM1CaSRvwtRVRgAHgJ EhnObMXwXx7Iduee6iAl6XMOygy8ZoQ+rp4jIH/asaWIg523OKww3+wTMhT5vXrLZMmb gSJ5M8rJALvc/1+aKnWEi82KJIGs5aO/MjWmDI8Q17OhTDMdo9VbV6hI00eBcDX6Z22E 3f8elRpU/l9TH7X/vajQNxRX+NKrvq43YdmG1B7d+IHBpbJx2ATzqqD7CYPzIuCSUVdi nJopAGdyP9DNcG5CKrrrdIvnzYjc4kg91qCjLxgMbg+geK6Q0gH8bkPoJuRqOecPiv5x vvfg== 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=2geBL/UXKOMwRi8vueKTObH+zcw3y51W+as/Irfueho=; b=kgz6zB4pyZn7tLZVO3iZiCllwYrRpsbUh6wiVuT5JCcmoE2QUNuwvfFZksavfBm2rU 46fmlXEVlmgKTwjh8WdSHOy5BqvXv7VuZ+L6vu162qqGIo0oNUxSoxGosOlIIzhWC0Xh ycwsd9U7emSNhr4X7r/qYN+X0GbPv0hqi6I/YiqZmcea0D0oqNFR8lGMa+idV8AoSEUe lI3sT6LKfgZ21i6QjsrRqKrOpZXpuaaUgQhYerHpGuoAWzIfyJ1q2C74CXHoGS5VOf5A ADsCw5t7r6dgU+WlNdOk1YiB2AVDM+Hh35rAGMMrFFGX4PIFEpBFQXSQrfmdU8vfXYe9 wBxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ugs4fYGn; 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 x1si11254872qkh.8.2019.09.10.02.19.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:19: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=ugs4fYGn; 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]:36378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cJ6-0001ub-KN for patch@linaro.org; Tue, 10 Sep 2019 05:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38890) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0V-0004VU-0d for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0T-0004kV-IX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:14 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42093) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0T-0004jq-Bk for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:13 -0400 Received: by mail-wr1-x42c.google.com with SMTP id q14so18455864wrm.9 for ; Tue, 10 Sep 2019 02:00:13 -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=2geBL/UXKOMwRi8vueKTObH+zcw3y51W+as/Irfueho=; b=ugs4fYGn1Xv16wxc8e40D6D++lgn+xk3+r/yCMP1Rh1s/VcMWViVsV4gtPMrKVDwy5 8o/V7tvzIopc6FMLJRJZIhcXGKu0XXngZJ3Mv6hfQvzOOADF0O0wZikQekOM+vPlDVJn 6zYxyZkuiC7gOQuyGd7iixJMOguYvM93ln9yi2irPoe7cTYhY1Fmbae/wEFVxufD6HVk 5zVLXznPZJukA42i44rQ40B8rkWS3g2sqcUc0udcUKVODLk5231oO0VYoALFfWj+SJlI LzvBNG/Mpz1JMpmHY4kXBgC/f4RuH6UZTz5kVs4v35X9kPdE4z871PpN/Cbw7coLobVQ vxtg== 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=2geBL/UXKOMwRi8vueKTObH+zcw3y51W+as/Irfueho=; b=t7uw3uSTEUMX815rQ+mzZ38DfdYeSUJBP5gBEC/3AlGMK7yt3ER0B1BNdmcukqTc2Z JwsJp99W9KfGCH8WKiANu8nUmy4LuZ9I/LhFMrSNJKNCVzhZ1+1+YnCP98a0e579fgPu fVQDvG1Gc4aISxqlxtzWSQH5gDcgStsAajodE3QIariN62h0yZ49VusiwP6GOpmjz+CQ qQltniSrv5ShB09PLIDGFuf44o3uqmEmcTIho1UkUpNXu7AfqtuRfEDoOJ04xSfbWx/i eWB2JWmOD1yrisV/QE9giv5ntjp5nFPwOT9sH2mZkx+JyRRqTT4FILYsUu5guaoZR4z4 phpQ== X-Gm-Message-State: APjAAAUmZKfcpZ783YNAIBQKiV/W2q3eKXX3rHXEPqFoh0L4kDpgAcDq 18kPLQzDFD0H8gzgqlkH5Nz+3g== X-Received: by 2002:adf:f846:: with SMTP id d6mr25207441wrq.67.1568106012313; Tue, 10 Sep 2019 02:00:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 7sm1757710wmo.29.2019.09.10.02.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CAB391FFAC; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:28 +0100 Message-Id: <20190910084349.28817-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42c Subject: [Qemu-devel] [PULL 24/45] tests/docker: update 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While we are not currently using it we might as well keep the image for later usage. So: - update to a more recent snapshot - clean up verbiage in commentary - remove duplicate shell from a merge failure Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker index 513459ca7f8..2a1bcc33b24 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -1,25 +1,19 @@ # # 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. +# Currently we can build all our guests with cross-compilers in the +# latest Debian release (Buster). However new compilers will first +# arrive in Sid. However Sid is a rolling distro which may be broken +# at any particular time. To try and mitigate this we use Debian's +# snapshot archive which provides a "stable" view of what state Sid +# was in. # # This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20181011-slim +FROM debian:sid-20190812-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" + # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) +ENV DEBIAN_SNAPSHOT_DATE "20190820" 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 From patchwork Tue Sep 10 08:43:29 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: 173484 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5533476ilq; Tue, 10 Sep 2019 02:21:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcs43JigAS1oNnUUiveAgKbY+28+eAz4fKWcDKvyOfYji/Uw2Izei1cdrtanxtocN08i5w X-Received: by 2002:a05:620a:79a:: with SMTP id 26mr26949026qka.55.1568107266099; Tue, 10 Sep 2019 02:21:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107266; cv=none; d=google.com; s=arc-20160816; b=REbstrL9fr27B4Ilspo3HgqZZQfAaFIzSUxJLvNK0Jkcb7cW0s7CcWAmVr4lQEhpYR R0EH8ViB6JHBDJTeMqKd66P8dgFDUbKt9XcqbxYrOf7WCAL//iK/KO9opHVGYDLviibw umsmu0A4VmJbYCk2W8R163lZS7h+tlBW5XMCApvav0VYK5GUpOLgI485EH7hn4WYDv1z hA3cm4unG3LfzuUq9mIjtm2O0gdZUtdkMQLYhv5uGQ/EehAVQZhQoX+nnUqbsPGr0YNw zjgYFyu39Dv8e3VKDw+qL00PJAhrdAZIDZtYOYpySc/Ut62114dTxydQ62R7xHdLtNrS XC4A== 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=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=GPRu+TXlXEEe8vN/vH8Z0wc2dRRRQZIMCEqO6BlkLYQaRWR3CnBiTM7+e5S+6QkMTD 8Dm7K+i0zORUQnBFvc7GgeNzZImorxwT6fkN95G9vHvHL5TeC1I3fsQetggX2HzessxN 9LkTtCYQHzCbBH3KsEP6xDCQRbtI/qPrZU/eP3FDVPaC/rECMHFFaeFyph1caqqyiOQp vTsDnB0w28vTpOSUUYVlExrkJ/ui61gdtGlJ9GIyskjgq6FVQYkEqcXVqBIGNTJiFyq0 ZokkfmdscKxDMShARhXbGt7l4ZIBevRo9J0Nyp4SjOf5EMMdWmilk2q3FpvgekFRm5mN s15Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="O/wMD5+1"; 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 x5si11889648qtd.254.2019.09.10.02.21.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:21:06 -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="O/wMD5+1"; 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]:36394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cKf-0003GA-8z for patch@linaro.org; Tue, 10 Sep 2019 05:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38938) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0Y-0004YV-41 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0W-0004nQ-QJ for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:18 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0W-0004mn-Jf for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:16 -0400 Received: by mail-wr1-x443.google.com with SMTP id y19so18484841wrd.3 for ; Tue, 10 Sep 2019 02:00: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=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=O/wMD5+1WTXokZBdczfjwraApWBaEa0Fpf3LQbjqGZ9FozH7/pq6fVFC21vqcLJTgB 2pYfBmXFw3mrF5g085POAP5PfhQnqc4rsFsN5ogpF07wqPWR+BbIAYIMnKXSlcrWwtkx puUp3vpMZeZg8RZv20ZK8Oni0aX5PTU3Nd1TUCJJcrjL+5cv2F+lv7MO4j5VmSGI7Ott yX0k3Psw7zaCjfSrUyhYI4GikO6JuKMeBLVvDzrvPXHIPrEO2whwjL3v3yhd0tNmEfiN dPBQzmbZHrmAz85HZCOrtqFskRXbDfRmWI+At6CzlkE3F5Voui6jfiVc9bRM9YvHkyuL XMiQ== 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=PsQJeErI9+aTg6zkfqahDzJy6pOKWXrb4kmWb+mMXOE=; b=oeO6gOuE/ZVbgZHgnZUWLpgfc25Xab9jgmNYt3AX44Fu3q/VbSjinN5I/6hr9Fs2cG 4f2KACKd7a2F+OS097XkPhKymVe6p4uur+6FTrHzywrVW4psJRwY8W1NFfHzyzr2NLGu ZqrYUBP6qB8RgK0v8vXDSWfqhD7RX/QgTT1bhDdXO8UoueGZqD9Kj7ElP+1NcFMBtPZA fIh7ckxjQy+5hP847mAz/v0DBKsOB832bRpAUQMvh3z6/cU21IzwPRNBiMr8ldKCFmKC DBg7mIx7Ft6zX8NLN1kAE9Xdr3Rx3q759fnfHgAZl1wm9s0qHGdjF8iaD3GIn0+KIFkU xF3Q== X-Gm-Message-State: APjAAAV7kFIi7cOuZxEoRqKpzOtSBMIadbt0N2Dw5B7SXa00Lk7mwB1J rxtyHOZJzgfkFFCD0eNN/WfmMQ== X-Received: by 2002:adf:dbc6:: with SMTP id e6mr8557882wrj.149.1568106015296; Tue, 10 Sep 2019 02:00:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b16sm25660254wrh.5.2019.09.10.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E0CA61FFAE; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:29 +0100 Message-Id: <20190910084349.28817-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, 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. However we can use the snapshot archive to build the last working version. This now only lives on an example of setting up a user-cross image as at least on x86-64 we can use the Buster packaged cross compiler for building test images. Suggested-by: Philippe Mathieu-Daudé Cc: David Gibson Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b6c04059502..b06716ff71c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -71,7 +71,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(wildcard $(EXECUTABLE)), \ $(call quiet-command, \ DEB_ARCH=$(DEB_ARCH) \ - DEB_TYPE=$(DEB_TYPE) \ + DEB_TYPE=$(DEB_TYPE) \ + $(if $(DEB_URL),DEB_URL=$(DEB_URL),) \ $(DOCKER_SCRIPT) build qemu:debian-$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ @@ -130,6 +131,7 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross # 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: DEB_URL = http://snapshot.debian.org/archive/debian/20180615T211437Z 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 diff --git a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker index 6938a845ee2..83749b0abb8 100644 --- a/tests/docker/dockerfiles/debian-powerpc-user-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-user-cross.docker @@ -8,8 +8,14 @@ # debootstrapped qemu:debian-powerpc-user but doesn't need any extra # magic once it is setup. # +# It can be used to build old versions of QEMU, current versions need +# newer dependencies than Jessie provides. +# 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 + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu + +ENV QEMU_CONFIGURE_OPTS --disable-werror +ENV DEF_TARGET_LIST powerpc-softmmu,arm-linux-user,aarch64-linux-user From patchwork Tue Sep 10 08:43:30 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: 173472 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5524526ilq; Tue, 10 Sep 2019 02:11:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxC8mdR/R8Mc9aZchSXTByHfrKe/qSIsa95wvh8oeH+xbGjd2nWlvtzRemxr1ddlT1cyIAT X-Received: by 2002:a05:620a:1510:: with SMTP id i16mr27800933qkk.318.1568106705347; Tue, 10 Sep 2019 02:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106705; cv=none; d=google.com; s=arc-20160816; b=Am6j3+9QhvCmqGa/tXM98PofeoynKm2jGl2/npj6FpWFBRkM6Lifvq70qtM9BVB9Ve TTzmMsvA9I1RUeV6xLtBsZMp5u82CJm1wNYngo8msRFasq9uf2oyz8TAwX7Ryfrw9iCy DqOlfak/WTPtRy/WBdW0VbOPzYVTGm9b1+MPvFBcrF9n7yXJ3x9zzxg+PPTWk4NGyu4P KHZuT3ciUm31748r4LAeFn3PfYFMX2xbZTFUKrDiHLayIr5MUkdjpvD9MFkyFkw6XLae eBv/USReoN09GPLLPmh4SMl+CgEuzeUNFQkVSIz9cKG+qNLI8iOn/OeS887cIF/l0l7X 82aw== 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=N30EqGlP8UF0mNtNtom+iOG11VwbWKM+BfCDz04Jnc0=; b=OPNH4xPy8Mhm6YYSPHhf8Aql3gzwto8Lo4fm8CbegX1o/Sud8P6jQzRlTBU+0+YeN2 yQGNvigw+9DL1PnNyMjcBLnqmEDXX7deHnVUOMPIGzUNm2dB4Blf+gBvdd7Bhwcv4dJF 9s6kCzginsWkh19UAiyW33mTwjfe9IHug3zmt4475m+8fZtn/Uq9i5vWYHauezEHfUjT 1BZf+tTB33Lw1Q2Vmtf9l121UIxS9J/5ujqDpCuS6KpUWz9kRVygNwmVoMLLSGdgVodG dnLK9dtxL6/Uf6isb7zu6mshuBsSSzJ5zgIJA7WGBgeIBwcmvC1ilXujseCGJozBLEOi b24w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ZaFJJWY/"; 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 e12si13387124qvh.4.2019.09.10.02.11.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:11:45 -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="ZaFJJWY/"; 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]:36234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cBc-0000Q9-JY for patch@linaro.org; Tue, 10 Sep 2019 05:11:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqt-0000kw-Rq for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqs-0000bP-Pr for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqs-0000aq-Jx for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:18 -0400 Received: by mail-wr1-x435.google.com with SMTP id g7so18462519wrx.2 for ; Tue, 10 Sep 2019 01:50: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=N30EqGlP8UF0mNtNtom+iOG11VwbWKM+BfCDz04Jnc0=; b=ZaFJJWY/8Z5l4H453jANPvdy136Vgy993CMDtm5rPp4sUbpAXEwcjvLwbeyDlJmYaT QsOFsovl16qbflTl/Vxomd1B9KLm98W99Ic/OfOwn5R3E17KXVn6OxNbIAjwO103YQ68 nMjv8VDox26YY1MaYO5hrl84MY5SlG+9pwB7piW6MmsRAjb3SdQl7FHGEyvho/DE5uVj ljgJfJFwERYLvrSJiW7OtVJmjkfOMnEJiriuiCY+v0My+xGBvTzP3ozTwnVeqctpzbBK g9AFD2dGDVV8vztyZgvC8kH4ftatmFb5e2XhT/GNbLwzbQ/Z8HRqCZc+vKnJNxK9aB9o D78g== 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=N30EqGlP8UF0mNtNtom+iOG11VwbWKM+BfCDz04Jnc0=; b=JHrZcWCikqss0dYnAr0Lwi0Isylk24Cp1iXUJTbXAVx0ZwxoP9TjOwpWVhUoBgPpGS QVzfL/nQ1cz3kgMYLV/XyHUxLb8qR0UxgjOlvEOdOwDSZx5qgvQGtUCSvKSDWHMDYX/e 5ZL3BpY2GkCLxPJffemhsgo/i7sERP4MAJFzwOAEKJTNSCIqA6zALjd5O2Ae9ZAq98uf kbEhQ2NYSg09774hDBl48235+xS6KHlmj8YwRqG45NQWlL62iG2vqxnptGw9ULdO0SLh 97QKup/3KRAtWhvZsDTkLMegH5Dp2vyy/fFMbTbvyRdJCvzOyL+1o5lKQdLdoI2sWlcu X8iA== X-Gm-Message-State: APjAAAW6gVnEvEwG46eNh2uiECFTg1oFWRhfpOHhIb4vDFXLWLU0AlEA omP9TcQLDWBn70aNjtKrCFIBsA== X-Received: by 2002:a05:6000:128e:: with SMTP id f14mr5682763wrx.28.1568105417629; Tue, 10 Sep 2019 01:50:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t203sm3237145wmf.42.2019.09.10.01.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 003EA1FFAF; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:30 +0100 Message-Id: <20190910084349.28817-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::435 Subject: [Qemu-devel] [PULL 26/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b06716ff71c..c57b74903e6 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -116,10 +116,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 Tue Sep 10 08:43:31 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: 173468 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5521326ilq; Tue, 10 Sep 2019 02:08:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzAXc3a7kCCJYtHs8bFq/HoIGb8Z6R/UTM1eu4+JqyQHnC8Tjmh+gFGOFX4/7BUohzshuX5 X-Received: by 2002:a37:6005:: with SMTP id u5mr5819769qkb.79.1568106517432; Tue, 10 Sep 2019 02:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106517; cv=none; d=google.com; s=arc-20160816; b=mku0AePkwQn5Xcb0I8nQgKOzYSj+ApTibmmtDxrNZNt8eKsfkAhk370pku11neD07p tV1y34RkPfXbXElNyJQip3na9v90DXXF6FkPGPcEyk3lUx+bD3qcrKXIW+QNvX3sttCY s42omrZJvfFls36L4Hh93isL0w7WQrSbRkaHz2MYxZdkGhnauosBDwZKSkGNhE4wck7K g25pPsi4hC/VpxLkAYH5/gkqKurK9EK3ulfSVAh2MNp/dImWqceHql6hzLBegNs4eju4 sPXfoKJZNbPU6BgPoc7+PutEKtAPhubbGN97XXpzf1rItFH0WiVzHO4sckorA5u2oKA5 tH5A== 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=yN9jXo5+S+0huz8wikfbtwNsu0SkQHF6SIknbKMmpiE=; b=KWSHdf6to4JjE+z+d/bvHYgjFoWybdVLRmDrsf78T9DBhQ4KUlHj3m4jtljHACPv/n pvPmROO3+YA3zUHW765HUmLYBD/LzlG8qpR3oc5TbEmvz3MD07EJOMHVBRKfYv+U3YQe +GH8EdU9UKN0xAGS3L+WEbeQTpYqs8McQ87CgnNuDQvFLGopDSDe7W89oVwRoqFLmRBP ygkr0V2PKELp3Ydk6JdjX8CQgJSlUhxiXFFZef5MggssE016wXlwHvLBR+NK9yR+QNeO T4fF+azCCtksx619eZF+GThVeNhz3Y0DfV1fmvo7doFy5TAWyhsKqMoeYjcDV//72BV2 ZLqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wF5gXv6x; 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 o4si12376260qtm.261.2019.09.10.02.08.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:08:37 -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=wF5gXv6x; 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]:36174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c8a-0004QP-Fv for patch@linaro.org; Tue, 10 Sep 2019 05:08:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37224) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqs-0000jf-Py for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqr-0000ae-OL for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqr-0000aN-IM for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:17 -0400 Received: by mail-wr1-x436.google.com with SMTP id w13so18408648wru.7 for ; Tue, 10 Sep 2019 01:50:17 -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=yN9jXo5+S+0huz8wikfbtwNsu0SkQHF6SIknbKMmpiE=; b=wF5gXv6xZGwPnCYvv7mP2ljDORFRMgcH1z7Lj1YZF9YYq14j/D6lJxbF5HPPurXD5L zYAlK0BRhxFzJ3FwXX06aaLiEgxzIMoNlUhx7tUqAowth7sX3oAk6/OvaUo7qTpZ+aER 7jWVVcB/5edeZ7hR8toXMfwUP2PX/UEBg6A+rAJspf9J2DGIUTVThXsH8FdaDO0Rtnws HrqQ8sCynJtSfP2NTigW+qk4Ag+QBLuMp8Y7grNZVVDp7lSO7vtsrSnyNdUL9dqVyszX DlhJR4TDO1BPFlrNV+8de72P+fGRhjGUGODDuISo4S6y8dTOBz2vcxkgm6lvylKwjXAp BExw== 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=yN9jXo5+S+0huz8wikfbtwNsu0SkQHF6SIknbKMmpiE=; b=kcmz+yupIELGT2l88gHFsYolKLysh6NNwL4QySwYp7G/FnKVSSVtD/tIz6KWVz9jVS KLTbya23QUZCOfIZzrJLIDb4Htkt5mplQyD6rnwDByBdSh+nMyno96clWlud97vbSt8e aLtEzuwed7PMSRuL3YlqrcZhuxwd/A/79wP6jlKr6vNMNbSyWRkgm5iP33XkFKGQH9dc Ulp3NPW4Tt5Fr1wVOX9f7qwY+1w33R5sHrI3AyjFa7m7k4xj6SXFqo3cYNqozIK/sXd3 KZCnoH8slmxSle/RmtfAPlFT3KPw9Fldgh0yHUfntRD6ldvuwYtlYNlvkHKtYjEQc1pC 0DxA== X-Gm-Message-State: APjAAAUi5/6NAykzb2kSXiLu9dH8+IBE74X9EskLqTmKjEHpJq39Y4er uKVutyY5dY/mwudOIc4F5bkakg== X-Received: by 2002:a05:6000:142:: with SMTP id r2mr1130862wrx.212.1568105416514; Tue, 10 Sep 2019 01:50:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l1sm19638291wrb.1.2019.09.10.01.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 132531FFB1; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:31 +0100 Message-Id: <20190910084349.28817-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::436 Subject: [Qemu-devel] [PULL 27/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c57b74903e6..27a1cc0d833 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,8 @@ 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 debian-sid +DEBIAN_PARTIAL_IMAGES += debian8-mxe debian-9-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 Tue Sep 10 08:43:32 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: 173491 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5541155ilq; Tue, 10 Sep 2019 02:29:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhF7wt0BexZNUKNrsA2a/X+0taOtUvVhLbSeenvMTtdqxVdRrjEnnNM6bzvBBo9pP6SzTB X-Received: by 2002:a05:620a:79a:: with SMTP id 26mr26979356qka.55.1568107775734; Tue, 10 Sep 2019 02:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107775; cv=none; d=google.com; s=arc-20160816; b=pTDe5CNeg6mb6L31xBtsiZsvENCeCI9ZVAJo5dj7YuBHIhytC1kfx/StvsYqXsafI5 dMFRvLhK3jRc8H8TmFdSXpLpBCVRIOklC4lxlhdQosGe9iIXglGC8KzbSGLxucDwF5Cs b0tkG/J+8L4Oyq3JNU5ca11GBSmmHOlMPVpUwdIeKxG9q+qHbPKihi0tf/Z/CWoOMtfC DjrlhcEESU4gE99i6QHvkpq0ORV7E4u5+OGS8DAfQjtqVyAVbVBf0wwFKJqwjde5VkCh r453DFYM/72wbdGJvgiJefaEyTKKEZUf3DtZZ3BRJja6QDyYozgvUy5HWjqo0JuqhmOF xg/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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=OZfxqz45Mkawbkkm7WcOqTXH6BdZ3LupjF7X9JNa5AMat65vDccePkRPqkCVJ+iZ6F 4U5w0Z4sEzKxVfQxe6qoIY+DwOOkNQniRjJRr9FjjZ9LJ4nXugKRZkUzw65gICTvHVoA yT7UPtUFq3lUPwMMivOx2cV98/mj9sRmhaCT45pHCjHS2mO4wM9djcBFu4imKi52XZc4 cSpHdzKmSVxTF71SKESaz5Ye/BokanGJvjE9Xlg26WfrKXW/jVElCyvEh6gsOYzN0Qvs GFvWCXqMBzsdtRjQ72oPfshNfTbru5Ckj1X3345VI2fme72UDsG7XBi6gXT+IKfQN9mv seLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=p6xy5QM4; 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 t1si13066392qkf.2.2019.09.10.02.29.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:29:35 -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=p6xy5QM4; 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]:36590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cSs-0006w0-VC for patch@linaro.org; Tue, 10 Sep 2019 05:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38999) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0f-0004jm-EX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0a-0004qO-6g for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:25 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0a-0004pf-09 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d17so5727771wrq.13 for ; Tue, 10 Sep 2019 02:00: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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=p6xy5QM4x5udtOW8e/xx8zUTW6rOCAUz24/Ge+d8E9dfs2Viva8brC34jwNU2qMSsW m1cH2nmypxnOQFfA2sGSmVwcajkHGcWxk5ZpRHaWLxRZwjmy9XVL4OWpK0TqlHWUw09c Xu1Hi8WY6/6csnB/tFruKds0P5cR/+0e++V/GyK4k3A9XmDGTwyOiNDxEeMmrX/ZmssQ bTfb3JwWkmstJw8fa6zyjMKUDtH+WhtxUhOSWwCXwJfNcpvU6kvYee3u7+tgyLC56QkV bc8Adc5sYLFNlFWIsLGvq/PjSSwRqKTEb5NjbYluzSAWM48wdM3cGKd6vNgS3G+gMBPY ovXA== 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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=fiVDq/5mtxUXQzk0nXGzNadBaH1BdX1YB27fHYJZKoyF52Wm38j37VzOFh0NWkeVf/ +aManzB/8jEts5jPEJmydTtqZei52QiEG01uWigr/wQqoJUQkIlHsqva/zyAXkEl2rDl 5l3MtvpuodE9ZdFV+P/5h5AOv3Yknhq2lmUaSPPMIhGK0s6oj+0+g3wAjRzv5kO1f+9P Erd0syUTynX+czToitYvqxHwV71Zy7xMqETZbmLTG/2s7fWijz15uyDCgfOdZeFgmwFt ILCxZnq2Fhlh6O/OvBTdVGfGk8x+VjQQZT0GCt5ntTa3/CfJOsHzG1usFjyfGoCcqtUH aYwA== X-Gm-Message-State: APjAAAVjH60+MQmwjfxKWEo0P1hZz4z2f+EMACrIsLCovn63Fw02RrZC eUAJokLcFWILkSknwsrTQFJNSA== X-Received: by 2002:adf:e485:: with SMTP id i5mr24054802wrm.175.1568106018948; Tue, 10 Sep 2019 02:00:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t13sm30318640wra.70.2019.09.10.02.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28DEC1FF90; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:32 +0100 Message-Id: <20190910084349.28817-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42f Subject: [Qemu-devel] [PULL 28/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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. This fixes: $ make docker-test-build@IMAGE DEBUG=1 [...] + echo ' ./test-build' ./test-build + echo '* Hit Ctrl-D to continue, or type '\''exit 1'\'' to abort' * Hit Ctrl-D to continue, or type 'exit 1' to abort + echo + /bin/sh --noprofile --norc /bin/sh: 0: Illegal option -- Fixes: 2b0c4fa13f3 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43: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: 173483 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5533364ilq; Tue, 10 Sep 2019 02:20:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJk2RtpXNkmTVhyNdDNxaZp7bj+EMjM+3SLSu/guROlhryGelo6z4oUAN45N99kQcPKJ3j X-Received: by 2002:a05:6214:1369:: with SMTP id c9mr17744059qvw.3.1568107259203; Tue, 10 Sep 2019 02:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107259; cv=none; d=google.com; s=arc-20160816; b=n74Ir1NdjA3Y/FefZ4Qk67D4nsqCsni88OpknoaXh0/VHFNFmLmuymzChMdUFj8Ct5 kJ8a3rDwAI4BK9seqq7MP01Gnk+DHs36gbg0UerHR1tBoZbM9zOynntEQe2B7mNhCN22 DHXUav5xIfjXZo+jW2Hn2Xvs+gwydda7uace+DWPvr2eNOdXnOi2AUZ3hUimEt1zuUHy MnMG7E/xq0odXrLP9zrJzhPSGfCS4uIPfc0LoQTI+ZhlupuYAURtMwY4ed9NgtP6K6VB cJ0oqnoZ3Eo1OUsnx2tL8unpC4xeLUeh5dLwgeb3h7+ofHOWU1j8PF/UdkBlhICn2R8m VK8g== 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=hGE7sY0DslSLr14WQPlibGJPM36ldFhI5JCT7J6BHEE=; b=Nz9FhJUdpRb1Ub69wwZHyJoDy4++tn4pEibbJAwmnnOVxb/A7tQrvMlUZPj4TJ2+8K 0LfsAcb9uabdbCs3RkCaEjP/PwvNLCPn7lTGvLgSKrhT+kDsxQQvBPYKbGu2v2dzAuqu Ata75TvxBfKUTImYPEaJjMlmMmlKFPhSGNcRL3qzWM6lNqiPOnrATdR2hQf8c6yvmAgj 8omxj1ta0CSVMwjSJHt3vuBZm3ih2QRqVWmA1hUb5HJ2Qs2a2//XgaAiAJ7dP9lU0DBG JiZSEAmxWY0K2kJI+BdsQV5hG0zt3sVHQQqZev8XbqG2zjUT71FcxrkejrZCyD3G8kGm cCdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ht6jYTEX; 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 o13si12438069qkj.142.2019.09.10.02.20.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:20:59 -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=ht6jYTEX; 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]:36386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cKY-000324-6w for patch@linaro.org; Tue, 10 Sep 2019 05:20:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38904) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0V-0004Vx-F1 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0U-0004lF-6e for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:15 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43469) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0U-0004kP-0V for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:14 -0400 Received: by mail-wr1-x42d.google.com with SMTP id q17so13761542wrx.10 for ; Tue, 10 Sep 2019 02:00:13 -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=hGE7sY0DslSLr14WQPlibGJPM36ldFhI5JCT7J6BHEE=; b=ht6jYTEXWRThvovjo4M3WWlFqD2D05uqr+dnHqriEjfDKxZ+R9020Np4+wenQfUfZs xYoZmB0o5SbvF+u4MmqmPM/EANfi+CBg/4qv+d09lSgghPFOVYHfa5w9zgaSozVjF+YW Rg0DQbMagJSy7mi2aUu6ujOO+ElFeBU6uSKM0SRzgkPpQWPCPgwh+KxgwEeCQqoXt5Mn UFT3B56cnJqN7k/QKErFqFmFgWKTxFnvKKkHbhbL0rF4bBACSgKNX/SqUp6HEV+e1J/H gADrCHYqfoev0yv//AtemwJV59BmYoyS5rF8n1zXTHAhdpKvvcjewStY68zPJHwquaEe 7l0g== 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=hGE7sY0DslSLr14WQPlibGJPM36ldFhI5JCT7J6BHEE=; b=cQMz7hGQtEod/5+fqvPSi1Qti7dTWnmfnSCmaS9Tsi1L9a4B8Py5eIu/NMYXsfOphK zOobz/h82zuuaiCxEGhXK2O86NPi2vUg7IIacpfIBtVnU/iOjzafLInusF+vh4W0bCVi wQpuduZOvsYRuWLg22KO5G6I9lRaD7fZPx3tk2rlW0HgllK/gU5w+9/IepBlbiWSJz33 jBmTXDOXFMn/bBKzK8cXdfxEf+AINfwLECyz4NriZZTnhRtlWP6h7J1MstXfNxbc67gf N00+IcRIuVZxuLnulnp8oIskbBTL638PZWcjTRrjR02XVQksWTww1z3biAHRa72JHQCP jSgw== X-Gm-Message-State: APjAAAVsjLAHmogC+8uSN2b/7qIWa4PR/wwqHAcW2Qw9Qupo0/YjnFp/ Tb73sKBULS4Jf4foo2C3P95c7g== X-Received: by 2002:adf:f20f:: with SMTP id p15mr18683592wro.17.1568106012930; Tue, 10 Sep 2019 02:00:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x9sm3671232wru.26.2019.09.10.02.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4188B1FFB3; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:33 +0100 Message-Id: <20190910084349.28817-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 29/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/.shippable.yml b/.shippable.yml index f74a3de3ffd..bbc6f88510f 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -27,6 +27,8 @@ env: TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: pre_ci: + # usually host ARCH is set by configure + - echo "ARCH=$(uname -m)" > config-host.mak - make docker-image-${IMAGE} V=1 pre_ci_boot: image_name: qemu diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 27a1cc0d833..7df8dbe1a17 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,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 Tue Sep 10 08:43: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: 173476 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5527747ilq; Tue, 10 Sep 2019 02:15:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJQOjkkUsGGdlu0CYDNYyp17BKjk4ORpl+vC0rGJILLJpEFGDJYi7NgTKg3ILpx+eumOsN X-Received: by 2002:ac8:2bca:: with SMTP id n10mr9455407qtn.242.1568106918131; Tue, 10 Sep 2019 02:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106918; cv=none; d=google.com; s=arc-20160816; b=DJoSUcYSZxjvbijq0+OWFH0BWfN96LuzjmBexbSo5tKpaDiW7KbxsCasDimr3WjeL6 USMwCYuQJivgjaAmwwHJkZqbHmBrW/hy0mk8k0CArYjREPLhbJ/Ksn42ygMD0Cm48PFB f00AcrPHMtJogWj8YXRouxrHL5HANE97rMH5hJFPJjaxYurA68ZceNQ0YJsmacogQAlW skzHg2uKSd5VAQK1AFPuODRuzLov8LfSOk/dBgQFL47fnRuAmb5WfoRQiBzGpbgcRwp2 JLNduRCGZxM7pFZMMwFjtNJeGmGcHK4jAnmq4+e7isilA39y+9UmJuckKgi8tAF3sr9+ 8T9Q== 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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=Gb94Mfb9p9u1poz0OYhUM63YyNpiyyZEb7sJHj9HqKobpRo9eNeGtGHlswRXdGa5qV AqqB88wnZoYMW/ZQw4tgUicxMimRi32AMuKxrMnbTu1LW/NZ8hJZp9W+6AX0KDVmxfqr u8OzNLiqoP6I4ExVOhDhh/YrBDBbYc2O788XiYFdXTlRcFpQcZGwcCfenUCh/MrgQGbz mEsGS5ogx/QgTi+CnagBvtvhJyF8CuC7qXYyMTLm4GrYYF/TimEelcXfBlrqxySwsfKs 5fCKxG8LlDTPKXn/8tf+POKGWNjwDP+1IYSiHYOOrMkntnEPMsTVYLZYz8zW9QCFBZq5 PQYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="E/L6jT8B"; 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 21si13038968qvp.8.2019.09.10.02.15.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:15: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="E/L6jT8B"; 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]:36280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cF3-0003tb-12 for patch@linaro.org; Tue, 10 Sep 2019 05:15:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqv-0000mc-41 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqt-0000bv-Lv for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqt-0000bW-F0 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: by mail-wr1-x42c.google.com with SMTP id q14so18391952wrm.9 for ; Tue, 10 Sep 2019 01:50: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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=E/L6jT8B5elGgwyBLGAJkR1YvDGZJArgL0TGyHpeeifs0J+X+V3gw4O4QWVza80O1g pGp4D5Bv/z0lQ8JfvKxC1cAmAeE57FJu92gFnfyjIk/wscxPODfqF7Egu6Ca1EeVM4OY dOsWzIMWOBe2uLeiCUr/N2kMj8Jz5YBn1u8u3iIoSzb/zsJyDPPMZ9CXQ1X9vmQJ1bvi 7lCsk0YjTF4edL4Mt7xfQ99GPMqSJ1m7T9N+FUGKy0qq0hNoxH3qFVl2SLsj1qTMou+2 YOkSsUn4kL5qG0hsLdujwDpGXQ/lFgx+zDHiISdiv9bh3Dwo4eeTwnAWJwzo7JsPMwoK y7Og== 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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=a+r9hV/mBcTh3+p8/y6VYasTklWZLlRsceo9VqEa7y8PgR0L/BnCMbGG5DM75xGInn 6jmxWJqedg6DZuwCfPuA/xIQW36V1nveFj9sx7mCDvGnZfCPekzvLchp3wpSwpZWk9Yx a9C4BghMDCeNIlsskPeajifAAaD9iw3jqI1YxnXs7BDHM8HOz9LKSDLUBex/75BJ2ByW cSIXujQJFXoe3Bv6GhKKbdsR2iNuzfHprM1R44pLi73RcZe0rdO1Tvh2rojmkVJyb2lO nOMKobPU0BeQFVDJBBVKnZBsdQr7IG4L2VexuoTWa04UAE0j9tjJDOgI6GjCl9hmr2zG Wbaw== X-Gm-Message-State: APjAAAURTtorPsSYYxn9qWnE7nckumq7R0mkAZ+s3fRwBn5JWs3K3WO1 6kNGyjHACFXthZSImDTQ9gku0A== X-Received: by 2002:adf:fc4c:: with SMTP id e12mr26124485wrs.147.1568105418420; Tue, 10 Sep 2019 01:50:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z25sm1868449wmk.0.2019.09.10.01.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 616C11FFB4; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:34 +0100 Message-Id: <20190910084349.28817-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42c Subject: [Qemu-devel] [PULL 30/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:35 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: 173489 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5538771ilq; Tue, 10 Sep 2019 02:26:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVg7O1osWtkBZhRWSUQIElC3A8XNorUsXmQCroSNI7zYiHBGM9QZd1NCveJCVTbtMyp1g5 X-Received: by 2002:ae9:de84:: with SMTP id s126mr10575597qkf.245.1568107619780; Tue, 10 Sep 2019 02:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107619; cv=none; d=google.com; s=arc-20160816; b=Yw/l3NddDshGcaIGIZYyp894Gp70+C+1bNTJVICC9hhIOijRC91bKQjSKfUu4TX67x dWKGoSyIhC63Cvia4yy4HyA+w/1ZYynbq83vfGbspP7Bj4alGs0DlawPyrRT0CVQBo6C QAW7pvs+YqDi84Cm3pEBCFvZ/rx9laXNEeA5ULUJKssNwOZ/GOip7KuDd1Rx/DoRjBDk pg3YXQjOQGNddZAvXhDyrEFwD69MYipLVdqg8qrMd0tB+UBD46NCIU6okGc9n/Iyfs22 E3QBzATH/CoP9Ygt4Nt3nP0KHRqcCrEKz0krAzjm8AjeZ/Ay2qVipR+kFWo3AeK4U4+E CMGQ== 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=l2x1SiZ8wUu6pIpQhf7+eEOKFCz5E7or12J1Y64puZA=; b=dj1KkYgzmpOXR3dlA6rSAtZ17Xw9sXKaIjmhtOChgSXP+sOBMlSeFSX2V39TT+vtsK C/t/ba9B2gE+WixIrYQevVcSIUx+m1qLKGVulmQjGr2VmcHXvnDGBm/LOaGvsRz4ggFL 8GrFK6BKmS4k5xtOkfC01n+tegoeSRqKWRBZ+EdHMOMGd0/mWLllyRJJPRbh0kh/q7ej mkZYTtC76SzmONL13Trr3I/rOERvFEtV18+DsNm7P4mBtHBDVxI5jSJpahZbHybecqS1 lTCUt0u2VgkL9I/flhYZvgmfuDt5zR4ChC4GWjdrHV60NlHyOqRqU0B/9n+uIM3ET4zk 7SrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mE0PtWjj; 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 t46si5179524qvc.20.2019.09.10.02.26.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:26:59 -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=mE0PtWjj; 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]:36514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cQM-0002Nr-Nd for patch@linaro.org; Tue, 10 Sep 2019 05:26:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38992) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0c-0004dH-0i for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0X-0004nh-3F for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0W-0004nA-SW for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:17 -0400 Received: by mail-wr1-x42c.google.com with SMTP id w13so18472952wru.7 for ; Tue, 10 Sep 2019 02:00: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=l2x1SiZ8wUu6pIpQhf7+eEOKFCz5E7or12J1Y64puZA=; b=mE0PtWjjNPRKypA4eMhDhUe1exqIXn8/eABPDHhDtVLbx2S4Q+wgYf0xM60/MdNT8s U3AbXQiQjIDTJEl0cDGZF/UWu+Ni3Z+JQmJ2h4g/QMc6K4qz3OQoeU2jyYfponSFC8JU sfwv/M2RoUFliZ6HiykkMkD7z7mcqFT+ILyIS2wpsKFkMPoMbdMCagNcVECe+feP5FYf FJ8Cu/ZzRyy+ZttupBkmKTQQZ8SIpqwpaCG81glwNoeNmiUscUB9r2we2jSKcZnS84Vi OIEUhaCbWYxFx87I4b22eoPQgTOnsGzo1mPhbfJ5LopWkxYSt6W7PX9EGerO/NTXACvv XXPg== 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=l2x1SiZ8wUu6pIpQhf7+eEOKFCz5E7or12J1Y64puZA=; b=nmlyUPJXURVq+F/20LmC5Ekuqm1zUqsHKQjP7JKpFcG8XJ2Mk+gdqSKIuaS6qL6In9 GbmSrZzOU/qqFDo1Z+th+nzUej87D+rwKzxhH0slkTOoaWpdLtkba28Br7oIfJSniZhy d2p69SlnwNVLbueCkfjLvhyPNlNdJuSvzgNjUd5trZBDzjzC8ebzpNh48rL1Lq+kolPn 7DW9HH61OvASYZ/iersn/KGA1FoxVF9XgdCivlLd5iV/ctpmRF673rH/qsN2pIjMqPka LMS3Xphu1MXYgv3xF5KTF8QEuobrJCSWBMsDjVt2/F68plv64KtJyaNQ49TDOxTYskyp eaBQ== X-Gm-Message-State: APjAAAVYwnCyOXu2ahXbz5G4qqXX5qMHh0KQQF17xpI/hA91Wo08LP3A dXHt42EGmYdCmmVyVeRp7TbIPA== X-Received: by 2002:adf:fc0e:: with SMTP id i14mr21006996wrr.302.1568106015817; Tue, 10 Sep 2019 02:00:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q25sm2083119wmj.22.2019.09.10.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 76CD71FFB5; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:35 +0100 Message-Id: <20190910084349.28817-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42c Subject: [Qemu-devel] [PULL 31/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7df8dbe1a17..50a400b573a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -106,6 +106,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 Tue Sep 10 08:43:36 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: 173465 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5518550ilq; Tue, 10 Sep 2019 02:05:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPUOefFSgx+i1XShxshLLxYFzcDl0o5JAOdJ3gorfSNQ3BZzTKlpsRYaYqXpo8g2J9W1nS X-Received: by 2002:a50:884c:: with SMTP id c12mr28972775edc.134.1568106354723; Tue, 10 Sep 2019 02:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106354; cv=none; d=google.com; s=arc-20160816; b=J+2OB5+NEwlRL56A8hTOZPEplYtvo5ldc6Pj9leFphFIXe3O+7ps7qD5lKE62+CVrH +7NtkOPFeICzBK7/RwwN2SQFhaITdM/iAL/SbvCVkKIYGufNtaEn2WLJe+cPeEPBuyaK GgQuN/NHF8gmvEh440d+IDswK1+0w6W6KDy5mKIn/MbojBXkhhDXxjtJ7XtGzTziRS7P et8CKdqR4hQgTeADHvWvOxwe8LdpfGE2E4gCUd3iEavQVzN9wFGpUwkaQPPTdTZTbYs4 twVV3X3U4jCSYk5BnWo2A4J9c7mrRhNhW9E5dg85rVQ1bg2hqLovIkcYlMwPAFFM9HSs FdRg== 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=KqEnFRpupENR9kNbZVcJtQySlE8FhTwxtFose9RX2lY=; b=x0cNdHRNokBFVTR+MOgsabmlzCvyEyKjItfSysmaALGFPlk/ennXyHCWBuJ/B8OUL0 t78OPBPm8wEGVxVzXh4fvas2XCRYn0IwhR76k6hzlbUD3+WmG8TlZv48lZBETd+v8kvt tY6HaX4Ij02JnSjDXkRFCsYUUt2CerW1NU2VU0ufLDe/AB9Er8YpltAfGouND+DTgz2y MdeJZYthEjTp3XCrNd4kE11mZPiGX5sLnD6pcqFRw+SzkCLUhlXKMBQXsloSqG7UrTBg RTNztB9/+qvzZGDYdZC2Qwzu71NUP4CKPcLJGtK28y4yhGzFdDTt8/40YWV/oYi2KpLJ ED3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UD0bd3+5; 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 d36si9677093edb.351.2019.09.10.02.05.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:05: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=UD0bd3+5; 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]:36102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c5x-0008Ax-9Z for patch@linaro.org; Tue, 10 Sep 2019 05:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35973) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkt-0003Xe-2W for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkr-0006QY-Sj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:06 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:32982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkr-0006Q4-MH for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:05 -0400 Received: by mail-wr1-x42f.google.com with SMTP id u16so18412998wrr.0 for ; Tue, 10 Sep 2019 01:44:05 -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=KqEnFRpupENR9kNbZVcJtQySlE8FhTwxtFose9RX2lY=; b=UD0bd3+58ih9vuVTEMcBwAH9je9j3ZtsaBmTQo1cmHZCWxM0jx0GYsEqPF/v+o0pAR V8VNZZFFgPB5B+orcXvLVvFFdAuQD44P2K2vszwR5Rff5Od1DhMhCgjGA9csYWZdMt7F m/XnAoTu3pDz/NV/XXXUOlJ+BrODFEn44EUgr2hdfcfgAujsgExnSNvUqgDic2Z0s4HZ Hw5pjQBDy8NArYAJF4d4wCbGtB4ZNTyozo4z0gfcCLJaoTYGyennHU6D/9xJKRw1RZGw bX0KruxKeTtsc9fh7TwxT1KSfZS8lCJ1zvup2deWsR5NENanVIhwWAAF5/OCfDHZ0P+q m6Ng== 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=KqEnFRpupENR9kNbZVcJtQySlE8FhTwxtFose9RX2lY=; b=d+SxTds639uHyLViITCZEowRNznwLnJ7CiXnNIRwP7ufsZHU4sZxxVi2MYqD6fuVHO Cog7yGeJOjJkJisSpzhv+fDiJCVulTbl60vgy2hFeEt94bkErkt+JZZYUdAn+1nTEZuw He+PHcBJbTz2DLWef2bagisSl9sosfLIYKpd4YOLyX1Vw8TPGhpTTfsNDqkTQU3pv1g2 y1gYr/MHWTSdqq/evyqfeCDnzmuho2RMssWIg8xqtUBKradbPdqkunXFx48Oly/Q2vtw bGxwPStqOQXpHDoHvRD83P/+/ZiUkSJ37JXVnqZIL+B/m1PRcWVPnddGXkQVTKfiG55+ 8Xeg== X-Gm-Message-State: APjAAAWCrxz/n6rsQn5MR22lRlTctyvxf9QTTIW/7Z23e3L87pJ4Ib8r bF3zg9wxgiLgCapdZslx5GK+22mGC9g= X-Received: by 2002:adf:e7c4:: with SMTP id e4mr17159506wrn.62.1568105044669; Tue, 10 Sep 2019 01:44:04 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b194sm4098036wmg.46.2019.09.10.01.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:44:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8CEA91FFB7; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:36 +0100 Message-Id: <20190910084349.28817-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42f Subject: [Qemu-devel] [PULL 32/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé -- 2.20.1 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 Tue Sep 10 08:43:37 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: 173479 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5531026ilq; Tue, 10 Sep 2019 02:18:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqx6E9+aI3muLhx7aCEsHfIn9IKHKcM+TncWjznRKtgm10l8ZnHUfwZuHn/9KNQ2c5z6R8zO X-Received: by 2002:ac8:7019:: with SMTP id x25mr28999945qtm.133.1568107113437; Tue, 10 Sep 2019 02:18:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107113; cv=none; d=google.com; s=arc-20160816; b=jLd7WR0jPSAuU3I+Pw7cN/rBKaPBwy5xZjtf1o17Agm99ykLkxFUP6qImGqi0tebgB 4jB+01lpsJB9wWvQ70hy9X7fu50pWljlJvvBF9mH0GE48EkncdbVIW7ehpI4qw/3MYDW JbJbP6tn4Lc4W0eAKO2E9e1c0hVl0TY7EoyAghSlifLJW7LCJ9NZMs4Npw6Pt/ZCsQP7 NKkEAqM1ysT1mOK4/nHolKXRbRVuYARv8yRqEeUq50oRnjSl+M1WAge7CzK66hA05URD wF570IEpfX0c/zwC/c1iyBaGboGfflbKbNK1+ULPJJpKOqEt5Xd6/zUELIfoF5edRbjD Rb8A== 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=YlfluaHGLx72DnzBu/a39JxtiDjcvKmVMnNy0x5Tr94=; b=TlmCAr6PcjLFUr2DIvvb2rhp2E4aiwh0JOsHwIRXVfqcjmywN+FFZHu//UnlHVzlk3 Q4ssvPiokFz7cvhHt4/ixeaRlzBTcNPcGoGkkJNeT7d19nczS2xoxeQNHVZ4emqyq4ZG 36w2gnJGDgtmNCgprJAR9EzpEx27WaM4fM1nTl0wR0Xjp4zUslCEeqSqeEq2uGP6PfaN libq6DeYCUcvAWdfriONl93J3SFJKAXEsNh6iCVxHdJHt+pnF96y6N9P2ktx8+95Emhr DTZ1/Zij7fyiOXQ5B+YOEfBuRhNZzJNU1T3Zb56uaAcNUnLL7uYmaeQFhfE9xL+YSB3w rw3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="C/jE2z8U"; 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 69si13058254qkh.184.2019.09.10.02.18.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:18:33 -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="C/jE2z8U"; 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]:36340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cIB-0007oy-UZ for patch@linaro.org; Tue, 10 Sep 2019 05:18:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37329) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqy-0000r3-CP for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqx-0000ez-Dq for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:24 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqx-0000ef-5i for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:23 -0400 Received: by mail-wr1-x429.google.com with SMTP id q14so18392391wrm.9 for ; Tue, 10 Sep 2019 01:50: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=YlfluaHGLx72DnzBu/a39JxtiDjcvKmVMnNy0x5Tr94=; b=C/jE2z8Uc5vowk4G4n9qZm57bOlbvoRZ+8YPRGHDRoGSB6x1Ti+yh1wG44jeFHhO/v j8+BlrvIkttDOkdxiBvLs29vUtQKGDAB5FmFFoRaM/AM56coSAFdmGMfan/+UCuYCRZ0 8fzUzjtdLrkN2g757VOm0ddRSUnIDr0xPdVs/y1HuM3KEi9tjJBRzOJLaK27FP1IpTYS 821o6vSJUyFFQxggEO8FfTBxuXwn2UdMMwAcYn6ECqrogk1BqHMwECxuthPp6qCXXkaT oeQtCsqVenmVwjsZWIdov5/yWW97j2X/4ND7v+Ic+FuJV+NdsBQoqKa6ui84NgXVgki6 FQuA== 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=YlfluaHGLx72DnzBu/a39JxtiDjcvKmVMnNy0x5Tr94=; b=sLzcszAsKWype9n53Sc+8/edof9UBgEqELals4XzMgANDi+wl1uMSt//oKnbncC4dj YGiaSMN207VNcQ7v3F0F3I6l4v8L3J5R1KpA09c6AmchnzJPp/Qb2Aqmok82KCT7aNeo Flvj7TRTqsvltSX46Izj9uyFR0LR3hByfby8rdzCdvzEqgERdno2zOzbtejJql6R2uiV rLkf3R3Bag4q0AaDt9BEPZAweGMLXISNbahaEMRdX0dwFsSjWW5Czmr8lGqZyy6acPmy XBoihLsxHaMTjeAMtbJcmE2bgpGrelv5SAg0cTgbEgUdDKMhzNZb3Zw1medImaZcX4rX he4w== X-Gm-Message-State: APjAAAUIxsUch1HmWd8iABrBqyR07seWYlGl9W4a0SbjJ2MeMRwbt6z8 wJo6SY8Ja7fkpREXAjYGsb36qg== X-Received: by 2002:a5d:6306:: with SMTP id i6mr20257578wru.323.1568105422150; Tue, 10 Sep 2019 01:50:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j1sm21991496wrg.24.2019.09.10.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A30BC1FFB8; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:37 +0100 Message-Id: <20190910084349.28817-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 33/45] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 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 Tue Sep 10 08:43: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: 173466 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5519847ilq; Tue, 10 Sep 2019 02:07:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqziVwrjRfcNx2IVcyKTTYwIw9WSCKiVcNzvIoLUA/s9h/319aKHSqe24PsHW5BRXaEbdOUh X-Received: by 2002:ac8:5296:: with SMTP id s22mr27821527qtn.139.1568106432610; Tue, 10 Sep 2019 02:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106432; cv=none; d=google.com; s=arc-20160816; b=MgfzaRfVxA6v1nT8c7/pJvGN5Oa6gjrYUD8dfTAEDgKxaF/5FMiOd+DGCpxBsqBTqt 1rzJpUM5y/NWU1Tawh3uGWrlOtb+2sAVrWfMVPUPOf5qFfhLRH5OooRgG5IRlRsMiGsR SdIGa4/g1qI/Cd9WcE92nu7K7lQDIs3Hgs2FOqoK17HJ6DCAcIPAE/b/Z42XMWV+DLGB OTB4yk9/zISJY6fze34rdifXsu8Hi7S66onrCPbis4OU9ENipT+9j728L9jqnR86HxK8 fUfO9pM07QtVjGxeYr4tXcqgnfdzgPqZGOsUwtxCId65OUxJDMDLhjeh4FvqM4PELh6F pI5w== 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=l8xD4JKTs5aV1GPbbelxFIDDOIFZEGHKpHk8K7Sxfm0=; b=IU5K9d6WH9VUwPcIVz3M8i8uLW07qknJjAHxMgw7PH/w5oK9DFd4Q6GnQCL9J3xex/ ydqWDlOg8ZrBnzCIDAt7Zkg7ENfmSqkKJOIqsBw86Glkwwa0rm6IFlLiC9xVkaqHAM2+ zWMlsfqHvL6RaQmFVc/pGIXz6MFb+IxigTRFM845U2w5owdTB1FWrj6XDiYGfaMiJcRM 1qbfBnOF77jw6XjK76+NO4r5XTQFpB/VuZSsRWYGOlQjNcKxxEZNzvklKYlBDw3UGT42 Umeq7Gl1cqbSd8MU1+YTbiWjBobHf/i8EhZ5nYJltyLKd1z3a62H171QWqhcjtJ8mmqa pRsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WtQUS8RG; 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 u201si12524011qka.335.2019.09.10.02.07.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:07: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=WtQUS8RG; 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]:36142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c7D-0002m1-FN for patch@linaro.org; Tue, 10 Sep 2019 05:07:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37314) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqx-0000q3-Jj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqw-0000ea-Gl for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:23 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqw-0000dA-AJ for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:22 -0400 Received: by mail-wr1-x435.google.com with SMTP id k6so6265148wrn.11 for ; Tue, 10 Sep 2019 01:50: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=l8xD4JKTs5aV1GPbbelxFIDDOIFZEGHKpHk8K7Sxfm0=; b=WtQUS8RGkW54NVZMDmj+tsszuXxUnh2t/ouVeaAn+bZ7w/O7TCclqPDEFlqSM1+ZGv Hbs38bAfSYbBr8d1sGJo9rV9ce2kPdX65/komC4p+9awc0KvX7lZv69Ej/x0HVRgsxk9 c4eAFD8MRluy+qg8qoSqLoeTom5CghEx8nqGLQ43oJLinFg+YCDm4dgEk23Jz6eTfo5O OHAWrRd1u7T9AcsPiP/Kz3JPASYv2dLxHB4tBbuO75BmG4naYVLGwOwsFqPCpeyoTgcu OIsM3oGh4z28gg07GwKcUac01KfF6uf+2Rhwtj0qaZqA94f3kAcyoanXFl7JHJJNcun7 hZuA== 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=l8xD4JKTs5aV1GPbbelxFIDDOIFZEGHKpHk8K7Sxfm0=; b=MlZu2X1MpbF51XbgSEiALmyi7LLPVPCfwccaw/aKdHRBUNIbRonkhtBuLJe7FFyY30 9T1wm/Teh84DogzxOOwr4n3UCM3XikaMN9v7z/X7vInqehpNDTQqob4wF4cck1m8oj0Q CaoUEGancySVOhRPMQE7UzPcg2DvsZP3eHJKv8H+7jCEFJnjbKTcxiTGIU3L7kpXPKUV Oaooapk3vgWA1BgWRtIf0yJw7BJeJwzBAkOOoDnfde9yb/2iu0S1GZyx/TQjy97Q6nuT qMeFoDehDJL1mrhDzN7dAClXVBNcM2VSMWOfYDRiFf7hc0d7owF2o2ltZeYm7jBZYQZv EJ9g== X-Gm-Message-State: APjAAAWX3fgunyOCesO21ES61EGbX27kdEnWESfEf91EuO0cNvcSs/WS mYE9vKi4PHj0ei2sThiYKy7zGA== X-Received: by 2002:adf:bc84:: with SMTP id g4mr24879833wrh.135.1568105421337; Tue, 10 Sep 2019 01:50:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e3sm24590515wrh.12.2019.09.10.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B7D621FFBA; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:38 +0100 Message-Id: <20190910084349.28817-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::435 Subject: [Qemu-devel] [PULL 34/45] .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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 106f9b5d01e..c60cf2ec135 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 Tue Sep 10 08:43: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: 173485 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5534733ilq; Tue, 10 Sep 2019 02:22:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSrfSJd8pl3da0LQzL7rLUs+n4R5d3eSAKuiSbLLVhrUVZ8F7ZXeGyohvHdFX/YnmyiDdb X-Received: by 2002:a17:907:42cc:: with SMTP id nz20mr3086563ejb.67.1568107345884; Tue, 10 Sep 2019 02:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107345; cv=none; d=google.com; s=arc-20160816; b=crdgURYaL7jVAeR5hZbqyVP4tYAa+GvpfWsGtqiQq2BzQ1fz8/dgJIFGNcN6kVoFMs 0QiYwVBCv33x9Ymm9cu84tPIfCcLBLP/h7ii5vv93N9/M8zdSIyea2a0GwRxbt+euJSf aMCijLMQs5P+9B4XXpLLmt9VtDoMEPFN/049bRfAeZu+c+CQVaOsJ33dBZV4YYxbSNA6 R3rWrHPtMUx6GZEysjcUZSVQmRqeA2oOg+WhxbndDiQuijrgmXDmcUK2YRyQJWdplGu9 eXoeVCMsB+uwlS1q2Bzx+cT+fuz5aLWGHVRj0ghM5z5UQfDCHSyG77uq3QcKRiUyl7oV 83xQ== 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=5ij3XJtRxqrxISqOpJPlpOvdH/pBrN9UdyUObo+VQnA=; b=07A5s+b6t+o6PJdhh/DCIDQ7K2o5UGUZyL6gwk3s9RMdyGZ55gwoX6DaFqVNXayMyo dfCM8ZP/Npf9t26TOrk/+oUUZ24vKFeslurHFQjQev5pYtl08wPJJHNeYqiJWRTmfn7e aT5oy15uQD02uykB3VrcqHYM44pYiwnj7IV9iu31BnhdbROb79CBo5/+fuH7I62QPwSH /0QXnqoSRRJcaWRVf5VnueQlnJVBOuZcwTINBd6PEeMFiwNBEic1/IPwYkcyE7AeFWX2 2JJXoXZpk/jZINs4OgbdUzcgPk6vnFdU+541W8sHjYIWGn9mWthFHQj1FSmHTiJmTaR+ XRAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=x2cr6ZYE; 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 k9si9315228ejh.263.2019.09.10.02.22.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:22: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=x2cr6ZYE; 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]:36428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cLv-0005WZ-N6 for patch@linaro.org; Tue, 10 Sep 2019 05:22:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0W-0004We-56 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0U-0004ll-MC for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:15 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:41472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0U-0004ko-Ei for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id h7so17457412wrw.8 for ; Tue, 10 Sep 2019 02:00:14 -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=5ij3XJtRxqrxISqOpJPlpOvdH/pBrN9UdyUObo+VQnA=; b=x2cr6ZYEzQzHaSpl9TP2CZaPNiurgZYQXsQ8ocaqA8CqpJb10BBkJDc9eSs/pvVFSt YSYDgj7fXGSnIgpmMDEc+XwRAk3qVwRVPwvRu/551Dpgi6lLtqvQDP0/i9UC+uhZnJhF 6rF6YQNTkM9DoT/NFPf7RI9qFTTZQGjwk8meH/4dWu7s0MY3oyVC/vgZ/AR5QPFsOFV3 tjblseenzd/n1gXDl6lQ7uEpgdRsTW6Mxvz6huHFWCF/gcPhPqyHxAfptnxl9/X/kebv z3oD0GNLz/UdxxkZk20kxtfQgegI4TRGoO+udSmWN1A8ArafNSrfsKKQXqUyaV40ki0d RctQ== 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=5ij3XJtRxqrxISqOpJPlpOvdH/pBrN9UdyUObo+VQnA=; b=Ux3vICjYgN/1zsbsH3bX+yNUWh7NjHNiKSR9c8F5rZ/7uCZdFd8GyoOiVWGOR9h9vn G0Zn8fj2FbiAvh7KF4nCZKG8zMk6RjHPhgEH+/pjv1biuBWqg28vRe14jT1bvmNaj/SZ JQqgIeKVxXp+WNxFnRmNphYvpjreWgIQpzmikYV+/9+66/3KqbqvUeoM5skxSnsiRqoH YIA3KaQud5lACPECzR8b14qAoCHzlvpk+3vgBuIeYBEsSy7AFHuktR6GlBJgtBSv9cok fKRXs5FxWQwKrn2e+rrzb9Hha+1un7HDlzeDSy4UEUeP64uVOX+dzXorEF/kY8lH74WU Vn+w== X-Gm-Message-State: APjAAAXNsRIbnCzXoJv17u1bMwrobaSxXxNOcoMUm9k0vCrufBW5cCnU fIcIf0dFczVcuNtZ7UPpyYw9HQ== X-Received: by 2002:adf:f00b:: with SMTP id j11mr24191352wro.298.1568106013468; Tue, 10 Sep 2019 02:00:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s12sm7894666wrn.90.2019.09.10.02.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CD6961FFBB; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:39 +0100 Message-Id: <20190910084349.28817-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 35/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index c60cf2ec135..7ae55dc41d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ language: c compiler: - gcc cache: + timeout: 1200 ccache: true From patchwork Tue Sep 10 08:43: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: 173478 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5530208ilq; Tue, 10 Sep 2019 02:17:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqzExYKY24UB9GdzGljVewf94p+oGkr+tAiiiZwV41L15rOseI9kIcsRcLf3Du7jeLANavTy X-Received: by 2002:a05:620a:1494:: with SMTP id w20mr28588840qkj.317.1568107065886; Tue, 10 Sep 2019 02:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107065; cv=none; d=google.com; s=arc-20160816; b=kEizJAWZyUCHxmaoqy8ybH2YtCELDvPM+KWjdzi4cP/q0FuQxtE2SfWqVytEiOXwnS kHBfQN7QtANKWcanjNlxoueOdny8vWwGxdZI7NRXeKiXV1BVjx9yIt4hMEmt/wLTtfZL LFvyRG6d8wKhP+qki4edY6jJY0IDucXLAeEnxamf5UZ3moRO3NpcoDNMrdfgdyeUurKi h1SeY10tnA2jxaYRgjR3QmKLejRlKFE/wa8QdBm+OFi2Q//giTVhNGETkDM06Ncfi5iP 5fvA6rwfJ/Sy+Oued3/yD86pGdH1mt2sCkvWHYRt09B2NCtosAkYr78y+2kbdFhSXRAI tFrg== 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=mjkSIQ3d9vSaUq8363fKKG3DYG5g98JOky0YB54rlxI=; b=V6aB7KZppxY6iRgpHdRshil4vW79BG3yZ2aYUez/RhRMfGTn6CiUUkkF94MYPZiOVV 4WZnQwR3kW/Z7Y+pXR/cPACRQp2hxvxz4u3xYU1hw2dr3htQ1yoyjzQrvjRJPO0YFO5V 7vZbXLaDtzg5NSeRa+vnwt++hh6P+CPL3VHVG/389fIRwulKLZWet17+lhtEfi1R5tza q+lVKSDYR+hJpuMnTZf3PfToXKi4UDIZEvdspFLOCWwm0zAcSwV6cs/5e2E+kDwyxgZU 7I70OS2l662Smh3ZIAkQ9Z2WIsXCPitBpUxvWOP2jdXczviNYtJDeq6bdqotHiPcoqcH xL6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EwXfhb9a; 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 f35si11559050qtb.181.2019.09.10.02.17.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:17:45 -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=EwXfhb9a; 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]:36346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cHQ-0007xq-PX for patch@linaro.org; Tue, 10 Sep 2019 05:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38878) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0U-0004Uk-Eu for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0T-0004k8-3v for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:14 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:42101) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0S-0004j8-UZ for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:13 -0400 Received: by mail-wr1-x435.google.com with SMTP id q14so18455804wrm.9 for ; Tue, 10 Sep 2019 02:00:12 -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=mjkSIQ3d9vSaUq8363fKKG3DYG5g98JOky0YB54rlxI=; b=EwXfhb9a9PhOk9q+3Cvpp9UOTvCwVV2x2ErSEuc2VvWBmyCPu0NG/ChFBQGK4BZxEs +i0EFVJGSsa5q/9MY8qnIqghu2M8/q5Qgl/6EMvVygfU5JleixpJetq27VaVZrD/3Itt 57CkUKrGIYyb/rLBpL5YbwtEHlbS2CIgIPyKl6KbOwA3ZmbNyfwi+Gj97jHGmOojT7K3 lOTM1jJmMcWiFxFpemGg9TJZ/PaE7/uYi2LLs9xyOMAIFwzeMWEwLrgw8EhEjROvres9 1xQ+sAtqdTjbxLPYA/tU+YSs/bxWqrNNXPhxLXYccpcn6Ht01p1XOhsBhJn+y4SIv187 8caQ== 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=mjkSIQ3d9vSaUq8363fKKG3DYG5g98JOky0YB54rlxI=; b=eiIM4PBnG/g6O3F14YnmuRri9CYIIneZwnc+sLxZh+bjnmzcd0sxBzEPLE1iYiwbXA sJEZONWbik6Aah8Y0JKdWVQessHMMoGxRDwb41aM8EqUUft/VyHcaDOiN4CjXdtDDkE4 PkclUUtMrH4dybKsacqdjFU7pO8o3HMiw3fFx8aozcCi260c5XxXPDuIlhQfAVQyokwV pr7+F57BEOHjOV/oMX3FSozxJKdWiit2vHOXJmNL2QEsPx36vs3w5QLknvaYfPPY4CHH chRGWBHV1GeyzXqRZO3GhibYkVICh9yiBw1TomiSbgECt+IGERyOEEBIpLhCoEgX97cl 83Rw== X-Gm-Message-State: APjAAAVSUmdUE0QEyhN4kIZe8SxEEoDkBFOD4J5MBq4VKdCuJNwQj88V W7QVst8IjL8q4u93mt64ytv2tw== X-Received: by 2002:adf:e30e:: with SMTP id b14mr24660158wrj.168.1568106011797; Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j1sm22032835wrg.24.2019.09.10.02.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3CE11FFBC; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:40 +0100 Message-Id: <20190910084349.28817-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::435 Subject: [Qemu-devel] [PULL 36/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 7ae55dc41d9..0e3c2b0021c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ compiler: cache: timeout: 1200 ccache: true + pip: true addons: From patchwork Tue Sep 10 08:43: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: 173463 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5516299ilq; Tue, 10 Sep 2019 02:03:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfjOFFDbTVk0YFvv+mTTlWbUxOv+Xbj5A/fGHnr2UlcwQCpdg4eeaHSywe/rJH5mM+QCug X-Received: by 2002:a17:906:1995:: with SMTP id g21mr23563014ejd.226.1568106229419; Tue, 10 Sep 2019 02:03:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106229; cv=none; d=google.com; s=arc-20160816; b=o3sa5wOe9B5g4LBeOhSHVqkR3GnFkByVEJYpUtiRIqRAXBUKRSYZGlQfZ7wluKMqEk vKV6gLXAG7vOsNJ+crxEjhWR13k6lQfbNUmKpZsx8XmMmJ5+80OvmgeD+H3XBx3g6g/R UbMI7SvyTpkFvQIDiRohJn0UWyAfeUIM+2/O7P74icPjZ5SKDOeVlXOw0NHjo0WglqP/ l3I+lTdAgD3qUZp34izhR73C6o09As1Gat6rcTV0GzhoTpOfacsuptvwKG0m53YnmI66 EFdukdY4liip9d/ZVswystSqG3v9JQutWxEzcgP/r3AVLLppLHKqfTuy+RzrjLKSilGA WIww== 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=I86s17YWZNBBJTM3o+byHjhL/ANYpndSLZTN6qLv0h4=; b=pghOvD8WQ5flAt7gAUgrTGUkXnna3pcVaup34omzjN+/ai1E/4IWPAq8x0JdDo283R TVFiz9pzcG3CP9z4TZyAXjD3XvHD6v3PqQT8aC6tg55Dr41wgFYu12+diBRd0y8Wj+qx gUMYz5nrhVintrWHOkcZkHAJC+wSCL/4Ukhfy2uLbz9yOke+st7MAbezZa70oQWMuEja m95NfSXkio0wo3F8o4V9jn3NSExemHrlCh1Tv/a5RPTCZA+IfRMLrbEVOXAvWU7JceYY 42fuiaVeqUyPl4r3+YQQUb//jg1t+tPXj474S2JzUP0zx2mmUCyHqK6MQKIB5oOu+K40 mnbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zyiR2Eht; 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 i55si11758682eda.88.2019.09.10.02.03.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:03: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=zyiR2Eht; 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]:36090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c3w-0007RG-0o for patch@linaro.org; Tue, 10 Sep 2019 05:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37281) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqv-0000mw-DX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqu-0000cN-73 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:21 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33087) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqu-0000bg-0H for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: by mail-wr1-x430.google.com with SMTP id u16so18454301wrr.0 for ; Tue, 10 Sep 2019 01:50: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=I86s17YWZNBBJTM3o+byHjhL/ANYpndSLZTN6qLv0h4=; b=zyiR2EhtYIoe+jLx9GExD4a60IMvdrKaIC721l0qv/bibnVps8sUx6o+aLV9+dct3y mPszUiH2oHMpZ5ORiOORmDnXFQksmQN7jKIjuubH+dqhqY0O10MaxObsHhZXlI7Th127 qP2DK8y9rvI+qDUNPD7IKyXumyp81OHDkZVy+gi2A9DykXpZAFr0dIbcl2lMeudcFU6V H8izwbmUBog2p/zWUp2XxFHxGfQwOvFtOYadwAMrnbMctsjC4GQZasR5RSklBuK3bWXl iCMeD2IdanfCO6Ng6STPXbWwXPm1IdgWk3Wm4dzu4WTVhIidGLw3nWQECMRFNUvAUDj3 Vdsw== 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=I86s17YWZNBBJTM3o+byHjhL/ANYpndSLZTN6qLv0h4=; b=GVSTeSuq82+S74gXco+uXu3frZIHfbwC6HE2aztIj2v6q8yL/TJ7j2e5aP5Zh4q3bc 2IUMGs2Jx0lEfswqbK/qmko0ajz0mJh2FmyRD0iIwylRLlfx5o6XpU4T7wn0dAqEz3YE 0j5D63B/n0+7HwFMCKYD6/nVLGkp3EDlAmRI2aS5N4nU2TFH5vo9Ua0F0/mg0LeSh5mW /1MTnEXakLWzYpgqfd7xB3uNnvhx89qYyPWwTZA9iR0Z7hhMlFdsd0ndby6nO9ujn3Tc 9s1Ap730NvU+y5+bHz2tlc4k/IIxZn4ajUXsh4I+DqPrWHTRdXhhG7NWsYYjqwXhCut8 XTOg== X-Gm-Message-State: APjAAAWdXTa9vn46MWpV37DZnG5mRwFij8zH97nbpYot1KGEYIE3uCmj WGvmbvAnNp9PtVwf5DP0eBcmAQ== X-Received: by 2002:a5d:66d2:: with SMTP id k18mr24602491wrw.7.1568105419022; Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b18sm418252wrr.21.2019.09.10.01.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0434E1FFBD; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:41 +0100 Message-Id: <20190910084349.28817-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 37/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 0e3c2b0021c..097a844d68b 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 Tue Sep 10 08:43: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: 173474 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5525341ilq; Tue, 10 Sep 2019 02:12:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqypL5rJ67DmOfsQUcGxvW+4BmHxgZ8iUDVH4ebX9SsX5cLKAy2W7ZZIVCoHJQl/kcyzt4LM X-Received: by 2002:ad4:54e3:: with SMTP id k3mr17894706qvx.9.1568106764828; Tue, 10 Sep 2019 02:12:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106764; cv=none; d=google.com; s=arc-20160816; b=iWgr1oattg2dlCD224boF7twRNjYrhr98C0KCc2Ap01lBL9yw+HJOjdw0jkyPijhfn GSIiv+1xzSvwognSyMOg8eHbW8VRtjH0O/zR3NokbZ9EMGjtza1DquArrRANjqt27rqc uw1fpcDBxb2giDvtZ7k4ARbYKFSNXLVS36M6p50L93Nkor6N5oGxB3kdrZdjzb35IxnT LwFgNBUqwd3we5zL29u+2SjMx9ZkZH2txFCUZYoWiFF2bz9Nn4VlNF/CjrA9T2xHGiwu hNZBEhHmCgvvcah/E5BOj1h9IK9E+FWqAKrVgCT4uASsNBey2uKGUsLOTtb+MP0KRoNE xrzA== 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=flfnwEa/qmAbmD2M5WH/Dd1NeF2hOFImcYs5xWcss38=; b=Me1rBVmRlZzjMmYYiZbsy5hd9Xtddey1tSm+4SzpTJSMk30+S+b/gH5h5U9UAIEySS k7BekTuYHWKBYnHJV8BDj1nAWiJRIkYmaBXMUSzBRtdncv+8HY/iPw2CVp9544IB+ZMZ N62SGxYXWgAyhXViELs+H1LV/5b5wPuES6zowyDaiGWSjWl8hOuF83Mu/bjXai6a+5B8 vhS0QZwFznW+T6uV5unrtRc6UALGthO+Ip526Rn+tS2OEhKAe2iqfcYGkXfFKJwY/zMI Eia0Njo61AfGS8TKUExHs7AzPPJawmFYNXFFj3Kd6aWszX6IpVudt6b+XxD/PjtFu4gZ b+Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O18Ye8oP; 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 y12si12755334qvc.71.2019.09.10.02.12.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:12:44 -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=O18Ye8oP; 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]:36242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cCa-0000mH-2t for patch@linaro.org; Tue, 10 Sep 2019 05:12:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37247) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqt-0000ki-Me for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqs-0000b2-9k for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqs-0000aY-2y for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:18 -0400 Received: by mail-wr1-x42d.google.com with SMTP id q17so13697672wrx.10 for ; Tue, 10 Sep 2019 01:50: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=flfnwEa/qmAbmD2M5WH/Dd1NeF2hOFImcYs5xWcss38=; b=O18Ye8oPQ3DreL0ySAUdT8g3tEc9LiCJLtjDdEYewI7QyAhZOoxx4e2T1j7kXRvRAk mb1yxQLcs9RZ4LPUZUN3KKybyT121tAER5w1KXS2js30ZFRwlnBV3fnoj4IjQ6ZQ4VU2 xjLFTcDTIgqrCXNwFLShGVDML9wcTFyDIrm1yk8PHpXJSiN3LJrAUqf5lk++8QaCiLlI NrCFtUvPlYWdZBgfE16ZX16ExyfSXlRhEry62h429Y+UtYz/zkXy+ekJmfgTdMVyAHoA ovNg6E0RRDBN2130O31vtnes8m4m6HNM+iUaDOIhmpVy6IQUSGwOMq6JVLd1g/jE23Er 2LAg== 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=flfnwEa/qmAbmD2M5WH/Dd1NeF2hOFImcYs5xWcss38=; b=ol7coOE1lNeZ+IA8GmFAxxq4H/5uDq5XLz0SzXA6kPSaRstq/egETZe9n7wu6M4A0T lOpd91EZQhXpq78YstO+DOBWjwC4r7ispLh2nrqXHtKyV49fN84yE2skRoDp5/9iI+Rg r90M3OxSOvMpUOEC/ioINe+n6L98QSHQasIO3ZWCLnkjbC+Xj7oq+lJEbyVOJDwWXvYt oOaR5PtbJb/R+7tf1wwceoyUeiQVhEVDtWktqROGSlz0jEIIYnHjc77Vo2giRCpSyhbl Ee+AtMGDIrTU2JgjKrz6oQtdWTmEKI8/0TMk7dTGSOOtqY4MBR4x9KY92WOxtboAov65 vXJQ== X-Gm-Message-State: APjAAAVTh6F663Ks3mSh3nsSz3jGqNHVv0JP3eT0F0AwDnZiZautPdWX oL62xkitVn5PSk207KYlZDX9xQ== X-Received: by 2002:adf:ffc6:: with SMTP id x6mr26190211wrs.346.1568105417056; Tue, 10 Sep 2019 01:50:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x17sm2103530wmj.19.2019.09.10.01.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 188B51FF8C; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:42 +0100 Message-Id: <20190910084349.28817-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 38/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 097a844d68b..7d6c63a2803 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 Tue Sep 10 08:43: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: 173488 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5536476ilq; Tue, 10 Sep 2019 02:24:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqwIsHM2y5MmPE8aAsdajBB2g946DycEHyxH8qzJxDRhmij879owWd1tSw5YWl4ftHJQ5aVu X-Received: by 2002:a17:906:7002:: with SMTP id n2mr24146373ejj.286.1568107468501; Tue, 10 Sep 2019 02:24:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107468; cv=none; d=google.com; s=arc-20160816; b=NSAOCuUbRw+LbkRHRrI8zYgBGrxcBd5Siy6AdfXZT44AXPRbICbAw21McdR2FdaSjh FpBlg5VxvHFkE9cVaCfmXfiB8ajkcxs0nF9+JjPqpbc15VetXVMeFb9CLbtBxre41cOW ycz/ThS+aWO+cwhAtSCQwx4s4Z3t+Upw0s9+FsqboXeUH22oFx5SGTfyhNi2wEUxbmqC rb5vRESCtfoYoaAidqvrflk5X2jLZwUJHngtgsuUm3v9QaqSPFRYHQNzyZ9QKCdnP53H vWWQtC4oCNTjo1q34FXwwfCX0NaV8Bf+KO14sFiqk47mVSqLh5bZ8bfIdslH5c4TMqzl eWag== 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=w4GW8O3X3F3KkRkiz9wz/TX8TfH1LO9RjHL0INlIqjs=; b=EkiohsBZiAhAXcHpzeYFkejBHv/LhaoyjMa2HA7COBW1sU7u2Obf2B3eOgIdtrjpA9 69PG7MXYxfI85kMQ/9DYOhEwScSzjuumBkDqUjf62DMN+kuqIegkyhqONxUX6RGZ4QEx Dv9eA9EvQVmjCd0QmUQQqhT2P4+/Ks2fLQ4ur+5eXgu3UKS7Him0sHyW55LMvlPb1mFs n5fkjj7ssxA5ooxGumAm0sTIc0v1bmdbmMM+KhJh8m4DVd7yfrSQAj4Ye3FXMwlZcjvX GGcHY47S3pGwLYMUF4T3DRTHwYACocbhQ28HwhjT+SUwwF/LS0t5rc4khfqBAUTWvkMM N/Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vfmlnHjE; 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 d17si7679178edr.294.2019.09.10.02.24.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:24:28 -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=vfmlnHjE; 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]:36482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cNv-0000eA-0m for patch@linaro.org; Tue, 10 Sep 2019 05:24:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38974) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0a-0004b9-GO for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0Z-0004pO-5h for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:41475) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0Y-0004oi-W1 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: by mail-wr1-x42b.google.com with SMTP id h7so17457978wrw.8 for ; Tue, 10 Sep 2019 02:00: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=w4GW8O3X3F3KkRkiz9wz/TX8TfH1LO9RjHL0INlIqjs=; b=vfmlnHjE649K/P0jJHtY0/ri3vPVyO7swcvNatznW8G9KdIkriZCDHF9ogVGoIRxAM ZMAjUC7GozgfgNAqUVu1ZSgr4mcgrC8VteF5E9xCl3Mj+sXYF2sE/heNTanNHURLrW8x 2b4p7P8+8e+0FsyiQd3zKY9t2g8IR1pOFacXjls0vAcBUSmCbXCui2v0tmzGFgcyRDw9 p/RltCZ+eZR3OJ6zp3DvOhoCHB7fpddJ53YdCnp/J93vPJfIm7wjLhD9xBjyR5/zzEY9 CbKF/NQh06NUzj44/eARJ1eJnE5O+WUu+4ijk2PQIZWhnA0CRzI9TxDNpumqPMnBtdI0 +AfA== 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=w4GW8O3X3F3KkRkiz9wz/TX8TfH1LO9RjHL0INlIqjs=; b=riw7XSVG4lf778y8kgc0yekpzE2q4pYJaRbpVACFB0HCC3bpbRIrxoY4tSH8IS2fDb vahSSH+wKqEKqPbm14eHk7yaddyukqS0pH8Wrl04aKhFxtPAD7N/IxfBrRkKZ/aVOiQ7 dFnOUcFtUaSCf+oYS0SzDO4e/5Xi5yyt5e+QjhghIdorU7cw1Gpmp9lnnrpNXwg2U9Gy LDydtfXUwX2ZstQyRTAcevl7+Cc1ddRhuMSQqPSI3lM22rm8gO8nqdLVw4KWmtTLR9yI n7Kdjd4OCewBeHEWhtlKb7PKoKmSCxjkgG4pj07V2k0WC3NxPwHv7vfXJEWXR2WvoDGq +saQ== X-Gm-Message-State: APjAAAXXtVyVEwXKjCa/TSTX55nxc3PYktdihsbFA8Tl90ma4EFfjl4+ CiiseBAPxvymmH4LGn0+jfiD9g== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr2971441wrx.226.1568106017896; Tue, 10 Sep 2019 02:00:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 189sm2677059wmz.19.2019.09.10.02.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2E0FE1FFBE; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:43 +0100 Message-Id: <20190910084349.28817-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42b Subject: [Qemu-devel] [PULL 39/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 7d6c63a2803..3d1c7f0d7e0 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 Tue Sep 10 08:43: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: 173490 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5540002ilq; Tue, 10 Sep 2019 02:28:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4nBGdw+VGOSWw6UoBITcEKn1Gd9aNHxegPB6Wa7ri0kq0bicnartOrhnjLFn+Lew7G1/u X-Received: by 2002:a37:8643:: with SMTP id i64mr271142qkd.256.1568107702197; Tue, 10 Sep 2019 02:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107702; cv=none; d=google.com; s=arc-20160816; b=fOn5B7EtvTWxwG2/bs9zYXowxZaGlLhmiTf+OW84+G51yNBy0VgRhAZaSEosjwpxjR bDYG812gvtUoeHyr/3yOS06yvaCTVrJsbgav+YpAVTlM2LvqCYtJHPjWqxDLWCJEgsVb Oej3mGRyRNcicEbRmMECLlYA33L33bhHIgzr3ufmu+nXif1mdA+RV7lPqiYWtamc+/7G nMR9fV7zpLQ08pvL3lRQ46Zi4zqrFwMydRDc3q397aZogCcBr+GS5C35hzPZDA89khLX 8kQAR3jgUXAI8PFF7KHKHtMOIVDkPS6tSCJ6yJH3v5PgXWsFZJicqtzxw0In2d3/Zhgf htZg== 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=mWFw3drxQFdjCgGDCtjzGJodYnXOghm6SEi/8qbmbkA=; b=h6WdGbpk6I2nsDwXwblDV9I+aKhtRQttHJQCZMHf1DDMBrthpcumY0JSBm1P6sfdVb Yz5SUv/wvr0cMU0l/mRB9fidER+5rlwMR31+iTjD6HHZFazqwRzC67IWnNkpO4aajzD1 D9CAE+dWthQu7+x/kXhV9oa2QQs7VMsYKvuTEKFghHWIQ6huBgv4n3g/Z3mfsK//qzcC TBZXYGu/z5gBgw+zg/Mj+lyyr4Su8hQOzyqz787eC+T9ndOCg23++kkzCKmsmepXGNVq 0ttOMcnbyfBNQZatraNblfAJ2KeYmeACvq/djOdL0wGlAbR1xnBdSdCvBu5VF+iUXx0L gADA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EbUl0L0k; 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 g20si13103979qtg.313.2019.09.10.02.28.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:28: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=EbUl0L0k; 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]:36546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cRh-0004QQ-Gc for patch@linaro.org; Tue, 10 Sep 2019 05:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38982) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0b-0004bv-3z for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0V-0004mR-Ac for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:38587) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0V-0004la-3H for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:15 -0400 Received: by mail-wr1-x436.google.com with SMTP id l11so18468741wrx.5 for ; Tue, 10 Sep 2019 02:00:15 -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=mWFw3drxQFdjCgGDCtjzGJodYnXOghm6SEi/8qbmbkA=; b=EbUl0L0k1hyhXsEGc45gDxW89zIMcVLmr+7Nxp5nphkEgYDWKjxptelhHGNvGp6HXr J5qQ4jEgG3AkkpZGTJ9LzKzS1wV6Mv/FZfMk+Z9BCkD28nAq+yzxdzxn+usgF6jkuTF6 J2y7FdESmAV8aUa9uJMfb87R8X1noub12ktAjec67pOtxSwp1m5O4JPrpxC0HO5V/p2Y a1a+nmnhwom3/eDbKv4fsc7EA2rkSuKjhU8Fa0CcK9GeRHEXfAHsDsT/+e+060e4wrtI P2bntidNJgHNOFwC++aygAWIgQ/S+DDP3AVCj6/NxPO31LaiJ5BZoZZHsmMsTfrbKrJk G+HA== 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=mWFw3drxQFdjCgGDCtjzGJodYnXOghm6SEi/8qbmbkA=; b=df/W4K8Jf4o7OQCib6qsoOpbNSOjEdaLkRVG5Tv96lSksiWNxECIDkz7aQeOl06XTi milwZa1Eenj8EKmh+GsmgHRRsc1HpsWTLEgvOCGWg9RKV8cHL85XTg5eIzqXYS/2J+hJ fA3JDIUV0RRhBWAsyfC0h9NZ5v9/ky7+5gWzxQCjikjnKf4JMtThuGng9fGJiOHaK/ye Fo4HChVgaehRKc/DifnmGv5IMX5j47G1DLck3Wm609b5QbfWeaBdoCiMCl0fi9xYTuYT 3ZjmgZqnfBZKZiXEevT5UIZDHfFxaCHAJxlk6+3a1Q0620ALY9hd6vDVMwog3TdlJSiv ay4A== X-Gm-Message-State: APjAAAWvTTM+4uNZEd1obymIYfQ80qu5biQt7qubhJc8d0irGhbcnheR j3xot79v+peE1lbES+p6JA+LAw== X-Received: by 2002:adf:f406:: with SMTP id g6mr11905113wro.325.1568106014033; Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v6sm3475371wma.24.2019.09.10.02.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 433F31FFBF; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:44 +0100 Message-Id: <20190910084349.28817-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::436 Subject: [Qemu-devel] [PULL 40/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 3d1c7f0d7e0..51c7d19c071 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 Tue Sep 10 08:43: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: 173469 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5521985ilq; Tue, 10 Sep 2019 02:09:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjwOC6H05MStg4z01Sb9uSuGKFgAcgMOD3InR7JH8VJL1iQWkAwQcDljXaKhpYa61JzEFZ X-Received: by 2002:a37:b1c4:: with SMTP id a187mr28310938qkf.332.1568106556328; Tue, 10 Sep 2019 02:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106556; cv=none; d=google.com; s=arc-20160816; b=XnIDr46YBqLwWUHaJkyoXWBaAW4v5ZyXnFvq5EUfHRN+cWNWEQRPan9fef0a3UplX4 exylxBZDm/jyz4SUAZ9Wg69Zz9BVjLBfMNJcUXlkkJgfdquyqSvowjd9aSCd5Pox7WE0 SWI3dMBfdXUqC30hoFfB2qIsoj9MJd3jJMOhKZFCFo/KUU2fyLVN3JMXCn14uaJG600w FTcC/r4trV3nGkMxXi4oQ15jq/g671lcac1CQBNBIq6PC8QStgfHos9XqaAChteBTYEx OdrhVDIm5swLrTz2tm4KxafkrFkgZEP/Lk3QjSexrfl78Jkh/MfP/YZFhCV/tZ4l5/FM 941A== 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=uAN7rc3XuPCMzWFwqeyrIQC5X91wCicNm0Fvw4/6E2E=; b=TAlH3Qf41LT5dWdTsVpwx5Q72vKwfEKtkz4idM9qi1zf4N7nUnCen0QLkAPL+X4ml6 0IbVgK5PRC5krXJkCaJS212DqFimaeW3SUCcq7+jZLhZorh2+W1adZbTU6M37qQ0A99y yys2H7jPa9jFxdI9IvUFfj0RMAY3Ljv9V/SJRsND4NX6QYppX+ZI92KROIGv6PkxuC1k CF9ZMIg01VFuA4YPK+QUdmxbLNxBNJr+y+kdYvCVtwUD8RNhH/bT/08pMLfsw41n1nvr GXwdPCfYMN1dZ+Wh0Kwv/dPiAvmyxRACfApRwZch1y+mQpNNZIFCSuJSl9TTUKH3McDB zKzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=C8zN5YF2; 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 j5si12423399qkc.326.2019.09.10.02.09.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:09:16 -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=C8zN5YF2; 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]:36186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c9D-0005G5-6a for patch@linaro.org; Tue, 10 Sep 2019 05:09:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqp-0000eD-6i for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqn-0000Xe-LE for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:14 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqn-0000Ws-DL for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:13 -0400 Received: by mail-wr1-x430.google.com with SMTP id g7so18461940wrx.2 for ; Tue, 10 Sep 2019 01:50:13 -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=uAN7rc3XuPCMzWFwqeyrIQC5X91wCicNm0Fvw4/6E2E=; b=C8zN5YF2bIZOiJufd/kkJiysepEecK5RksYzGW+69AD94dU5gkZMuellz18zv7ca2r 72ZYZrSdqvIrNiiuLk1BBX9t/RrEd/y9aosQTuVLNPdus60Lg/76w4vdmf2oPpcc0UwQ CrKM6fiob9VpxS+Em3eqT6TNJ4Lh6ExpZEVlILDeb0MLsvUV//hfU3RUTJMm16iQg1PX JfWJ+NmliFGEGcFT4ulZpbopadqMjf/n2KqtPU6REtRbZF9qjmsDmA1fwh1otWU5t/vD NBJboCMbs0JPcfggegop3Z9cge/GXrshaSU4pI+FnVGfFe+X9dHeciBzbO7/liCC8njG Vt3A== 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=uAN7rc3XuPCMzWFwqeyrIQC5X91wCicNm0Fvw4/6E2E=; b=ntFvb3EtnEtMprq3FN8khu2OSeZLQWchV02YW8/WTVw7te98lHiW+N9XqL8ucCgp29 WYYa8A5ya9V3PEWuXbElewyf+ilt+aCUtEYGBbID+NcvSCGuTB4GQnE7kpIOHc5/44tn INLLKI29NTvsE4s2kN4r9Q0v9B8LG0//oUGhI7pwUvQGix2NOfFE8lTqt4uOuMiqOTbW e8pY//fEgf1uoTyrT/QJk5m4xpXbDtQmocCzcBuVj0VLpugdbTzmBqPabGv+0ymFUU4M QYKgyqv1GSSqJv06cHsAT+RN9FDqJRh9N19smx+2D9ay0ptWUcDc7jF0SDqNH2uM3hb+ e1Lg== X-Gm-Message-State: APjAAAWeJcfQO/iaMjj6iU3bs5qoxhT7E8PIx9u93zJl3YdP/nb/j2El IziAeWlPARQkRNjXflun1nW6SA== X-Received: by 2002:adf:f284:: with SMTP id k4mr9706420wro.294.1568105412064; Tue, 10 Sep 2019 01:50:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b3sm14403871wrw.4.2019.09.10.01.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 57EB21FFC0; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:45 +0100 Message-Id: <20190910084349.28817-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 41/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 51c7d19c071..d2da12580f3 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 Tue Sep 10 08:43: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: 173471 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5523554ilq; Tue, 10 Sep 2019 02:10:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpiN9sHYdm4284ZpcBXvriMvGI3+PX86gQeHerdvqb3UGxjzq0QeNjDdr5Y3Kzb23JC8mO X-Received: by 2002:a17:906:c401:: with SMTP id u1mr23982759ejz.254.1568106647664; Tue, 10 Sep 2019 02:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106647; cv=none; d=google.com; s=arc-20160816; b=p9zU7xSSOdW+Azq55oWvnvBHNGZOJ9yPLlU2aHYF47aG5dbkZ+SE/Ohid/kR3D4d+p MxYeA8wghoVpjHYzSVWBfExLJQqBnJqQaB9ic7JI9umYT9A1hnTjaV4p0hk2dHmHu5jc R9LtMXqpip53OOFle0UYimC0rhAnlWsYz00X1XIzTyV89uk+E+1UKYUg7h/pmuN3l2JD TDZqaPr406gmoxUF5MBerzIfPykF6DtZZiv/qddRKLqXyAyLEZaje6S5ycCpI73lF6+1 1ZJ46OM8GvNopY3l+Fr73gC7cHt/owMkfXYDEjRK1ztL2/sH8x+8NG+GfLajuMa1xtij ApSg== 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=GNd2ZKncMfCUSVKpijAHXvsP8/P4bKfNh6VELcXjcfM=; b=Vu4PXjygLz/sGzxhejsUShashexprG5es2eHeflQGRl73iOyHkfvOAnv/2BONvYfjG h1OfUsr6i6WFXVcmRfn4AOwAEjWcxOVkH4otB5rSEyDCF/iJCaxOsIQ8iceRl+lfFPP8 EYRspSwiHXL2vc/5rSv+PCO0GL7t1VFWFj1mFj3v3hmWgzeuZC8//YcSZqPtl3k0oh2t nN8C1DZgqNi9twXGGLhmqkylX10w4oE9J3GZmgOoRwL67kOMhnTXIZCsojPqV0foAZ2N 0Q6zK1jSIjpKVrF8u0r3lDaIwOT8qzuIxOk4qjl3x6y4fNpYYfg5JkitJ++sKDBZZxvv Z0dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rnPmBxMp; 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 qc15si8935258ejb.255.2019.09.10.02.10.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:10:47 -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=rnPmBxMp; 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]:36214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cAg-0007R3-5q for patch@linaro.org; Tue, 10 Sep 2019 05:10:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqp-0000et-M2 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqo-0000YQ-Fw for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:15 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqo-0000Xi-9I for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:14 -0400 Received: by mail-wr1-x432.google.com with SMTP id k6so6264231wrn.11 for ; Tue, 10 Sep 2019 01:50:14 -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=GNd2ZKncMfCUSVKpijAHXvsP8/P4bKfNh6VELcXjcfM=; b=rnPmBxMp0EDP43bQOIjGDCrXLzosyMdd0JG3AHGpRwvOAaZwN+j3C4uzXl4pnPFhh0 EQ70dGdnhQaIpp7I6DHmQ5MN7B64IIsPwg/ta/NJN3RzHLfCIJ77u/lZe1dJps1d8QYB PLqBXcvpcXqpCYAlPBnOirShYRUm8cw0SpbLagW+4JZmsUPSo+rhTWDdfiizWiGeN/e5 xARnI2WtjTnz8o64RBAWQuvJCUfZrX6WBnrWZLESS8DIM5EyOlos8t6UUGbKlOLncQqr KLPPvT5KW/4hmlVch/UCeqt5/82GOz1Ylj7XGDal7wyEHUoPksXacqke0r8Qe7n2hFBq z+Hg== 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=GNd2ZKncMfCUSVKpijAHXvsP8/P4bKfNh6VELcXjcfM=; b=JIMPb7KhSOgGRl9Hk0wpSoK/OgwYb6js2UBTKSbq4xfUbsa/EVBoz/isTmig7CQPMy IqLYoOHeckKx0i/ChUBsvsY2QJEYiL+4tJnCn0Dy0b/4fvq2S+QoqQjgULp6hZF1yEiI uiiHCFfTGv+PUvbGxtjfZsBMbWdDfvKpeMliG6n5zycoluublhxSyXSq3boOaLFNO0Lo ztjDf9rI+nuOG1qQDKhM+fo10AErO5obT6/rHA24iz5j9uHsXlI/Q99kqUX6Vh1L/1uK BitcaLzbOvy104Lh0/o458fyS6nMGcvNdAMw7WYHxQGufErInWrW2qPlt+WzzxJ1jftE TqJQ== X-Gm-Message-State: APjAAAXHsFjFjGrIf7JFYefGV8e7MLQTYl6KMxXNkRS1ivJNoCdzOmQN NkmUwSPb8eTSdgZLCEFBYbJQbA== X-Received: by 2002:a5d:6ac8:: with SMTP id u8mr24669749wrw.104.1568105413205; Tue, 10 Sep 2019 01:50:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q14sm36461356wrc.77.2019.09.10.01.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6BDBA1FFC1; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:46 +0100 Message-Id: <20190910084349.28817-43-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::432 Subject: [Qemu-devel] [PULL 42/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index d2da12580f3..74f10d352fe 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" @@ -317,8 +327,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 Tue Sep 10 08:43: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: 173487 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5535650ilq; Tue, 10 Sep 2019 02:23:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzl1U9Lmona7+0hP5k4RZl5xzPxDbZezF41jiFqLZCC9XyxMDhxtUOligSk3lEBDZhzzjVg X-Received: by 2002:ac8:160d:: with SMTP id p13mr28396369qtj.189.1568107408779; Tue, 10 Sep 2019 02:23:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107408; cv=none; d=google.com; s=arc-20160816; b=DRDcWZkjc5zPEpKnogxJ7Qf5iDdQBgKoPQjDNt+cUIcw2vo2CnJ+C83+Vey1Qw+TrA gLp0FWPQIlC4o+50bfIIKcvj50J2nl5lTEyIQZPDcGcs1inPl74/wZrrruqOGKQxa69k xijYc5QBbzBrOt54LBy0gEtLPfcfJ/R4rTJUpj7QybxI0Wf+6pu3R3nsFEUleMOp1SSx R7hXylekmuzX4y01H2heBpZ/kibN2/6eaMasbmKg9R8kGvNdveIy7hL0fQgupR/1FVkE SR3V1yJpG8+OD2o5inzVruM6NisiAwYJ8nlokfydWAsQiTKdIB1lbk9W4UJIOG/cuP29 0t0A== 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=y2CQYPgfdIziwHG+aXAJVzgAz9y8buKOTbwwFzIZ8YU=; b=K+e8dnPqECjt433CjlWV4R20s1nqvDRBpuCXwbAZfMTnLuafIyAeWy78KzXERpn+Xs nRb2Y4ceOcbXarq3fPZNHZxIrqiZOHIu26fAXBAH5skC5LZQvyK2NJbRF2r5XV5YHVUQ pAo2pTDFhqaGbnUmMP9OIk0+Dky/kGgoC0TEUXrYI71fBncihDGAOCsZ8zZu2+UPrLSf BKMFYv2vvrv1TY/nfjK+G3sgg8T36yk6xRORqHOaxwx+3sd9fXZXRrRDa81ct8ebNxrV wFGYb19oDikYUQI96kxGGxCTdnPitqj2lL0Dei0QHgpF75I6gB/gLfJWdtzLx9y/lvxI 9/nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ti3hs7Tl; 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 m47si10510192qtb.27.2019.09.10.02.23.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:23:28 -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=ti3hs7Tl; 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]:36452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cMx-00077X-L3 for patch@linaro.org; Tue, 10 Sep 2019 05:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38958) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0Z-0004a1-Nt for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0Y-0004p1-L4 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:40338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0Y-0004o8-Bj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:18 -0400 Received: by mail-wr1-x433.google.com with SMTP id w13so18473145wru.7 for ; Tue, 10 Sep 2019 02:00: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=y2CQYPgfdIziwHG+aXAJVzgAz9y8buKOTbwwFzIZ8YU=; b=ti3hs7TlPxkpshkDnKY5agSkhYYGBSJG2gtodAOdpFF9MFdNw0jeopH6g4VQ+pE0BX mlv8z2UQ1RtGdLTn5l3UwbhNdqV7Lq1abh7YHaI8u37bEEumA90+1+6jkBk+ncE6sPQ8 Oba8KRZeGR0TmP5DKZ1PecsPEcQ7SPgz1rvNwqO9sxymuQVtcVpUh8kJPcVRO5t2SRmW P4rMi4zEfZ88kQu/Lt9chXLBLkGsEkXnuHVt85t59zlhpu+JivmTJsjE301w8UXP2U5Z Uo4zOcqNDiSvh2wj5ZhJMiqY9EPesRxUoYHVqsZJDjFqzjSlQ7HIRSwTRaJ3v5rBFzZW A5nA== 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=y2CQYPgfdIziwHG+aXAJVzgAz9y8buKOTbwwFzIZ8YU=; b=S3TplXEM5B8lTospJDHr/3FJ7y7IXFHb9la0PcFhLmdqzKvGYMSNucZjlvbwFpFM/w Fs0YFtKz0cf3v9jhdJNOH23xKxUBs8x6gP0J8jSAFKDiCVm3WYY0mOPXo4H9FlV6pKhr gPa8Zl5DjpAcTm3MsBZzihmQtcduYt6Y6F/zHuvQmxn+58OCwD0yzSpNCy8OjbmElbpb t1RJTQzY6eZo3V5EuE6hU2UhR1SHxpCyFzFjBTMtdFWU7e5qMWrF7pB38t/ltYJ5edAr pGfiz14e+2wyK+RpncSfbDWIRaXplsqXVCjfzGoOH/dmgwCg5UVQHHcsDZweK910Dodw Vuag== X-Gm-Message-State: APjAAAXXuqIz674QQ5vnpzAjGnL2+fsvj6P8jY0k/r/XSLRrFx5hU1ND Hat8R78ULNmapzX5zGaQBbZIsBNY0rA= X-Received: by 2002:adf:e992:: with SMTP id h18mr336729wrm.319.1568106016494; Tue, 10 Sep 2019 02:00:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm15013356wro.32.2019.09.10.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 802421FFC4; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:47 +0100 Message-Id: <20190910084349.28817-44-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 43/45] .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 Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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é Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 74f10d352fe..1ff26205795 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 Tue Sep 10 08:43: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: 173459 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5511818ilq; Tue, 10 Sep 2019 01:59:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+fAHEyZlCKeyCXWXGGwsQuHnFvr6ESXSdnw9GCsTRZG4I4Rr6OH1OvTMJyns6mMEKdf6M X-Received: by 2002:a17:906:814f:: with SMTP id z15mr23576528ejw.13.1568105988839; Tue, 10 Sep 2019 01:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105988; cv=none; d=google.com; s=arc-20160816; b=A2/rr3Yln6JDkkdoYvlnnrquow0Zab4ipBFZLt71+2u43Kb9JF6C/KFBZY6Nhf7Tff WYIu7eVCqGMirCofScpgO2C2XKjvyWPH7xwF40Dy3QodSdR10xLLOhsHDNCN0Rn078tx 7MrIRsH6a6B6GXv4LHkQvN7bzaoWuFewo6bOX8ucTzhcugIK40x6e4nAwFkdMECsbYPo miLaQJxSzeUbOxw1IkHVDxaoAzGayUC2WnZwIvcy+2CZN/VvO0AXMq6+VBtsEzfHItyQ 8BoyI6OfWWwcMmNhE+Q7UprlVw2atBNPFOnB/SV17iaFFJk1SX2dXb1z7/a/un1odW/Z P3ng== 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=XZ6K4vUbyReKzpC03BdsNhH31lJ6dRz1tPBlaHFb3eo=; b=R7jlUNDHarxgob2t5g7fjr6/hJ3kI96dWzWTAz7XEfhY/5a/HE/OqnO8EXrG0zyCMP ur0Vqqh//0hWmlba225dDcAuD8CnGmV+qusjQxjuuE8FCgCBEThnIbRoFDNLu7aL7O59 22QrZMA0oQsqbq6mKyqQeHNC6/+xVUXPC9RCz40zCMwrReBKa/tH9DYmvGEFhbKiKdP9 YdeqEAh9jAs74fAeTUxEwn+JI73L8pLnBiuyWZ/qxF3jEDvAyGrYSs8IijnhHAvTB6Ts zp+YJaH5HxsBIQP3g8NpYZkb9k0UF8+cZxIB8BjRmTlMbkTnU2t+RIZ3Z737vIe4ntb+ ZVzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iVfN9MxX; 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 h42si10463661eda.90.2019.09.10.01.59.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:59:48 -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=iVfN9MxX; 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]:35956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c03-0003e1-B0 for patch@linaro.org; Tue, 10 Sep 2019 04:59:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37214) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqs-0000j3-Dd for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqq-0000a2-F4 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:18 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqq-0000ZQ-7z for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:16 -0400 Received: by mail-wm1-x334.google.com with SMTP id p13so574206wmh.1 for ; Tue, 10 Sep 2019 01:50: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=XZ6K4vUbyReKzpC03BdsNhH31lJ6dRz1tPBlaHFb3eo=; b=iVfN9MxXXcdHroPlOO0unpD6eNM04ozUZgWucrfY71JHufO9hy9d/qKoCzfXLc691M YmaNXbIypx919a/uRA+t9zXx0Aq30bwybV+t/J6S5UjjTY1KxK/bctKIkoT3OlON+60s p3cSVtdRllaqIAzkPZqM2A/SithIIbTseA2fsErgBCPXFemY0Jd2Jb5owKUlHii+5y+J mTMwPn93C4DghlEtTEobZo0T4cZB7squ5x2t4B1yNcp6F3ZP0FozOFfTJtJXHHgVLx/h OOorcQIu8M1TRORTrjEUzACDNNn41WId/QdJ8N203SNfTkpMdV26hlX20SpXty/brhVy nJGg== 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=XZ6K4vUbyReKzpC03BdsNhH31lJ6dRz1tPBlaHFb3eo=; b=elHY+b4NytkUPwFWPZ/oaEWdP4WvXWQCWdvMgHaSndXT+k/CgDAXTLkx5zfujkeFQc KdNTZB+/oPeC694nTysy9Mcj9WQbLVs80jEY5wB3E8FWhIETeRapWh4WnYXwfDuwMTSQ Zp8d4cJZWa470a+kminYhSwh3Cu74TMjpmVcPLaNCiVn5OvMobCVYII4HOUnUYpF8cjt ADfqUYnKCL/6eGlhai6aUIn71nZyWpFTirvGhkP749rxtfgcYOF9VP+aGSc1zujMaVhd aEFDhHt9hE+w3CdAPu/6FXMv8fDX9VJkZWhEXAVUy6deecH9S0fkKyu+gk1xJSvUyOUI MjVQ== X-Gm-Message-State: APjAAAUW+//sDivF0+q9VSLXR03xcGtZdr440PMtIhpC3vKh05hCihIc dCX7FOwuCKssN8IFFhu+bKKKbQ== X-Received: by 2002:a7b:ca50:: with SMTP id m16mr267509wml.158.1568105414866; Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f186sm3582355wmg.21.2019.09.10.01.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 982801FF91; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:48 +0100 Message-Id: <20190910084349.28817-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 44/45] 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: Yash Mankad , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= 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> Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/qemu-doc.texi b/qemu-doc.texi index 4d828a5135f..b47e89cfca6 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -451,15 +451,15 @@ of . Example: boot from a remote Fedora 20 live ISO image @example -@value{qemu_system_x86} --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 +@value{qemu_system_x86} --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 -@value{qemu_system_x86} --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 +@value{qemu_system_x86} --drive media=cdrom,file.driver=http,file.url=http://archives.fedoraproject.org/pub/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 @value{qemu_system_x86} -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 Tue Sep 10 08:43: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: 173470 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5522742ilq; Tue, 10 Sep 2019 02:10:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDBLWUMLgZ4UD6LvH9Hr0aFGbXDyYHsBg44ZhpVlQZFDrgrCe4x7xx4FpzjZlTuSa4sgtk X-Received: by 2002:a0c:efce:: with SMTP id a14mr9959698qvt.208.1568106601796; Tue, 10 Sep 2019 02:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106601; cv=none; d=google.com; s=arc-20160816; b=X0JJwiXxwoXhgbr+m7K2mfDP9xfbM9CSsf9qP8NDszGEfHOWhnMU9FowfLSM+trvWA ldizzT01WddjwXw7SKFENPeJyh1sGJ5j6Y+mLB75T8CqtFnAtewqM8+o+ID2qFPJ0Vuu 8f/bMlRc2exCFpVyBRNQXCa0mJ4k82eh5KMbM9FXny1v3zgITzWYufOa0NT3ag4KMPAX UYzwvgK/UPVdKQ28V5WmBESHzvEFKJxPSarz0FWOTAOCh6D/NMQfY143o2biGN+wf6gP nXJ36RxlsSNtFKyoECAerqbvnkCLpP0JbKfNmInojABWpbmHTZ5G95woNMDvi3wBrrMp ACMw== 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=SR2u2Njn4Tu4kLUbOMpSvZxbFz5v5AyikcOmiSFMewo=; b=hLJZL/nkNf/Ix6NFo6Wv6IWsA0JQhVMfpbMqxrcDRr2jXZhMptAEBMqVHv2R1M2dBV AZSSf6XAIl0OqGF/Z0x4PAUsAYrHSLb5Vl8bMvgMF4E7w7ogdOdLiebyVF9LRGzFAwQT ikHZ2aHCk4bd76H1RUHgI6Pplr0REz9xsMrgEjLnG9C1oQoP8mgBU73kzCY/+M3pB2z/ ZD29xycv5BSi4En1SXquVNkix6tLUdRDfqeb0nC8tCEWHT9A/Gx687VFBYacocltTHc+ 10S+t26aJdr3NI9LvJBMa24tIuCz4m1iLvFYzWIso43DhT0msU7MyuFyjiY0w+DqFspJ I7vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OcR+lngg; 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 p11si224413qkm.283.2019.09.10.02.10.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:10:01 -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=OcR+lngg; 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]:36202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c9w-0006Ou-Rx for patch@linaro.org; Tue, 10 Sep 2019 05:10:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37349) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqz-0000sk-Kw for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqy-0000ff-LC for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:25 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqy-0000fF-Es for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:24 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l16so18350541wrv.12 for ; Tue, 10 Sep 2019 01:50: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=SR2u2Njn4Tu4kLUbOMpSvZxbFz5v5AyikcOmiSFMewo=; b=OcR+lngg+nBYtk0Cexz9HssB64Nm7X4M5TOSGYSqfFfT/IRiCn668EnmUsKqaOic1R Av0qcdhL3CWw/fgAjOustWmnGem9BiTst9vzdv2dQ3QxpdxHtCdd3wkZ9NkfIa4A3sQa UPcsK+2jBak6B8S9ECkTtFiSnZmzXm+cRPSguLEFdlQ3KvjpPs67PgSNu35/558HbVkR luhVgpsfotOEvo/oYFfn+q1dqrhTgBXhLb9mA0VCazlRY8tYD3oxoTG6aS6JZCvasfGA iYKNKHGtU6qmJ+OiJVPZRQUKGpT8Hy+OcENdcRQculGIEdR3wcO3E02iMK2oLI5m/5vG sydA== 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=SR2u2Njn4Tu4kLUbOMpSvZxbFz5v5AyikcOmiSFMewo=; b=OaHL6zhJ+DovKy6tnsMXOe33hpe5ZLeZdw3ysRz7EKbD/EqOGVGuCmDW3Osfd2e2T0 hg0zuTxZT5eaXm0sOv96pUQ8PO5ApJW4AgBJsL6CrlyVxkc1Ciwn8VteO9e6l4VX0J6K QIJmzvIzc6L3D/HQ0v957N4bWQXaloSkguxbBEtlqTZSNVOAezsE3a6gsifVaLnZ2hUF 88VAePiEmdcY6IPLLBImnCJoc5u1BSVV2AocI/sGVeFzKtYPWTK8xCWfM4jWpsbCa2jP 5gN6FF/iXNu/3RY/YV2XksJDAgPEMH4rts23lG0hmQ5vfChqESp9ysDhu5qzXDEdpmwS JCBA== X-Gm-Message-State: APjAAAVZ2MxlQYbQ78k9+ki8eZQ2qINdKm9hCb/ICY4nEUYj3vPw86AD 1fdpOufZf+Q1r7nzqp+5hpO7OA== X-Received: by 2002:adf:eccd:: with SMTP id s13mr25287666wro.288.1568105423473; Tue, 10 Sep 2019 01:50:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y12sm9499221wrn.74.2019.09.10.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B06A41FFC5; Tue, 10 Sep 2019 09:43:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:49 +0100 Message-Id: <20190910084349.28817-46-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Greg Kurz , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth So far we were not testing virtio-9p in Travis yet, since we forgot to install libcap-devel. Do it now to get some more test coverage. Signed-off-by: Thomas Huth Acked-by: Greg Kurz Tested-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190905113346.2473-1-thuth@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 1ff26205795..d0b9e099b9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ addons: - libaio-dev - libattr1-dev - libbrlapi-dev + - libcap-dev - libcap-ng-dev - libgcc-4.8-dev - libgnutls-dev