jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

tests/docker: move most cross compilers to buster base

This includes fixing up the dependencies (Which were already wrong for
one of the mips variants).

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>
Message-Id: <20200203090932.19147-2-alex.bennee@linaro.org>

Alex Bennée 698a71ed 7bd9d0a9

+15 -15
+8 -8
tests/docker/Makefile.include
··· 91 91 # Enforce dependencies for composite images 92 92 docker-image-debian9-mxe: docker-image-debian9 93 93 ifeq ($(HOST_ARCH),x86_64) 94 - docker-image-debian-amd64: docker-image-debian9 94 + docker-image-debian-amd64: docker-image-debian10 95 95 DOCKER_PARTIAL_IMAGES += debian-amd64-cross 96 96 else 97 97 docker-image-debian-amd64-cross: docker-image-debian10 98 98 DOCKER_PARTIAL_IMAGES += debian-amd64 99 99 endif 100 - docker-image-debian-armel-cross: docker-image-debian9 101 - docker-image-debian-armhf-cross: docker-image-debian9 102 - docker-image-debian-mips-cross: docker-image-debian9 103 - docker-image-debian-mipsel-cross: docker-image-debian9 104 - docker-image-debian-mips64el-cross: docker-image-debian9 105 - docker-image-debian-ppc64el-cross: docker-image-debian9 106 - docker-image-debian-s390x-cross: docker-image-debian9 107 100 docker-image-debian-win32-cross: docker-image-debian9-mxe 108 101 docker-image-debian-win64-cross: docker-image-debian9-mxe 109 102 ··· 118 111 119 112 docker-image-debian-alpha-cross: docker-image-debian10 120 113 docker-image-debian-arm64-cross: docker-image-debian10 114 + docker-image-debian-armel-cross: docker-image-debian10 115 + docker-image-debian-armhf-cross: docker-image-debian10 121 116 docker-image-debian-hppa-cross: docker-image-debian10 122 117 docker-image-debian-m68k-cross: docker-image-debian10 118 + docker-image-debian-mips-cross: docker-image-debian10 123 119 docker-image-debian-mips64-cross: docker-image-debian10 120 + docker-image-debian-mips64el-cross: docker-image-debian10 121 + docker-image-debian-mipsel-cross: docker-image-debian10 124 122 docker-image-debian-powerpc-cross: docker-image-debian10 125 123 docker-image-debian-ppc64-cross: docker-image-debian10 124 + docker-image-debian-ppc64el-cross: docker-image-debian10 126 125 docker-image-debian-riscv64-cross: docker-image-debian10 126 + docker-image-debian-s390x-cross: docker-image-debian10 127 127 docker-image-debian-sh4-cross: docker-image-debian10 128 128 docker-image-debian-sparc64-cross: docker-image-debian10 129 129
+1 -1
tests/docker/dockerfiles/debian-amd64.docker
··· 4 4 # This docker target builds on the debian Stretch base image. Further 5 5 # libraries which are not widely available are installed by hand. 6 6 # 7 - FROM qemu:debian9 7 + FROM qemu:debian10 8 8 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> 9 9 10 10 RUN apt update && \
+1 -1
tests/docker/dockerfiles/debian-armel-cross.docker
··· 3 3 # 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 - FROM qemu:debian9 6 + FROM qemu:debian10 7 7 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> 8 8 9 9 # Add the foreign architecture we want and install dependencies
+1 -1
tests/docker/dockerfiles/debian-armhf-cross.docker
··· 3 3 # 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 - FROM qemu:debian9 6 + FROM qemu:debian10 7 7 8 8 # Add the foreign architecture we want and install dependencies 9 9 RUN dpkg --add-architecture armhf
+1 -1
tests/docker/dockerfiles/debian-mips64el-cross.docker
··· 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 6 7 - FROM qemu:debian9 7 + FROM qemu:debian10 8 8 9 9 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> 10 10
+1 -1
tests/docker/dockerfiles/debian-mipsel-cross.docker
··· 3 3 # 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 - FROM qemu:debian9 6 + FROM qemu:debian10 7 7 8 8 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> 9 9
+1 -1
tests/docker/dockerfiles/debian-ppc64el-cross.docker
··· 3 3 # 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 - FROM qemu:debian9 6 + FROM qemu:debian10 7 7 8 8 # Add the foreign architecture we want and install dependencies 9 9 RUN dpkg --add-architecture ppc64el && \
+1 -1
tests/docker/dockerfiles/debian-s390x-cross.docker
··· 3 3 # 4 4 # This docker target builds on the debian Stretch base image. 5 5 # 6 - FROM qemu:debian9 6 + FROM qemu:debian10 7 7 8 8 # Add the s390x architecture 9 9 RUN dpkg --add-architecture s390x