From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, qemu-arm@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v1 6/7] tests/dockerfiles: update the win cross builds to stretch
Date: Sat, 13 Jul 2019 16:56:52 +0200 [thread overview]
Message-ID: <c9409240-3afe-e9ca-0910-8c8ed48ef7af@redhat.com> (raw)
In-Reply-To: <20190712111849.9006-7-alex.bennee@linaro.org>
On 7/12/19 1:18 PM, Alex Bennée wrote:
> 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 <alex.bennee@linaro.org>
> ---
> 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%)
>
> 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é <f4bug@amsat.org>
>
> 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é <f4bug@amsat.org>
>
> 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é <f4bug@amsat.org>
>
> +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 \
>
Thank you Alex!
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2019-07-13 14:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 11:18 [Qemu-devel] [PATCH for 4.1? v1 0/7] testing/next (docker, win-cross) Alex Bennée
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 1/7] tests/docker: add test-misc for building tools & docs Alex Bennée
2019-07-13 15:48 ` Philippe Mathieu-Daudé
2019-07-15 11:08 ` Alex Bennée
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 2/7] tests/docker: Install Sphinx in the Ubuntu images Alex Bennée
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 3/7] tests/docker: Install Sphinx in the Fedora image Alex Bennée
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 4/7] tests/docker: Install Ubuntu images noninteractively Alex Bennée
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 5/7] tests/migration-test: don't spam the logs when we fail Alex Bennée
2019-07-12 11:22 ` Laurent Vivier
2019-07-12 13:35 ` Alex Bennée
2019-07-12 13:49 ` Laurent Vivier
2019-07-12 11:23 ` Thomas Huth
2019-07-12 11:42 ` Dr. David Alan Gilbert
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 6/7] tests/dockerfiles: update the win cross builds to stretch Alex Bennée
2019-07-13 14:56 ` Philippe Mathieu-Daudé [this message]
2019-07-12 11:18 ` [Qemu-devel] [PATCH v1 7/7] shippable: re-enable the windows cross builds Alex Bennée
2019-07-13 15:01 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c9409240-3afe-e9ca-0910-8c8ed48ef7af@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).