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-alpha-cross.docker | 7 +++----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 7c1ff677a13..e7379f1d732 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -98,10 +98,10 @@ 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
>
> +docker-image-debian-alpha-cross: docker-image-debian10
> 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
> docker-image-debian-m68k-cross: docker-image-debian-sid
> docker-image-debian-sh4-cross: docker-image-debian-sid
> diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker
> index 23444342f03..74bcabfdb12 100644
> --- a/tests/docker/dockerfiles/debian-alpha-cross.docker
> +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker
> @@ -1,13 +1,12 @@
> #
> # 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 \
> apt install -y --no-install-recommends \
> gcc-alpha-linux-gnu \
> - libc6.1-dev-alpha-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }
> + libc6.1-dev-alpha-cross
>