From a3d10300b0b0e4cbfd6b9774fa3ee244087329d1 Mon Sep 17 00:00:00 2001
From: Helen Koike <helen.koike@collabora.com>
Date: Tue, 27 Jun 2023 21:01:12 -0300
Subject: [PATCH] ci: add EXTRA_LOCAL_PACKAGES to apt-get install

This can make it more convenient for other projects to reuse these
scripts.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23894>
---
 .gitlab-ci/container/cross_build.sh              | 1 +
 .gitlab-ci/container/debian/x86_64_build-base.sh | 1 +
 .gitlab-ci/container/debian/x86_64_test-gl.sh    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 6fee1ff5af6..8d7ab694de5 100644
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -15,6 +15,7 @@ dpkg --add-architecture $arch
 apt-get update
 
 apt-get install -y --no-remove \
+        $EXTRA_LOCAL_PACKAGES \
         $STABLE_EPHEMERAL \
         crossbuild-essential-$arch \
         pkgconf:$arch \
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index fb442f22452..473e94cdc0d 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -18,6 +18,7 @@ STABLE_EPHEMERAL=" \
 apt-get update
 
 apt-get install -y --no-remove \
+        $EXTRA_LOCAL_PACKAGES \
         $STABLE_EPHEMERAL \
         apt-utils \
         bison \
diff --git a/.gitlab-ci/container/debian/x86_64_test-gl.sh b/.gitlab-ci/container/debian/x86_64_test-gl.sh
index a5de1b30e21..1eaef9f874f 100644
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh
@@ -46,6 +46,7 @@ STABLE_EPHEMERAL=" \
 apt-get update
 
 apt-get install -y --no-remove \
+      $EXTRA_LOCAL_PACKAGES \
       $STABLE_EPHEMERAL \
       clinfo \
       iptables \