diff options
| author | Alex Bennée | 2019-08-12 16:08:28 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-09-10 15:14:31 +0200 |
| commit | 18b6be432650ccad7c7d94c4e62ea4b7f1a15e29 (patch) | |
| tree | 95b999939fe8ba118c4dc15fe547cfec23054cd1 /tests/docker/dockerfiles | |
| parent | tests/docker: add Buster to DOCKER_PARTIAL_IMAGES (diff) | |
| download | qemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.tar.gz qemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.tar.xz qemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.zip | |
tests/docker: move our arm64 cross compile to Buster
Now Buster is released we can unify our cross build images for both
QEMU and 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>
Diffstat (limited to 'tests/docker/dockerfiles')
| -rw-r--r-- | tests/docker/dockerfiles/debian-arm64-cross.docker | 4 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-buster-arm64-cross.docker | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 6b59ef0843..55045ff5d5 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,9 +1,9 @@ # # Docker arm64 cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian9 +FROM qemu:debian10 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker deleted file mode 100644 index 52787edcc2..0000000000 --- a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker +++ /dev/null @@ -1,16 +0,0 @@ -# -# Docker arm64 cross-compiler target -# -# This docker target builds on the Debian's Buster base image. There -# are no QEMU pre-requistes so this image can only be used to build -# test cases. -# -FROM qemu:debian10 - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - crossbuild-essential-arm64 |