From 40f9c8b1ff7b02ff6d93d7bc314c35a4c3b440dd Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Tue, 3 Sep 2024 09:30:51 -0500 Subject: [PATCH 1/3] WIP --- images/wkdev_sdk/Containerfile | 11 ++++++++--- .../required_system_packages/04-devtools.lst | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile index cbbd8ac..a756982 100644 --- a/images/wkdev_sdk/Containerfile +++ b/images/wkdev_sdk/Containerfile @@ -80,6 +80,14 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.s rm -rf WebKit && \ ${APT_AUTOREMOVE} +# Install any necessary rust projects +# The Ubuntu provided sccache 0.7.7 package is broken +# Building GStreamer needs cargo-c +RUN rustup toolchain install 1.78 && \ + cargo install --root /usr/local --version 0.8.1 --locked sccache && \ + cargo install --root /usr/local cargo-c && \ + rm -rf ~/.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 +135,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 index 61ce003..319ae80 100644 --- 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 From b566fc36cda4a4a07098f75c6f1f0a5f0d911abe Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Tue, 3 Sep 2024 16:58:08 +0200 Subject: [PATCH 2/3] Attempt to fix --- images/wkdev_sdk/Containerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile index a756982..ba30bc3 100644 --- a/images/wkdev_sdk/Containerfile +++ b/images/wkdev_sdk/Containerfile @@ -80,6 +80,11 @@ 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}" + # Install any necessary rust projects # The Ubuntu provided sccache 0.7.7 package is broken # Building GStreamer needs cargo-c @@ -88,6 +93,9 @@ RUN rustup toolchain install 1.78 && \ cargo install --root /usr/local cargo-c && \ rm -rf ~/.cargo +# Verify Rust installation. +RUN rustc --version && cargo --version + # 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 From 3cac5259e5df607b01a818cca8845949b8ba8462 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Tue, 3 Sep 2024 17:00:30 +0200 Subject: [PATCH 3/3] Remove unnecessary line --- images/wkdev_sdk/Containerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile index ba30bc3..166d066 100644 --- a/images/wkdev_sdk/Containerfile +++ b/images/wkdev_sdk/Containerfile @@ -93,9 +93,6 @@ RUN rustup toolchain install 1.78 && \ cargo install --root /usr/local cargo-c && \ rm -rf ~/.cargo -# Verify Rust installation. -RUN rustc --version && cargo --version - # 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