Message ID | 20241217133525.3836570-1-berrange@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tests/lcitool: remove temp workaround for debian mips64el | expand |
On 17/12/2024 14.35, Daniel P. Berrangé wrote: > The workaround applied in > > commit c60473d29254b79d9437eface8b342e84663ba66 > Author: Alex Bennée <alex.bennee@linaro.org> > Date: Wed Oct 2 10:03:33 2024 +0200 > > testing: bump mips64el cross to bookworm and fix package list > > Is no longer required since the affected builds are now fixed. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > .../dockerfiles/debian-mips64el-cross.docker | 9 ++++++ > tests/lcitool/mappings.yml | 29 ------------------- > 2 files changed, 9 insertions(+), 29 deletions(-) Tested-by: Thomas Huth <thuth@redhat.com>
Daniel P. Berrangé <berrange@redhat.com> writes: > The workaround applied in > > commit c60473d29254b79d9437eface8b342e84663ba66 > Author: Alex Bennée <alex.bennee@linaro.org> > Date: Wed Oct 2 10:03:33 2024 +0200 > > testing: bump mips64el cross to bookworm and fix package list > > Is no longer required since the affected builds are now fixed. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Queued to testing/next, thanks.
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index c09a8da890..9f6c4763c5 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -93,13 +93,18 @@ 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 \ + libgtk-vnc-2.0-dev:mips64el \ libibverbs-dev:mips64el \ libiscsi-dev:mips64el \ libjemalloc-dev:mips64el \ @@ -119,6 +124,8 @@ 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 \ @@ -134,6 +141,8 @@ 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 \ diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index f8186b0e69..74eb13d62b 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -6,23 +6,6 @@ mappings: flake8: OpenSUSELeap15: - # Due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535 we - # have to disable all packages that depend on libgl1-mesa-dri:mips64el - gtk3: - mips64el-deb: - - libdrm: - mips64el-deb: - - libepoxy: - mips64el-deb: - - gtk-vnc: - mips64el-deb: - - mesa-libgbm: - mips64el-deb: - meson: OpenSUSELeap15: @@ -81,18 +64,6 @@ mappings: python3-wheel: OpenSUSELeap15: python311-pip - sdl2: - mips64el-deb: - - sdl2-image: - mips64el-deb: - - virglrenderer: - mips64el-deb: - - vte: - mips64el-deb: - pypi_mappings: # Request more recent version meson:
The workaround applied in commit c60473d29254b79d9437eface8b342e84663ba66 Author: Alex Bennée <alex.bennee@linaro.org> Date: Wed Oct 2 10:03:33 2024 +0200 testing: bump mips64el cross to bookworm and fix package list Is no longer required since the affected builds are now fixed. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .../dockerfiles/debian-mips64el-cross.docker | 9 ++++++ tests/lcitool/mappings.yml | 29 ------------------- 2 files changed, 9 insertions(+), 29 deletions(-)