From patchwork Wed Jul 17 13: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: 169135 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp992147ilk; Wed, 17 Jul 2019 06:46:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzqu+vIP9DLLVxAORZ5Hs5wH0WY4sAuUB3QJqlutw9JZkHolKL49qoxKrySiv1HjceBG4lF X-Received: by 2002:a50:f98a:: with SMTP id q10mr34937085edn.267.1563371169053; Wed, 17 Jul 2019 06:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371169; cv=none; d=google.com; s=arc-20160816; b=utNYo9mMc5hJS8RjasmdJ1JkinSaOBrV6mlTU4qChtepwHDP0LA/6n9wUc2em0VoqI D9zf6M9DI/Oa9CXQAEYbL9U0W2q1NoJmnvV0iDjuZlpzkV9RD0RQWjj3d0vrsHwWCFaJ ebpHV2TiIhbMXix5b6FymD3u0nKzVcV4skz31VuAGgOJ5etR0C9Ye88kUh0FcyDFyU1J BtAl3QPpMvza6hLbGt0fMj71BS2dgukN9LWHR3ZB4orrOkYYWD6HlulqxPT92D82TZ9J zZzjTrx5jmal/iql8jqsbzEFA/egP16qhR2ILjm/h3XH36QeSXVs12GQYG4qVCMXbPSZ YZ5A== 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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=MaT4ONtQeq1p5xmiDjbn+uFq1OU7d5NPn3pLhCn4TUzjy7/CNHBNHGyJhu6iAPAH0v +RCe4M+KEaXqvtX0/GiEg6jBrD4A5lrS5hzMzpdSfBq6cGOes7AZMPJK2xK+BCcrNfzW xIRpCDPoAwwt+aeED/j4HmKKRyni8j7E4rUTG8cyRWh/w7isUjjuwGyhPXqiP85dumye 4xTn4Sx69yOa5bUgAnNYLbQQgB6JnhPW2xgD2C0K4XFx9sdcHaEvbqTAGUtdhTnlgOd2 OL12tL3iUV7A/avkGkpDLYQ3VP6F+rDOnFKmPz/AeVs2xGQaa9uKIShP9QjCrktkPO8l cBJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=giNs+fTJ; 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 q44si14163775eda.375.2019.07.17.06.46.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:46:09 -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=giNs+fTJ; 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]:57334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkFz-0005yK-Mn for patch@linaro.org; Wed, 17 Jul 2019 09:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55377) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkDg-0005AP-O3 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkDe-0004Wo-VU for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkDe-0004Vj-P5 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:43:42 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x4so24867060wrt.6 for ; Wed, 17 Jul 2019 06:43:42 -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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=giNs+fTJqu459Ra85k3rt+TwVJfpMwbneEuiXNGDpEjbfJV3MQDrS0+UJ7rPfSzoQi izJyE3+knowWEAZOcvIRl0yuzQvBjCskG3BeA8M9PnWNXCo7Xq0IvGfk+R0JuROw5EbP JnVELzoUJCMHZOBXM/6a6FNUjp0rUVqNUw+gB0tN1qdZPqWDrlEWze0dp6nrhxsXY0d1 LU9bs2PoaGVeiDA8yoNZe5MfzPTdrGhVG9E4lgOh9uW9Usts7uGnNuj/DMHdjT7xm0Y9 nD9U8txRTRvSen4kej8/u4mvPNuqw6kPnmqiX4qyadV4R0LuzD9v5W6B4/VagV+Iz0g3 4Irg== 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=11ttVeY/tQgpJ8esBqmxS74iEBNqWAWeQN3tEMbd6AY=; b=Av7MPvhZnwMozIA1x00OFONbnsc+PRllxRiXPEaicDqQ1tjRcpS+gdarASmN+6gHC8 oa9wPxRzrzrKdCeVraYqOogKZQCWOUlfgyVSdorQVRKTWy6HZp2v5EsZEzygQheDEzha /NN0JNFArO111nJvxZ9dHWSakG3Ksbbvg5jazFEs+Xv2l817x350Q75pngxK1mlHjdxg ZVNEhQ5kT6PkpBOdS2ALnZuUkNCotdn36DAFifTxfaVXmZsVrim8Io1rrYNTe6xl90fT fyYXTVz19PwLwWquvrrtZpR1uHijqhn2+zK3+8wHsOYgMTtgOiMaVXNOmjT25PvxYsIl zvpQ== X-Gm-Message-State: APjAAAV2HH5jGZAB1d73gJ0rNJ41/MczG3QRE0XvNX9+FTPEOsMrD0lp J+OZ9rKlku42zsp3mFedXoG9Ww== X-Received: by 2002:adf:f042:: with SMTP id t2mr42957217wro.139.1563371021579; Wed, 17 Jul 2019 06:43:41 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c3sm27339337wrx.19.2019.07.17.06.43.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:43:38 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D6EE1FF96; Wed, 17 Jul 2019 14:43:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:19 +0100 Message-Id: <20190717134335.15351-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-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] [PATCH v2 07/23] 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?= , =?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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- 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 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 \