Module: Mesa
Branch: main
Commit: 39616c13e003085e46e3d6b2fd9d8e481edd5003
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=39616c13e003085e46e3d6b2fd9d8e481edd5003
Author: David Heidelberg <david.heidelb...@collabora.com>
Date: Wed Jan 10 15:25:38 2024 +0100
ci/rootfs: add libdrm also inside the rootfs
Fixes: 402330101009 ("ci: enable ci-deb-repo for libdrm 2.4.119 (and others in
the future)")
Signed-off-by: David Heidelberg <david.heidelb...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26971>
---
.gitlab-ci/container/lava_build.sh | 3 ++-
.gitlab-ci/image-tags.yml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci/container/lava_build.sh
b/.gitlab-ci/container/lava_build.sh
index 4159190d9ef..4e85a15d54a 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -219,7 +219,8 @@ mmdebstrap \
--include "${PKG_BASE[*]} ${PKG_CI[*]} ${PKG_DEP[*]} ${PKG_MESA_DEP[*]}
${PKG_ARCH[*]}" \
bookworm \
"$ROOTFS/" \
- "http://deb.debian.org/debian";
+ "http://deb.debian.org/debian"; \
+ "deb [trusted=yes]
https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/
${FDO_DISTRIBUTION_VERSION%-*} main"
############### Install mold
. .gitlab-ci/container/build-mold.sh
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index e877dd80264..c3ba91875ce 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -25,7 +25,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
- KERNEL_ROOTFS_TAG: "2024-01-10-deb-fix"
+ KERNEL_ROOTFS_TAG: "2024-01-10-libdrm"
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "67f2c46b"
