Skip to content

Commit f1ae983

Browse files
committed
Work around armv7 build issues
Rustup is not available on armv7, so we install rust manually. We also add some missing dependencies
1 parent 4dc5ef5 commit f1ae983

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

images/wkdev_sdk/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ ENV RUSTUP_HOME="/opt/rust" \
8484
CARGO_HOME="/opt/rust" \
8585
PATH="/opt/rust/bin:${PATH}"
8686

87-
RUN rustup default stable && \
87+
RUN curl --proto '=https' --tlsv1.2 --show-error --silent --fail https://sh.rustup.rs | sh -s -- -y && \
88+
rustup default stable && \
8889
rustup component remove rust-docs && \
8990
cargo install --root /usr/local --version 0.9.1 --locked sccache && \
9091
cargo install --root /usr/local cargo-c

images/wkdev_sdk/required_system_packages/04-devtools.lst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
build-essential cmake ninja-build
33

44
# Build tools
5-
ccache rustup
5+
ccache
66

77
# Debugging / profiling / tracing
88
valgrind rr perf-tools-unstable systemd-coredump
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Needed for jhbuild on armv7
2+
libyaml-dev desktop-file-utils

0 commit comments

Comments
 (0)