Thomas Huth <th...@redhat.com> writes: > From: Alex Bennée <alex.ben...@linaro.org> > > The mips64el cross setup is very broken for bullseye which has now > entered LTS support so is unlikely to be fixed. While we still can't > build the container for bookworm due to a single missing dependency > that will hopefully get fixed in due course. For the sake of keeping > the CI green we mark it as allow_fail for the time being. > > Signed-off-by: Alex Bennée <alex.ben...@linaro.org> > [thuth: Temporarily remove the problematic packages manually] > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > Removing the packages that depend on mesa manually helps to get the > job green again: > https://gitlab.com/thuth/qemu/-/jobs/7961678029 > That's of course just a temporary fix 'til the next update via lcitool, > but hopefully Debian will have fixed their distro by that point in time. > > .gitlab-ci.d/container-cross.yml | 3 +++ > .../dockerfiles/debian-mips64el-cross.docker | 20 ++++--------------- > tests/lcitool/refresh | 2 +- > 3 files changed, 8 insertions(+), 17 deletions(-) > > diff --git a/.gitlab-ci.d/container-cross.yml > b/.gitlab-ci.d/container-cross.yml > index 34c0e729ad..c567926182 100644 > --- a/.gitlab-ci.d/container-cross.yml > +++ b/.gitlab-ci.d/container-cross.yml > @@ -49,6 +49,9 @@ i686-debian-cross-container: > mips64el-debian-cross-container: > extends: .container_job_template > stage: containers > + # Currently waiting for Debian to fix: > + # libgl1-mesa-dri:mips64el : Depends: libllvm15:mips64el but it is > not going to be installed
Peter if you merge this one then it might be worth using the bugref instead: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535 > + allow_failure: true > variables: > NAME: debian-mips64el-cross > > diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker > b/tests/docker/dockerfiles/debian-mips64el-cross.docker > index 2862785692..4f3277a3a6 100644 > --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker > +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross-arch mips64el debian-11 qemu > +# $ lcitool dockerfile --layers all --cross-arch mips64el debian-12 qemu > # > # 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 && \ > apt-get update && \ > @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libgtk-vnc-2.0-dev \ > libpcre2-dev \ > libsndio-dev \ > - libspice-protocol-dev \ > llvm \ > locales \ > make \ > @@ -48,16 +47,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > python3-opencv \ > python3-pillow \ > python3-pip \ > - python3-setuptools \ > python3-sphinx \ > python3-sphinx-rtd-theme \ > python3-venv \ > - python3-wheel \ > python3-yaml \ > rpm2cpio \ > sed \ > socat \ > sparse \ > + swtpm \ > tar \ > tesseract-ocr \ > tesseract-ocr-eng \ > @@ -69,8 +67,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > dpkg-reconfigure locales && \ > rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED > > -RUN /usr/bin/pip3 install tomli > - > ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" > ENV LANG "en_US.UTF-8" > ENV MAKE "/usr/bin/make" > @@ -97,17 +93,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libcmocka-dev:mips64el \ > libcurl4-gnutls-dev:mips64el \ > libdaxctl-dev:mips64el \ > - libdrm-dev:mips64el \ > - libepoxy-dev:mips64el \ > libfdt-dev:mips64el \ > libffi-dev:mips64el \ > libfuse3-dev:mips64el \ > - libgbm-dev:mips64el \ > libgcrypt20-dev:mips64el \ > libglib2.0-dev:mips64el \ > libglusterfs-dev:mips64el \ > libgnutls28-dev:mips64el \ > - libgtk-3-dev:mips64el \ > libibverbs-dev:mips64el \ > libiscsi-dev:mips64el \ > libjemalloc-dev:mips64el \ > @@ -126,13 +118,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > librbd-dev:mips64el \ > librdmacm-dev:mips64el \ > libsasl2-dev:mips64el \ > - libsdl2-dev:mips64el \ > - libsdl2-image-dev:mips64el \ > libseccomp-dev:mips64el \ > libselinux1-dev:mips64el \ > libslirp-dev:mips64el \ > libsnappy-dev:mips64el \ > - libspice-server-dev:mips64el \ > libssh-gcrypt-dev:mips64el \ > libsystemd-dev:mips64el \ > libtasn1-6-dev:mips64el \ > @@ -141,8 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libusb-1.0-0-dev:mips64el \ > libusbredirhost-dev:mips64el \ > libvdeplug-dev:mips64el \ > - libvirglrenderer-dev:mips64el \ > - libvte-2.91-dev:mips64el \ > + libxdp-dev:mips64el \ > libzstd-dev:mips64el \ > nettle-dev:mips64el \ > systemtap-sdt-dev:mips64el \ > diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh > index 92381f3c46..a78219f7bc 100755 > --- a/tests/lcitool/refresh > +++ b/tests/lcitool/refresh > @@ -166,7 +166,7 @@ try: > "x86_64-linux-user," > "i386-softmmu,i386-linux-user")) > > - generate_dockerfile("debian-mips64el-cross", "debian-11", > + generate_dockerfile("debian-mips64el-cross", "debian-12", > cross="mips64el", > trailer=cross_build("mips64el-linux-gnuabi64-", > > "mips64el-softmmu,mips64el-linux-user")) -- Alex Bennée Virtualisation Tech Lead @ Linaro
