[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross
From: |
Alex Bennée |
Subject: |
[PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross |
Date: |
Wed, 14 Sep 2022 16:59:46 +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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220826172128.353798-21-alex.bennee@linaro.org>
---
v2
- use debian:11-slim for consistency with the others
---
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..df578da40d 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:11-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.34.1
- Re: [PATCH v2 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64, (continued)
- [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/09/14
- [PATCH v2 17/30] tests/vm: Remove obsolete Fedora VM test, Alex Bennée, 2022/09/14
- [PATCH v2 29/30] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/09/14
- [PATCH v2 11/30] tests/docker: update and flatten debian-mips64-cross, Alex Bennée, 2022/09/14
- [PATCH v2 22/30] tests/docker: flatten debian-riscv64-test-cross, Alex Bennée, 2022/09/14
- [PATCH v2 25/30] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/09/14
- [PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross,
Alex Bennée <=
- [PATCH v2 28/30] tests/docker: update and flatten debian-toolchain, Alex Bennée, 2022/09/14
- [PATCH v2 18/30] configure: explicitly set cflags for --disable-pie, Alex Bennée, 2022/09/14
- [PATCH v2 24/30] tests/lcitool: bump to latest version, Alex Bennée, 2022/09/14
- [PATCH v2 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs, Alex Bennée, 2022/09/14
- [PATCH v2 21/30] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/09/14