From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com,
richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org,
stefanha@redhat.com, marcandre.lureau@redhat.com,
pbonzini@redhat.com, aurelien@aurel32.net
Subject: Re: [PATCH v2 01/12] tests/docker: move most cross compilers to buster base
Date: Fri, 31 Jan 2020 16:22:36 +0100 [thread overview]
Message-ID: <0d238467-022b-0024-ac40-452b49361fe1@redhat.com> (raw)
In-Reply-To: <20200130113223.31046-2-alex.bennee@linaro.org>
On 1/30/20 12:32 PM, Alex Bennée wrote:
> This includes fixing up the dependencies (Which were already wrong for
> one of the mips variants).
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/Makefile.include | 16 ++++++++--------
> tests/docker/dockerfiles/debian-amd64.docker | 2 +-
> .../docker/dockerfiles/debian-armel-cross.docker | 2 +-
> .../docker/dockerfiles/debian-armhf-cross.docker | 2 +-
> .../dockerfiles/debian-mips64el-cross.docker | 2 +-
> .../dockerfiles/debian-mipsel-cross.docker | 2 +-
> .../dockerfiles/debian-ppc64el-cross.docker | 2 +-
> .../docker/dockerfiles/debian-s390x-cross.docker | 2 +-
> 8 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 19dbe26169..43a8678688 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -91,19 +91,12 @@ endif
> # Enforce dependencies for composite images
> docker-image-debian9-mxe: docker-image-debian9
> ifeq ($(HOST_ARCH),x86_64)
> -docker-image-debian-amd64: docker-image-debian9
> +docker-image-debian-amd64: docker-image-debian10
> DOCKER_PARTIAL_IMAGES += debian-amd64-cross
> else
> docker-image-debian-amd64-cross: docker-image-debian10
> DOCKER_PARTIAL_IMAGES += debian-amd64
> endif
> -docker-image-debian-armel-cross: docker-image-debian9
> -docker-image-debian-armhf-cross: docker-image-debian9
> -docker-image-debian-mips-cross: docker-image-debian9
> -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-debian9-mxe
> docker-image-debian-win64-cross: docker-image-debian9-mxe
>
> @@ -118,12 +111,19 @@ endif
>
> docker-image-debian-alpha-cross: docker-image-debian10
> docker-image-debian-arm64-cross: docker-image-debian10
> +docker-image-debian-armel-cross: docker-image-debian10
> +docker-image-debian-armhf-cross: docker-image-debian10
> docker-image-debian-hppa-cross: docker-image-debian10
> docker-image-debian-m68k-cross: docker-image-debian10
> +docker-image-debian-mips-cross: docker-image-debian10
> docker-image-debian-mips64-cross: docker-image-debian10
> +docker-image-debian-mips64el-cross: docker-image-debian10
> +docker-image-debian-mipsel-cross: docker-image-debian10
> docker-image-debian-powerpc-cross: docker-image-debian10
> docker-image-debian-ppc64-cross: docker-image-debian10
> +docker-image-debian-ppc64el-cross: docker-image-debian10
> docker-image-debian-riscv64-cross: docker-image-debian10
> +docker-image-debian-s390x-cross: docker-image-debian10
> docker-image-debian-sh4-cross: docker-image-debian10
> docker-image-debian-sparc64-cross: docker-image-debian10
>
> diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
> index 431e947ebd..3b860af106 100644
> --- a/tests/docker/dockerfiles/debian-amd64.docker
> +++ b/tests/docker/dockerfiles/debian-amd64.docker
> @@ -4,7 +4,7 @@
> # This docker target builds on the debian Stretch base image. Further
> # libraries which are not widely available are installed by hand.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> RUN apt update && \
> diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
> index 15378f8ea2..e3794a61c9 100644
> --- a/tests/docker/dockerfiles/debian-armel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armel-cross.docker
> @@ -3,7 +3,7 @@
> #
> # This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> # Add the foreign architecture we want and install dependencies
> diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
> index 4a20af6fe1..e163b8b956 100644
> --- a/tests/docker/dockerfiles/debian-armhf-cross.docker
> +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
> @@ -3,7 +3,7 @@
> #
> # This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
>
> # Add the foreign architecture we want and install dependencies
> RUN dpkg --add-architecture armhf
> diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> index 2fca112405..453b53ef72 100644
> --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
> @@ -4,7 +4,7 @@
> # This docker target builds on the debian Stretch base image.
> #
>
> -FROM qemu:debian9
> +FROM qemu:debian10
>
> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> index 4abf7832ac..3b6e975c68 100644
> --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> @@ -3,7 +3,7 @@
> #
> # This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
>
> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> index 9973df9ff7..cd386f01d9 100644
> --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
> @@ -3,7 +3,7 @@
> #
> # This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
>
> # Add the foreign architecture we want and install dependencies
> RUN dpkg --add-architecture ppc64el && \
> diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
> index eb73c98855..43fe59836f 100644
> --- a/tests/docker/dockerfiles/debian-s390x-cross.docker
> +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
> @@ -3,7 +3,7 @@
> #
> # This docker target builds on the debian Stretch base image.
> #
> -FROM qemu:debian9
> +FROM qemu:debian10
>
> # Add the s390x architecture
> RUN dpkg --add-architecture s390x
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2020-01-31 15:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 11:32 [PATCH v2 00/12] testing/next (with build fixes!) Alex Bennée
2020-01-30 11:32 ` [PATCH v2 01/12] tests/docker: move most cross compilers to buster base Alex Bennée
2020-01-31 15:22 ` Philippe Mathieu-Daudé [this message]
2020-01-30 11:32 ` [PATCH v2 02/12] tests/docker: better handle symlinked libs Alex Bennée
2020-01-31 15:58 ` Philippe Mathieu-Daudé
2020-01-31 16:48 ` Alex Bennée
2020-01-30 11:32 ` [PATCH v2 03/12] gitlab-ci: Refresh the list of iotests Alex Bennée
2020-01-30 11:32 ` [PATCH v2 04/12] travis.yml: Install genisoimage package Alex Bennée
2020-01-30 19:04 ` Thomas Huth
2020-01-31 15:56 ` Philippe Mathieu-Daudé
2020-01-30 11:32 ` [PATCH v2 05/12] .shippable: --disable-docs for cross-compile tests Alex Bennée
2020-01-31 15:23 ` Philippe Mathieu-Daudé
2020-01-30 11:32 ` [PATCH v2 06/12] hw/hppa/Kconfig: LASI chipset requires PARALLEL port Alex Bennée
2020-01-30 11:32 ` [PATCH v2 07/12] .travis.yml: Drop superfluous use of --python=python3 parameter Alex Bennée
2020-01-30 11:32 ` [PATCH v2 08/12] .travis.yml: Add description to each job Alex Bennée
2020-01-30 19:06 ` Thomas Huth
2020-01-31 15:24 ` Philippe Mathieu-Daudé
2020-01-31 15:37 ` Thomas Huth
2020-01-30 11:32 ` [PATCH v2 09/12] .travis.yml: build documents under bionic Alex Bennée
2020-01-31 15:27 ` Philippe Mathieu-Daudé
2020-01-30 11:32 ` [PATCH v2 10/12] .travis.yml: move cache flushing to early common phase Alex Bennée
2020-01-31 15:31 ` Philippe Mathieu-Daudé
2020-01-30 11:32 ` [PATCH v2 11/12] .travis.yml: probe for number of available processors Alex Bennée
2020-01-30 19:09 ` Thomas Huth
2020-01-31 15:51 ` Philippe Mathieu-Daudé
2020-02-01 22:13 ` Ed Vielmetti
2020-01-30 11:32 ` [PATCH v2 12/12] .travis.yml: limit the arm64 target list Alex Bennée
2020-01-30 19:43 ` Thomas Huth
2020-01-31 15:55 ` Philippe Mathieu-Daudé
2020-01-31 16:14 ` 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=0d238467-022b-0024-ac40-452b49361fe1@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/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).