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