ci/armXX: add libgl1-mesa-dev dependency

Waffle building requires libgl1-mesa-dev to add support for GLX. This
package is pulled automatically in arm64 container as a suggested
package, but no in armhf. Which means we end up having support for GLX
in waffle in arm64 but not in armhf.

Thus let's install explicitly this package to have support in both
cases.

Reviewed-by: Andres Gomez <agomez@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9562>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5ffddc..8094171 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -460,7 +460,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-03-16-piglit-runner"
+    MESA_IMAGE_TAG: &arm64_test "2021-03-17-waffle-dep"
 
 .use-arm64_test:
   extends:
@@ -477,7 +477,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-03-16-piglit-runner"
+    MESA_IMAGE_TAG: &armhf_test "2021-03-17-waffle-dep"
 
 .use-armhf_test:
   extends:

diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 0305a50..fe98e55 100644 (file)
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -23,6 +23,7 @@ BAREMETAL_EPHEMERAL=" \
         libexpat1-dev:$arch \
         libffi-dev:$arch \
         libgbm-dev:$arch \
+        libgl1-mesa-dev:$arch \
         libgles2-mesa-dev:$arch \
         libpciaccess-dev:$arch \
         libpcre3-dev:$arch \