mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-25 11:53:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests/docker: move most cross compilers to buster base

Browse Source 
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>
This commit is contained in:
Alex Bennée 2020-02-03 09:09:16 +00:00
parent 7bd9d0a9e2
commit 698a71edbe
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/docker/Makefile.include
View File

@ -91,19 +91,12 @@ endif
# Enforce dependencies for composite images
docker-image-debian9-mxe: docker-image-debian9
ifeq ($(HOST_ARCH),x86_64)
docker-image-debian-amd64: docker-image-debian9
docker-image-debian-amd64: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
else
docker-image-debian-amd64-cross: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64
endif
docker-image-debian-armel-cross: docker-image-debian9
docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-mips-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9
docker-image-debian-mips64el-cross: docker-image-debian9
docker-image-debian-ppc64el-cross: docker-image-debian9
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
@ -118,12 +111,19 @@ endif
docker-image-debian-alpha-cross: docker-image-debian10
docker-image-debian-arm64-cross: docker-image-debian10
docker-image-debian-armel-cross: docker-image-debian10
docker-image-debian-armhf-cross: docker-image-debian10
docker-image-debian-hppa-cross: docker-image-debian10
docker-image-debian-m68k-cross: docker-image-debian10
docker-image-debian-mips-cross: docker-image-debian10
docker-image-debian-mips64-cross: docker-image-debian10
docker-image-debian-mips64el-cross: docker-image-debian10
docker-image-debian-mipsel-cross: docker-image-debian10
docker-image-debian-powerpc-cross: docker-image-debian10
docker-image-debian-ppc64-cross: docker-image-debian10
docker-image-debian-ppc64el-cross: docker-image-debian10
docker-image-debian-riscv64-cross: docker-image-debian10
docker-image-debian-s390x-cross: docker-image-debian10
docker-image-debian-sh4-cross: docker-image-debian10
docker-image-debian-sparc64-cross: docker-image-debian10

2
tests/docker/dockerfiles/debian-amd64.docker
View File

@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image. Further
# libraries which are not widely available are installed by hand.
#
FROM qemu:debian9
FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
RUN apt update && \

2
tests/docker/dockerfiles/debian-armel-cross.docker
View File

@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
# Add the foreign architecture we want and install dependencies

2
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture armhf

2
tests/docker/dockerfiles/debian-mips64el-cross.docker
View File

@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture ppc64el && \

2
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian9
FROM qemu:debian10
# Add the s390x architecture
RUN dpkg --add-architecture s390x