Skip to content

image: Add LLVM APT repo #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion images/wkdev_sdk/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,19 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.s
# GStreamer 1.26.x requires at least Meson 1.4. Install the latest version.
RUN pip install meson==1.7.0 --break-system-packages

# Ensure a strong TLS connection is always used when downloading sensitive files.
ARG CURL_DOWNLOAD="curl --proto =https --tlsv1.2 --show-error --silent --fail"

# Add LLVM repo for newer tooling, nothing is installed from it by default.
COPY /rootfs/etc/apt/sources.list.d/llvm.list /etc/apt/sources.list.d/llvm.list
RUN ${CURL_DOWNLOAD} https://apt.llvm.org/llvm-snapshot.gpg.key -o /etc/apt/trusted.gpg.d/apt.llvm.org.asc

# Add Rust environment.
ENV RUSTUP_HOME="/opt/rust" \
CARGO_HOME="/opt/rust" \
PATH="/opt/rust/bin:${PATH}"

RUN curl --proto '=https' --tlsv1.2 --show-error --silent --fail https://sh.rustup.rs | sh -s -- -y && \
RUN ${CURL_DOWNLOAD} https://sh.rustup.rs | sh -s -- -y && \
rustup default 1.84.1 && \
rustup component remove rust-docs && \
cargo install --root /usr/local --version 0.9.1 --locked sccache && \
Expand Down
9 changes: 9 additions & 0 deletions images/wkdev_sdk/rootfs/etc/apt/sources.list.d/llvm.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# From https://apt.llvm.org/
deb http://apt.llvm.org/noble/ llvm-toolchain-noble main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble main
# 19
deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
# 20
deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
2 changes: 1 addition & 1 deletion scripts/container-only/wkdev-setup-default-clang
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
fi

min_clang_version=14
max_clang_version=18
max_clang_version=21

init_application "${0}" "Installs and creates symlinks to set default clang executables" container-only

Expand Down