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
Reviewed-by: Philippe Mathieu-Daudé
Tested-by: Philippe Mathieu-Daudé
> ---
> tests/docker/Makefile.include | 2 +-
> tests/docker/dockerfiles/debian-m68k-cross.docker | 5 ++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index ba5a624eaec..62f2733eb66 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -101,9 +101,9 @@ docker-image-debian-win64-cross: docker-image-debian9-mxe
> docker-image-debian-alpha-cross: docker-image-debian10
> docker-image-debian-arm64-cross: docker-image-debian10
> docker-image-debian-hppa-cross: docker-image-debian10
> +docker-image-debian-m68k-cross: docker-image-debian10
> docker-image-debian-powerpc-cross: docker-image-debian10
>
> -docker-image-debian-m68k-cross: docker-image-debian-sid
> 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
> diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker
> b/tests/docker/dockerfiles/debian-m68k-cross.docker
> index 4311c9cf86d..25edc80e9a3 100644
> --- a/tests/docker/dockerfiles/debian-m68k-cross.docker
> +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker
> @@ -1,10 +1,9 @@
> #
> # Docker cross-compiler target
> #
> -# This docker target builds on the debian sid base image which
> -# contains cross compilers for Debian "ports" targets.
> +# This docker target builds on the debian Buster base image.
> #
> -FROM qemu:debian-sid
> +FROM qemu:debian10
>
> RUN apt update && \
> DEBIAN_FRONTEND=noninteractive eatmydata \
>