diff mbox series

[v1,12/42] tests/docker: move our powerpc cross compile to Buster

Message ID 20190904203013.9028-13-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                        | 2 +-
 tests/docker/dockerfiles/debian-powerpc-cross.docker | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Sept. 7, 2019, 11:32 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                        | 2 +-

>  tests/docker/dockerfiles/debian-powerpc-cross.docker | 8 +++-----

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

> 

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

> index 48c22ae40c0..7c1ff677a13 100644

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

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

> @@ -99,6 +99,7 @@ docker-image-debian-win32-cross: docker-image-debian9-mxe

>  docker-image-debian-win64-cross: docker-image-debian9-mxe

>  

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

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

>  

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

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

> @@ -107,7 +108,6 @@ docker-image-debian-sh4-cross: docker-image-debian-sid

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

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

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

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

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

>  docker-image-travis: NOUSER=1

>  

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

> index 5d08fad7cd3..89dd4fbf870 100644

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

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

> @@ -1,14 +1,12 @@

>  #

>  # Docker powerpc cross-compiler target

>  #

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

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

> -# Jessie based no longer builds.

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

>  #

> -FROM qemu:debian-sid

> +FROM qemu:debian10

>  

>  RUN apt update && \

>      DEBIAN_FRONTEND=noninteractive eatmydata \

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

>          gcc-powerpc-linux-gnu \

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

> +        libc6-dev-powerpc-cross

>
diff mbox series

Patch

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 48c22ae40c0..7c1ff677a13 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -99,6 +99,7 @@  docker-image-debian-win32-cross: docker-image-debian9-mxe
 docker-image-debian-win64-cross: docker-image-debian9-mxe
 
 docker-image-debian-arm64-cross: docker-image-debian10
+docker-image-debian-powerpc-cross: docker-image-debian10
 
 docker-image-debian-alpha-cross: docker-image-debian-sid
 docker-image-debian-hppa-cross: docker-image-debian-sid
@@ -107,7 +108,6 @@  docker-image-debian-sh4-cross: docker-image-debian-sid
 docker-image-debian-sparc64-cross: docker-image-debian-sid
 docker-image-debian-mips64-cross: docker-image-debian-sid
 docker-image-debian-riscv64-cross: docker-image-debian-sid
-docker-image-debian-powerpc-cross: docker-image-debian-sid
 docker-image-debian-ppc64-cross: docker-image-debian-sid
 docker-image-travis: NOUSER=1
 
diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker
index 5d08fad7cd3..89dd4fbf870 100644
--- a/tests/docker/dockerfiles/debian-powerpc-cross.docker
+++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker
@@ -1,14 +1,12 @@ 
 #
 # Docker powerpc cross-compiler target
 #
-# This docker target builds on the debian sid base image which
-# contains cross compilers for Debian "ports" targets. The original
-# Jessie based no longer builds.
+# This docker target builds on the debian Buster base image.
 #
-FROM qemu:debian-sid
+FROM qemu:debian10
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         gcc-powerpc-linux-gnu \
-        libc6-dev-powerpc-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
+        libc6-dev-powerpc-cross