wkdev-sdk: Install Rust

Igalia · Sep 4, 2024 · af3311b · af3311b
1 parent 57aaae2
commit af3311b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile
@@ -80,6 +80,17 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.s
     rm -rf WebKit && \
     ${APT_AUTOREMOVE}
 
+# Add Rust environment.
+ENV RUSTUP_HOME="/opt/rust" \
+    CARGO_HOME="/opt/rust" \
+    PATH="/root/.cargo/bin:${PATH}"
+
+RUN rustup default stable && \
+    rustup component remove rust-docs && \
+    cargo install --root /usr/local --version 0.8.1 --locked sccache && \
+    cargo install --root /usr/local cargo-c && \
+    rm -rf /root/.cargo
+
 # Copy jhbuild helper files and do the initial build & install
 COPY /jhbuild/jhbuildrc /etc/xdg/jhbuildrc
 COPY /jhbuild/webkit-sdk-deps.modules /jhbuild/webkit-sdk-deps.modules
@@ -127,8 +138,5 @@ RUN export QT_VERSION=$(qmake6 -query QT_VERSION) && \
       ln -s ${directory} ${directory}/${QT_VERSION}  >/dev/null 2>&1 || true; \
     done
 
-# Build custom sccache version (the Ubuntu provided 0.7.7 package is broken)
-RUN cargo install --root /usr/local --version 0.8.1 --locked sccache
-
 # Switch back to interactive prompt, when using apt.
 ENV DEBIAN_FRONTEND dialog
diff --git a/images/wkdev_sdk/required_system_packages/04-devtools.lst b/images/wkdev_sdk/required_system_packages/04-devtools.lst
@@ -2,7 +2,7 @@
 build-essential cmake ninja-build
 
 # Build tools
-icecc ccache cargo
+icecc ccache rustup
 
 # Debugging / profiling / tracing
 valgrind rr perf-tools-unstable systemd-coredump

diff --git a/scripts/container-only/.wkdev-init b/scripts/container-only/.wkdev-init
@@ -206,6 +206,16 @@ try_setup_permissions_jhbuild_directory() {
 
 }
 
+try_setup_permissions_rust_directory() {
+
+    echo ""
+
+    local rust_directory="/opt/rust"
+    echo "[12/13] Setup rust '${rust_directory}' directory permissions..."
+
+    chown --recursive "${container_user_name}:${container_group_name}" "${rust_directory}" &>/dev/null
+}
+
 try_firstrun_script() {
     echo ""
 
@@ -259,6 +269,7 @@ run() {
     try_setup_run_user_directory
     try_setup_dockerenv_file
     try_setup_permissions_jhbuild_directory
+    try_setup_permissions_rust_directory
     try_firstrun_script
 
     # Reset DEBIAN_FRONTEND again.