Skip to content

Commit a004d37

Browse files
chapterjasonclaude
andcommitted
llvm: drop software-properties-common dep, use deb822 path on trixie (1.1.0)
The llvm.sh script writes the LLVM apt source in deb822 format on trixie/forky/sid, where add-apt-repository is unavailable (the software-properties package was removed from trixie). Pre-installing software-properties-common broke the feature on the new trixie-based devcontainer base. Drop it; only install what's actually missing from the rest. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 0af201b commit a004d37

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/llvm/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "llvm",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"name": "llvm",
55
"description": "Installs LLVM / Clang on Debian / Ubuntu via the official apt.llvm.org repository. Major-version binaries (clang, clang++, lld, lldb, clangd, clang-format, clang-tidy, etc.) are symlinked into /usr/local/bin without the version suffix.",
66
"documentationURL": "https://github.com/SoureCode/devcontainer-features/tree/master/src/llvm",

src/llvm/install.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ set -e
66
LLVM_VERSION="${VERSION:-22}"
77
LLVM_ALL="${ALL:-true}"
88

9-
apt-get update
10-
apt-get install -y --no-install-recommends \
11-
ca-certificates curl gnupg lsb-release software-properties-common wget
12-
rm -rf /var/lib/apt/lists/*
9+
# llvm.sh writes the LLVM apt source in deb822 format on trixie/forky/sid, so
10+
# software-properties-common (gone from trixie) is no longer required. Older
11+
# Debian/Ubuntu suites still need add-apt-repository — install it on demand
12+
# when llvm.sh asks for it. Only install what's missing.
13+
NEED=()
14+
for pkg in ca-certificates curl gnupg lsb-release wget; do
15+
dpkg -s "$pkg" >/dev/null 2>&1 || NEED+=("$pkg")
16+
done
17+
if [ "${#NEED[@]}" -gt 0 ]; then
18+
apt-get update
19+
apt-get install -y --no-install-recommends "${NEED[@]}"
20+
rm -rf /var/lib/apt/lists/*
21+
fi
1322

1423
TMPDIR="$(mktemp -d)"
1524
trap 'rm -rf "$TMPDIR"' EXIT

0 commit comments

Comments
 (0)