From patchwork Tue Jul 23 10:35:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169499 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8704164ilk; Tue, 23 Jul 2019 03:38:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5wRvlkBz1nuj9KsmZo0iMncQHLodQvKCk5Yoeah3WSPXj/cX4P9BtGmzw8FrNLLA9QGq1 X-Received: by 2002:ad4:498b:: with SMTP id t11mr55666448qvx.139.1563878283857; Tue, 23 Jul 2019 03:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878283; cv=none; d=google.com; s=arc-20160816; b=vo6sMQ5IncyBl3QbcffuX7b2PPVRQl0ff5F+q+JydriB7mV+v/N3SvCSLRZ0VghiFq saloGgLTx4pqSLgD2XT+5sc5Wv4sf+Vzqbn1wslj89EF1kUxxih/3X2tMN7WLsjbbNN7 3Yvi112fHGI/gKyXVZNGJuWZIwxJNkJjRdDBLewWR9eudfeHegaz/usBEXVAZkKXxP1w sfPEKNZqZNVNS//c0VX9MYXUSqoJWrYie6fSCAxL4hRpfJQIDA2a9ov3Gg1Iot4vNeRj R0VN6PjBOpeAd/A96MBBux6SAC1UqUM9CPN8nY8Rq5vJBsP8cWa5COVImF29MKYoIHZT UVlw== 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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=EJCgr38eW5qSnA1uW8MzPmfUI/EtcdbbNIPMaOqwEVp4wy2wqq3XRIwsjrLTuzxAfr N+ffZYPS+MmxbkW2vDEW0SPalTvZ0Jw9nwJOdpidRvQ3GSMAfmNjuDzsmLIyfXj8A8Y9 3mG1knvJzBSpi7Ic6MFxVmc8PNLgtpRAzyZJcUnE0MtypbpnP5CXrgDik7yR8gqbXQSs l/x4dhMlkUgQPU+lk6runXdRP6xnKivyzvE3Z/4E5/1FDbKTlaaPis9jTBR2Q4WBJn3L j2F0f/OhaCeec24HqA8hkZbOb+P2lo/Ly8/3GUyAGUNrw4UPuh46V1u0F/YzEaox0oV1 fSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hYyChAPV; 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 c16si28873683qve.81.2019.07.23.03.38.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:38: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=hYyChAPV; 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]:41012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsBG-0003Ux-Px for patch@linaro.org; Tue, 23 Jul 2019 06:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37825) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9e-0005ur-1B for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9c-0007P4-IZ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:21 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:37894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9c-0007OG-BU for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:20 -0400 Received: by mail-wm1-x334.google.com with SMTP id s15so16670197wmj.3 for ; Tue, 23 Jul 2019 03:36:20 -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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=hYyChAPVosqUzvnU0FuhghhtkweI/DOLQNcgqrLSCgH1U0T/orzZQX6cafxQToANS4 5RHu3htbPa3o3hlzRs45mhMNWc0rhXGsjSO0Do8QzsSCPDNscwAHrf0e5hlZjHVelEi4 I08oMEsaJH+Iik3zwG1iNfvZtltBrxCidSmaK97KQTPGQ0yf50ihzYIs71wFNIyS3QhG gO72tpJfRkbkLk8Lv4H/UMGPD0C9uQEaknHasPWfx43UdhbpVxSTRggw6b5XclqO03t+ OpQANtuNVJ0C3k1jP56/omtk77BqqUSQqij1fnRWL9LO4gIeHCz0pYuscxMwZABwMGvS as+A== 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=eyW47wPZQjsYoqu7XDv4Zff5+db4gOrr6waWGJroE1g=; b=R1LqD145S26qnYTKhoLdDidwZRYNI0N8u9XTiFDhIz5GBNgM0dgdQvHmcGQd+lrsP8 zG/+Az2Z8/56jJNd6ZzhD/UfNVJQvdN6cydF6g3J5Nkr0srVTJPis9/BF/Vd8TZCnv8z F/I/jq59FtcHHyIvhcTNuzAU5x9AGjtFG0yrLR82sBB1I4Hc0OQ6ABf6m6gtaNuzih3l /EUENktlK3npQ8DvBENVSzVLJHGWjpBg2Tig4y35pmONQHBGI4aDjMpMIKofafPuVVny SiPYhFFrpeFAxf5mNLGBB8K9IZAKm1aHaH2uPgzuEFD3FjDlHhJH+Th40OXydYHqw6w4 lI0g== X-Gm-Message-State: APjAAAUL1UR/lp8wmTdKqDdMf3PG7CLxQtyi1eUgbJjxMBP0+5YDQV5Y TW8igmGmwAmf3kJjr+aKlr/p5g== X-Received: by 2002:a1c:968c:: with SMTP id y134mr67331440wmd.75.1563878179139; Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a84sm50325743wmf.29.2019.07.23.03.36.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:14 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0310E1FF96; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:35:56 +0100 Message-Id: <20190723103612.5600-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-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 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?= , qemu-devel@nongnu.org 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é -- 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 \