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

qemu-devel

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From:	Philippe Mathieu-Daudé
Subject:	Re: [PATCH v2 01/12] tests/docker: move most cross compilers to buster base
Date:	Fri, 31 Jan 2020 16:22:36 +0100
User-agent:	Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2

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 <address@hidden>
---
  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 @@ endifdocker-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é <address@hidden>

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é <address@hidden>

# 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é <address@hidden>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é <address@hidden>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é <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH v2 09/12] .travis.yml: build documents under bionic, (continued)
- [PATCH v2 09/12] .travis.yml: build documents under bionic, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 09/12] .travis.yml: build documents under bionic, Philippe Mathieu-Daudé, 2020/01/31
- [PATCH v2 05/12] .shippable: --disable-docs for cross-compile tests, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 05/12] .shippable: --disable-docs for cross-compile tests, Philippe Mathieu-Daudé, 2020/01/31
- [PATCH v2 12/12] .travis.yml: limit the arm64 target list, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 12/12] .travis.yml: limit the arm64 target list, Thomas Huth, 2020/01/30
  - Re: [PATCH v2 12/12] .travis.yml: limit the arm64 target list, Philippe Mathieu-Daudé, 2020/01/31
- [PATCH v2 06/12] hw/hppa/Kconfig: LASI chipset requires PARALLEL port, Alex Bennée, 2020/01/30
- [PATCH v2 07/12] .travis.yml: Drop superfluous use of --python=python3 parameter, Alex Bennée, 2020/01/30
- [PATCH v2 01/12] tests/docker: move most cross compilers to buster base, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 01/12] tests/docker: move most cross compilers to buster base, Philippe Mathieu-Daudé <=
- [PATCH v2 03/12] gitlab-ci: Refresh the list of iotests, Alex Bennée, 2020/01/30
- [PATCH v2 04/12] travis.yml: Install genisoimage package, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 04/12] travis.yml: Install genisoimage package, Thomas Huth, 2020/01/30
  - Re: [PATCH v2 04/12] travis.yml: Install genisoimage package, Philippe Mathieu-Daudé, 2020/01/31
- [PATCH v2 08/12] .travis.yml: Add description to each job, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 08/12] .travis.yml: Add description to each job, Thomas Huth, 2020/01/30
    - Re: [PATCH v2 08/12] .travis.yml: Add description to each job, Philippe Mathieu-Daudé, 2020/01/31
    - Re: [PATCH v2 08/12] .travis.yml: Add description to each job, Thomas Huth, 2020/01/31
- [PATCH v2 11/12] .travis.yml: probe for number of available processors, Alex Bennée, 2020/01/30
  - Re: [PATCH v2 11/12] .travis.yml: probe for number of available processors, Thomas Huth, 2020/01/30

Prev by Date: Re: [PATCH v2 1/8] Makefile: Ensure we don't run Sphinx in parallel for manpages
Next by Date: Re: Improving QOM documentation [Was: Re: Making QEMU easier for management tools and applications]
Previous by thread: [PATCH v2 01/12] tests/docker: move most cross compilers to buster base
Next by thread: [PATCH v2 03/12] gitlab-ci: Refresh the list of iotests
Index(es):
- Date
- Thread