SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/docker: update debian i686 and mipsel images to bookworm

Browse Source 
Whatever issues there were which stopped these being updates when the
rest were have now been resolved. However mips64el continues to be
broken so don't update it here.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240910173900.4154726-3-alex.bennee@linaro.org>
(cherry picked from commit 19d2111059c87d3f58349f27b9be9dee81fc1681)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Alex Bennée 2024-09-10 18:38:52 +01:00 committed by Michael Tokarev
parent a160fa0fc3
commit 27a15a2a32
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/docker/dockerfiles/debian-i686-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch i686 debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
socat \ socat \
sparse \ sparse \
swtpm \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
dpkg-reconfigure locales && \ dpkg-reconfigure locales && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -145,6 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:i386 \ libvdeplug-dev:i386 \
libvirglrenderer-dev:i386 \ libvirglrenderer-dev:i386 \
libvte-2.91-dev:i386 \ libvte-2.91-dev:i386 \
libxdp-dev:i386 \
libzstd-dev:i386 \ libzstd-dev:i386 \
nettle-dev:i386 \ nettle-dev:i386 \
systemtap-sdt-dev:i386 \ systemtap-sdt-dev:i386 \

10
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all --cross-arch mipsel debian-11 qemu # $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \ python3-opencv \
python3-pillow \ python3-pillow \
python3-pip \ python3-pip \
python3-setuptools \
python3-sphinx \ python3-sphinx \
python3-sphinx-rtd-theme \ python3-sphinx-rtd-theme \
python3-venv \ python3-venv \
python3-wheel \
python3-yaml \ python3-yaml \
rpm2cpio \ rpm2cpio \
sed \ sed \
socat \ socat \
sparse \ sparse \
swtpm \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
dpkg-reconfigure locales && \ dpkg-reconfigure locales && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:mipsel \ libvdeplug-dev:mipsel \
libvirglrenderer-dev:mipsel \ libvirglrenderer-dev:mipsel \
libvte-2.91-dev:mipsel \ libvte-2.91-dev:mipsel \
libxdp-dev:mipsel \
libzstd-dev:mipsel \ libzstd-dev:mipsel \
nettle-dev:mipsel \ nettle-dev:mipsel \
systemtap-sdt-dev:mipsel \ systemtap-sdt-dev:mipsel \

4
tests/lcitool/refresh
View File

@ -159,7 +159,7 @@ try:
trailer=cross_build("arm-linux-gnueabihf-", trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user")) "arm-softmmu,arm-linux-user"))
generate_dockerfile("debian-i686-cross", "debian-11", generate_dockerfile("debian-i686-cross", "debian-12",
cross="i686", cross="i686",
trailer=cross_build("i686-linux-gnu-", trailer=cross_build("i686-linux-gnu-",
"x86_64-softmmu," "x86_64-softmmu,"
@ -171,7 +171,7 @@ try:
trailer=cross_build("mips64el-linux-gnuabi64-", trailer=cross_build("mips64el-linux-gnuabi64-",
"mips64el-softmmu,mips64el-linux-user")) "mips64el-softmmu,mips64el-linux-user"))
generate_dockerfile("debian-mipsel-cross", "debian-11", generate_dockerfile("debian-mipsel-cross", "debian-12",
cross="mipsel", cross="mipsel",
trailer=cross_build("mipsel-linux-gnu-", trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user")) "mipsel-softmmu,mipsel-linux-user"))