Skip to content

Commit 41618a2

Browse files
berrangestsquad
authored andcommitted
tests/lcitool: remove temp workaround for debian mips64el
The workaround applied in commit c60473d Author: Alex Bennée <[email protected]> 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é <[email protected]> Tested-by: Thomas Huth <[email protected]> Message-Id: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> Message-Id: <[email protected]>
1 parent 66944b6 commit 41618a2

File tree

2 files changed

+9
-29
lines changed

2 files changed

+9
-29
lines changed

tests/docker/dockerfiles/debian-mips64el-cross.docker

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,18 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
9393
libcmocka-dev:mips64el \
9494
libcurl4-gnutls-dev:mips64el \
9595
libdaxctl-dev:mips64el \
96+
libdrm-dev:mips64el \
97+
libepoxy-dev:mips64el \
9698
libfdt-dev:mips64el \
9799
libffi-dev:mips64el \
98100
libfuse3-dev:mips64el \
101+
libgbm-dev:mips64el \
99102
libgcrypt20-dev:mips64el \
100103
libglib2.0-dev:mips64el \
101104
libglusterfs-dev:mips64el \
102105
libgnutls28-dev:mips64el \
106+
libgtk-3-dev:mips64el \
107+
libgtk-vnc-2.0-dev:mips64el \
103108
libibverbs-dev:mips64el \
104109
libiscsi-dev:mips64el \
105110
libjemalloc-dev:mips64el \
@@ -119,6 +124,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
119124
librbd-dev:mips64el \
120125
librdmacm-dev:mips64el \
121126
libsasl2-dev:mips64el \
127+
libsdl2-dev:mips64el \
128+
libsdl2-image-dev:mips64el \
122129
libseccomp-dev:mips64el \
123130
libselinux1-dev:mips64el \
124131
libslirp-dev:mips64el \
@@ -134,6 +141,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
134141
libusb-1.0-0-dev:mips64el \
135142
libusbredirhost-dev:mips64el \
136143
libvdeplug-dev:mips64el \
144+
libvirglrenderer-dev:mips64el \
145+
libvte-2.91-dev:mips64el \
137146
libxdp-dev:mips64el \
138147
libzstd-dev:mips64el \
139148
nettle-dev:mips64el \

tests/lcitool/mappings.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,6 @@ mappings:
66
flake8:
77
OpenSUSELeap15:
88

9-
# Due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1081535 we
10-
# have to disable all packages that depend on libgl1-mesa-dri:mips64el
11-
gtk3:
12-
mips64el-deb:
13-
14-
libdrm:
15-
mips64el-deb:
16-
17-
libepoxy:
18-
mips64el-deb:
19-
20-
gtk-vnc:
21-
mips64el-deb:
22-
23-
mesa-libgbm:
24-
mips64el-deb:
25-
269
meson:
2710
OpenSUSELeap15:
2811

@@ -81,18 +64,6 @@ mappings:
8164
python3-wheel:
8265
OpenSUSELeap15: python311-pip
8366

84-
sdl2:
85-
mips64el-deb:
86-
87-
sdl2-image:
88-
mips64el-deb:
89-
90-
virglrenderer:
91-
mips64el-deb:
92-
93-
vte:
94-
mips64el-deb:
95-
9667
pypi_mappings:
9768
# Request more recent version
9869
meson:

0 commit comments

Comments
 (0)