diff mbox series

[v1,20/42] tests/docker: move our ppc64 cross compile to Buster

Message ID 20190904203013.9028-21-alex.bennee@linaro.org
State Superseded
Headers show
Series current testing/next queue (podman, docker, ci) | expand

Commit Message

Alex Bennée Sept. 4, 2019, 8:29 p.m. UTC 
Now Buster is released we can stop relying on the movable feast that
is Sid for our cross-compiler for building tests.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/Makefile.include                      | 4 ++--
 tests/docker/dockerfiles/debian-ppc64-cross.docker | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Sept. 7, 2019, 11:29 a.m. UTC | #1 
On 9/4/19 10:29 PM, Alex Bennée wrote:
> Now Buster is released we can stop relying on the movable feast that

> is Sid for our cross-compiler for building tests.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>


> ---

>  tests/docker/Makefile.include                      | 4 ++--

>  tests/docker/dockerfiles/debian-ppc64-cross.docker | 7 +++----

>  2 files changed, 5 insertions(+), 6 deletions(-)

> 

> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include

> index 93190b1e2a2..b6c04059502 100644

> --- a/tests/docker/Makefile.include

> +++ b/tests/docker/Makefile.include

> @@ -104,11 +104,11 @@ docker-image-debian-hppa-cross: docker-image-debian10

>  docker-image-debian-m68k-cross: docker-image-debian10

>  docker-image-debian-mips64-cross: docker-image-debian10

>  docker-image-debian-powerpc-cross: docker-image-debian10

> +docker-image-debian-ppc64-cross: docker-image-debian10

>  docker-image-debian-riscv64-cross: docker-image-debian10

>  docker-image-debian-sh4-cross: docker-image-debian10

>  docker-image-debian-sparc64-cross: docker-image-debian10

>  

> -docker-image-debian-ppc64-cross: docker-image-debian-sid

>  docker-image-travis: NOUSER=1

>  

>  # Specialist build images, sometimes very limited tools

> @@ -117,7 +117,7 @@ docker-image-tricore-cross: docker-image-debian9

>  # These images may be good enough for building tests but not for test builds

>  DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross

>  DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross

> -DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross

> +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross

>  DOCKER_PARTIAL_IMAGES += fedora-cris-cross

>  

>  # Rules for building linux-user powered images

> diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles/debian-ppc64-cross.docker

> index e5757fe46ee..4bf88ab02dd 100644

> --- a/tests/docker/dockerfiles/debian-ppc64-cross.docker

> +++ b/tests/docker/dockerfiles/debian-ppc64-cross.docker

> @@ -1,12 +1,11 @@

>  #

>  # Docker ppc64 cross-compiler target

>  #

> -# This docker target builds on the debian sid base image which

> -# contains cross compilers for Debian "ports" targets.

> -FROM qemu:debian-sid

> +# This docker target builds on the debian Buster base image.

> +FROM qemu:debian10

>  

>  RUN apt update && \

>      DEBIAN_FRONTEND=noninteractive eatmydata \

>      apt install -y --no-install-recommends \

>         gcc-powerpc64-linux-gnu \

> -       libc6-dev-ppc64-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }

> +       libc6-dev-ppc64-cross

>
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 93190b1e2a2..b6c04059502 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -104,11 +104,11 @@  docker-image-debian-hppa-cross: docker-image-debian10
 docker-image-debian-m68k-cross: docker-image-debian10
 docker-image-debian-mips64-cross: docker-image-debian10
 docker-image-debian-powerpc-cross: docker-image-debian10
+docker-image-debian-ppc64-cross: docker-image-debian10
 docker-image-debian-riscv64-cross: docker-image-debian10
 docker-image-debian-sh4-cross: docker-image-debian10
 docker-image-debian-sparc64-cross: docker-image-debian10
 
-docker-image-debian-ppc64-cross: docker-image-debian-sid
 docker-image-travis: NOUSER=1
 
 # Specialist build images, sometimes very limited tools
@@ -117,7 +117,7 @@  docker-image-tricore-cross: docker-image-debian9
 # These images may be good enough for building tests but not for test builds
 DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross
 DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross
-DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross
+DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross
 DOCKER_PARTIAL_IMAGES += fedora-cris-cross
 
 # Rules for building linux-user powered images
diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles/debian-ppc64-cross.docker
index e5757fe46ee..4bf88ab02dd 100644
--- a/tests/docker/dockerfiles/debian-ppc64-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64-cross.docker
@@ -1,12 +1,11 @@ 
 #
 # Docker ppc64 cross-compiler target
 #
-# This docker target builds on the debian sid base image which
-# contains cross compilers for Debian "ports" targets.
-FROM qemu:debian-sid
+# This docker target builds on the debian Buster base image.
+FROM qemu:debian10
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
        gcc-powerpc64-linux-gnu \
-       libc6-dev-ppc64-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
+       libc6-dev-ppc64-cross