tests/docker: introduce debian-riscv64-test-cross
Cross building QEMU for riscv64 still involves messing about with sid and ports. However for building tests we can have a slimmer compiler only container which should be more stable. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220225172021.3493923-7-alex.bennee@linaro.org>
This commit is contained in:
parent
89767579ca
commit
7d5817a426
|
@ -131,6 +131,13 @@ riscv64-debian-cross-container:
|
||||||
variables:
|
variables:
|
||||||
NAME: debian-riscv64-cross
|
NAME: debian-riscv64-cross
|
||||||
|
|
||||||
|
# we can however build TCG tests using a non-sid base
|
||||||
|
riscv64-debian-test-cross-container:
|
||||||
|
extends: .container_job_template
|
||||||
|
stage: containers-layer2
|
||||||
|
variables:
|
||||||
|
NAME: debian-riscv64-test-cross
|
||||||
|
|
||||||
s390x-debian-cross-container:
|
s390x-debian-cross-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
stage: containers
|
stage: containers
|
||||||
|
|
|
@ -214,6 +214,7 @@ docker-image-debian-all-test-cross: docker-image-debian10
|
||||||
docker-image-debian-microblaze-cross: docker-image-debian10
|
docker-image-debian-microblaze-cross: docker-image-debian10
|
||||||
docker-image-debian-nios2-cross: docker-image-debian10
|
docker-image-debian-nios2-cross: docker-image-debian10
|
||||||
docker-image-debian-powerpc-test-cross: docker-image-debian11
|
docker-image-debian-powerpc-test-cross: docker-image-debian11
|
||||||
|
docker-image-debian-riscv64-test-cross: docker-image-debian11
|
||||||
|
|
||||||
# These images may be good enough for building tests but not for test builds
|
# These images may be good enough for building tests but not for test builds
|
||||||
DOCKER_PARTIAL_IMAGES += debian-alpha-cross
|
DOCKER_PARTIAL_IMAGES += debian-alpha-cross
|
||||||
|
@ -222,6 +223,7 @@ DOCKER_PARTIAL_IMAGES += debian-hppa-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
|
DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-nios2-cross
|
DOCKER_PARTIAL_IMAGES += debian-nios2-cross
|
||||||
|
DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
|
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
|
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
|
||||||
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
|
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#
|
||||||
|
# Docker cross-compiler target
|
||||||
|
#
|
||||||
|
# This docker target builds on the Debian Bullseye base image.
|
||||||
|
#
|
||||||
|
FROM qemu/debian11
|
||||||
|
|
||||||
|
RUN apt update && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||||
|
apt install -y --no-install-recommends \
|
||||||
|
gcc-riscv64-linux-gnu \
|
||||||
|
libc6-dev-riscv64-cross
|
|
@ -180,7 +180,7 @@ for target in $target_list; do
|
||||||
;;
|
;;
|
||||||
riscv64-*)
|
riscv64-*)
|
||||||
container_hosts=x86_64
|
container_hosts=x86_64
|
||||||
container_image=debian-riscv64-cross
|
container_image=debian-riscv64-test-cross
|
||||||
container_cross_cc=riscv64-linux-gnu-gcc
|
container_cross_cc=riscv64-linux-gnu-gcc
|
||||||
;;
|
;;
|
||||||
s390x-*)
|
s390x-*)
|
||||||
|
|
Loading…
Reference in New Issue