[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 20/25] tests/docker: update and flatten debian-loongarch-cross
From: |
Alex Bennée |
Subject: |
[PATCH v1 20/25] tests/docker: update and flatten debian-loongarch-cross |
Date: |
Fri, 26 Aug 2022 18:21:23 +0100 |
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. In this case it is a
binary distribution of the toolchain anyway.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 1 -
tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a0f5109628..1d5a6f1fb4 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -128,7 +128,6 @@ docker-image-debian-nios2-cross:
$(DOCKER_FILES_DIR)/debian-toolchain.docker \
$(call debian-toolchain, $@)
# Specialist build images, sometimes very limited tools
-docker-image-debian-loongarch-cross: docker-image-debian11
docker-image-debian-microblaze-cross: docker-image-debian10
docker-image-debian-nios2-cross: docker-image-debian10
diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker
b/tests/docker/dockerfiles/debian-loongarch-cross.docker
index ca2469d2a8..48fe64c51b 100644
--- a/tests/docker/dockerfiles/debian-loongarch-cross.docker
+++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker
@@ -5,7 +5,10 @@
# using a prebuilt toolchains for LoongArch64 from:
# https://github.com/loongson/build-tools/releases
#
-FROM qemu/debian11
+FROM docker.io/library/debian:bullseye-slim
+
+# Duplicate deb line as deb-src
+RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
--
2.30.2
- [PATCH v1 15/25] Deprecate 32 bit big-endian MIPS, (continued)
- [PATCH v1 15/25] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/08/26
- [PATCH v1 24/25] tests/docker: remove the Debian base images, Alex Bennée, 2022/08/26
- [PATCH v1 22/25] tests/docker: update and flatten debian-toolchain, Alex Bennée, 2022/08/26
- [PATCH v1 21/25] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/08/26
- [PATCH v1 25/25] gitlab-ci: Only use one process in Windows jobs for compilation, Alex Bennée, 2022/08/26
- [PATCH v1 20/25] tests/docker: update and flatten debian-loongarch-cross,
Alex Bennée <=
- [PATCH v1 19/25] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/08/26
- [PATCH v1 23/25] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/08/26
- [PATCH v1 16/25] tests/docker: flatten debian-riscv64-test-cross, Alex Bennée, 2022/08/26