mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/docker: move our arm64 cross compile to Buster

Browse Source 
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>
This commit is contained in:
Alex Bennée 2019-08-12 15:08:28 +01:00
parent 2f45f2d446
commit 18b6be4326
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/docker/Makefile.include
View File

@ -86,13 +86,10 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
endif endif
# Enforce dependencies for composite images # Enforce dependencies for composite images
docker-image-debian: docker-image-debian9
docker-image-debian9-mxe: docker-image-debian9 docker-image-debian9-mxe: docker-image-debian9
docker-image-debian-amd64: docker-image-debian9 docker-image-debian-amd64: docker-image-debian9
docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armel-cross: docker-image-debian9
docker-image-debian-armhf-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-arm64-cross: docker-image-debian9
docker-image-debian-buster-arm64-cross: docker-image-debian10
docker-image-debian-mips-cross: docker-image-debian9 docker-image-debian-mips-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9
docker-image-debian-mips64el-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9
@ -101,6 +98,8 @@ docker-image-debian-s390x-cross: docker-image-debian9
docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win32-cross: docker-image-debian9-mxe
docker-image-debian-win64-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe
docker-image-debian-arm64-cross: docker-image-debian10
docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-alpha-cross: docker-image-debian-sid
docker-image-debian-hppa-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-m68k-cross: docker-image-debian-sid

4
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -1,9 +1,9 @@
# #
# Docker arm64 cross-compiler target # 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 # Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64

16
tests/docker/dockerfiles/debian-buster-arm64-cross.docker
View File

@ -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

2
tests/tcg/configure.sh
View File

@ -95,7 +95,7 @@ for target in $target_list; do
case $target in case $target in
aarch64-*) aarch64-*)
# We don't have any bigendian build tools so we only use this for AArch64 # We don't have any bigendian build tools so we only use this for AArch64
container_image=debian-buster-arm64-cross container_image=debian-arm64-cross
container_cross_cc=aarch64-linux-gnu-gcc container_cross_cc=aarch64-linux-gnu-gcc
;; ;;
alpha-*) alpha-*)