1. Patchew
  2. QEMU
  3. [PATCH v2 00/12] testing/next (with build fixes!)
  4. View patch

[PATCH v2 01/12] tests/docker: move most cross compilers to buster base

Alex Bennée posted 12 patches 5 years, 9 months ago
Maintainers: Thomas Huth <thuth@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>
[PATCH v2 01/12] tests/docker: move most cross compilers to buster base
Posted by Alex Bennée 5 years, 9 months ago 
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
-- 
2.20.1
Re: [PATCH v2 01/12] tests/docker: move most cross compilers to buster base
Posted by Philippe Mathieu-Daudé 5 years, 9 months ago 
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>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.