GH-45510: [CI][C++] Fix LLVM APT repository preparation on Debian (#4…

…5511) ### Rationale for this change The existing LLVM APT repository preparation is broken. For example, it uses unavailable `${available_llvm}`. ### What changes are included in this PR? * Use `.asc` for armored key * Use deb822 format for APT source: https://manpages.debian.org/bookworm/dpkg-dev/deb822.5.en.html ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #45510 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
apache · Feb 12, 2025 · c2432af · c2432af
1 parent 18e8f50
commit c2432af
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/ci/docker/debian-12-cpp.dockerfile b/ci/docker/debian-12-cpp.dockerfile
@@ -30,13 +30,14 @@ RUN apt-get update -y -q && \
         lsb-release \
         wget && \
     if [ ${llvm} -ge 17 ]; then \
-      wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | \
-          gpg \
-              --import - \
-              --keyring /usr/share/keyrings/llvm-snapshot.gpg \
-              --no-default-keyring && \
-      echo "deb[keyring=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$(lsb_release --codename --short)/ llvm-toolchain-$(lsb_release --codename --short)-${available_llvm} main" > \
-          /etc/apt/sources.list.d/llvm.list; \
+      wget -O /usr/share/keyrings/llvm-snapshot.asc \
+        https://apt.llvm.org/llvm-snapshot.gpg.key && \
+      (echo "Types: deb"; \
+       echo "URIs: https://apt.llvm.org/$(lsb_release --codename --short)/"; \
+       echo "Suites: llvm-toolchain-$(lsb_release --codename --short)-${llvm}"; \
+       echo "Components: main"; \
+       echo "Signed-By: /usr/share/keyrings/llvm-snapshot.asc") | \
+        tee /etc/apt/sources.list.d/llvm.sources; \
     fi && \
     apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \