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

tests/docker: update and flatten debian-m68k-cross

Browse Source 
Update to the latest stable Debian. While we are at it flatten into a
single dockerfile. We really don't need the rest of the stuff from
the QEMU base image just to compile test images.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-11-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2022-09-14 16:59:30 +01:00
parent 8b03418760
commit 7785500236
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.d/container-cross.yml
View File

@ -71,7 +71,6 @@ hppa-debian-cross-container:
m68k-debian-cross-container:
extends: .container_job_template
stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-m68k-cross

1
tests/docker/Makefile.include
View File

@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross
DOCKER_PARTIAL_IMAGES += fedora
endif
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-sh4-cross: docker-image-debian10

12
tests/docker/dockerfiles/debian-m68k-cross.docker
View File

@ -1,12 +1,14 @@
#
# Docker cross-compiler target
#
# This docker target builds on the debian Buster base image.
# This docker target builds on the Debian Bullseye base image.
#
FROM qemu/debian10
FROM docker.io/library/debian:11-slim
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y eatmydata && \
eatmydata apt-get dist-upgrade -y && \
eatmydata apt-get install --no-install-recommends -y \
gcc-m68k-linux-gnu \
libc6-dev-m68k-cross