From patchwork Fri Jul 12 11:18: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: 168935 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp741418ilk; Fri, 12 Jul 2019 04:20:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwrHba53iyE255is4tzJY888bvkkbBDsByPFGhLETbSedgI4m3opo05FVjwvWoAFyputviR X-Received: by 2002:a17:906:3612:: with SMTP id q18mr7850649ejb.278.1562930435032; Fri, 12 Jul 2019 04:20:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562930435; cv=none; d=google.com; s=arc-20160816; b=bP5SWgOzyx3geyk1CnHym7q0wRk+hQy5cKbFlJTeW/CMWyVb29c/mUb8kV18p6FhPq P95pp4Gm25S1kiy3t7SGTbfk8yOlrK/Ly2c1x1k9a8pjHL2tSmvZT3rnQ78eneqOMDRc 02KAaMg2HOy+j64liHk3Ye7PBVsQcJM+ko6vijoi97xSz6kn/y9IBIttGH8sFYEi7g6F Zhr4WuCDTCOnVyjP2Z4j/xVJbWAs5M7HniBoTwoL/p+MuxdySABtI5ojdrlzzGHBWugk tKJ09k6SoRSfEZIAGDZA1YF5OOvHKOyKiuq0vhb4AiUuNJaFbXsj1QQ+I1Xo2+u3Q6mB qPeA== 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=uxO/GL57CmfBOp81fuME+ZYWSe7cMxt6tIgwW6mb2xA=; b=vD+E5yNhklRYOO2/YTbKv0gmm8YcLIrM2WNCyeaphoRSEimmDcGBb+TSosGmFWVmdL LEfORqFcCV7513SthG2/7vYer7pGaSZNIFQtKYugSu2lOpoxc0UJdTe5BOzT3CZkIJPz bqStbkVx/wMp8EzFmQ7ypLsIo5i+pp5STYrrqexsS4UA9PW+/M4Rhsa1Qfx7kh/ZFOfg 7rzE/jfcyBEfEhexxGKgJoVbBCqlNYn+EQJiLL6wK/vGV+ftqIE8pZr2q2v9vYK2jj7c Xl+zEC0R4qW3dQINwpfahqFuCYfl2fGUQ/l3JrDgXb5z6dMxqPDwsSJIjSXcDde42xSw /jtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AeqRCv5z; 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 a52si5418480eda.336.2019.07.12.04.20.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Jul 2019 04:20: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=AeqRCv5z; 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]:48340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hltbN-00078q-Vp for patch@linaro.org; Fri, 12 Jul 2019 07:20:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47197) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hltZq-0000Md-2F for qemu-devel@nongnu.org; Fri, 12 Jul 2019 07:18:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hltZo-0000MZ-5H for qemu-devel@nongnu.org; Fri, 12 Jul 2019 07:18:57 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hltZn-0000Lo-UW for qemu-devel@nongnu.org; Fri, 12 Jul 2019 07:18:56 -0400 Received: by mail-wm1-x341.google.com with SMTP id 207so8575446wma.1 for ; Fri, 12 Jul 2019 04:18: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=uxO/GL57CmfBOp81fuME+ZYWSe7cMxt6tIgwW6mb2xA=; b=AeqRCv5zYpzuCpTJpMg7tmsUzpH5yye7pkF5GYa61o1WxdaGWI7H0k4dPG8sRzYx+B cBA7ZapTxvUgmZi3O6IoBDrESXlinoRs65ZHTElSv1FGc7G7Xklptq7zeL/hAvzC4ptF SaQGDjPfLq4BAVGH5Zgzf+lLVXJnvJjC/f57h6veat7zYp2T5wdnfkxwz2/7+XdL4gFn AT4h4aW5P1PxVPiapv6s2LIKDYfacsgpWOWeM986yQmFM8jSIczVeJGo8H8ZbG0iTPM9 a8A+s6LsQV4aolS0VWaAI1sHBKMWbMhk8oIL+M6aK7Z/k6u/uQ3MOlgto5QPM8ECPThb eB0w== 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=uxO/GL57CmfBOp81fuME+ZYWSe7cMxt6tIgwW6mb2xA=; b=DQnTBx/L8XhnHE7e9mOG2D9Km23aKp1VQjHGnHrS+xVrULs5dzWulNM/i4uvQrXaZf QokOG5fP7QdoBEVdevMilt4pLMn0SNKYrnEm4RDBXNqqfp98g//1s6fprkzGplH+d93Q JERxcWCdE9M82L3/66oVASz8oR8I61DiZ/I7jYbnui6fmThsaaZu7835bob21XxzOPou oeg137mqMDm/6udoFadjSc0Lw9bO6q0SrqLRre0WM0B/jcjbulAPeSgpL4G2O/0D6iGA RGH86lQdhYrheBDV6ASfD5JJVxambrFZucaO8NJKYmnAY0rZZTdh9cXya2EzBHN/aMUd gGhQ== X-Gm-Message-State: APjAAAUuaPdWN+r5EQk62ffXjoFbLQV7wYblmeabV1paMYcRhB14p1Hu gOT+e5MY+/j/jz1/ozdcCFePSw== X-Received: by 2002:a1c:d10c:: with SMTP id i12mr9453099wmg.152.1562930334719; Fri, 12 Jul 2019 04:18:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 32sm5552970wrh.76.2019.07.12.04.18.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 12 Jul 2019 04:18:51 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D2C321FF93; Fri, 12 Jul 2019 12:18:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 12 Jul 2019 12:18:48 +0100 Message-Id: <20190712111849.9006-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190712111849.9006-1-alex.bennee@linaro.org> References: <20190712111849.9006-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v1 6/7] tests/dockerfiles: update the win cross builds to stretch 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?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While fixing up pkg.mxe.cc they move the URLs around a bit and dropped Jessie support in favour of Stretch. We also need to update the keys used to verify the packages. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 6 +++--- tests/docker/dockerfiles/debian-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-win64-cross.docker | 4 ++-- .../{debian8-mxe.docker => debian9-mxe.docker} | 11 +++++++---- 4 files changed, 14 insertions(+), 11 deletions(-) rename tests/docker/dockerfiles/{debian8-mxe.docker => debian9-mxe.docker} (56%) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index aaf5396b85d..dbd58e548c1 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -85,7 +85,7 @@ endif # Enforce dependencies for composite images docker-image-debian: docker-image-debian9 -docker-image-debian8-mxe: docker-image-debian8 +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 @@ -96,8 +96,8 @@ docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 -docker-image-debian-win32-cross: docker-image-debian8-mxe -docker-image-debian-win64-cross: docker-image-debian8-mxe +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-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index 0a4970c0683..c787e432454 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -1,9 +1,9 @@ # # Docker mingw32 cross-compiler target # -# This docker target builds on the debian Jessie MXE base image. +# This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian8-mxe +FROM qemu:debian9-mxe MAINTAINER Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index b27985b1b1f..a7068ed6ac6 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -1,9 +1,9 @@ # # Docker mingw64 cross-compiler target # -# This docker target builds on the debian Jessie MXE base image. +# This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian8-mxe +FROM qemu:debian9-mxe MAINTAINER Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian9-mxe.docker similarity index 56% rename from tests/docker/dockerfiles/debian8-mxe.docker rename to tests/docker/dockerfiles/debian9-mxe.docker index 2df4cc8c5c9..5bc8a6d5c36 100644 --- a/tests/docker/dockerfiles/debian8-mxe.docker +++ b/tests/docker/dockerfiles/debian9-mxe.docker @@ -1,15 +1,18 @@ # # Docker mingw cross-compiler target # -# This docker target builds on the debian Jessie base image. +# This docker target builds on the debian Stretch base image. # -FROM qemu:debian8 +FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends gnupg dirmngr + # Add the foreign architecture we want and install dependencies -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB && \ - echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" > /etc/apt/sources.list.d/mxeapt.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 && \ + echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources.list.d/mxeapt.list RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \