From 5c91fffdba6e2a3e5a95d592a4343072fdec59c2 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 30 Oct 2025 21:23:46 -0600 Subject: [PATCH 1/3] Add missing PATH in switch-arm.sh --- toolchain/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile index 8f4cbda..b4167d4 100644 --- a/toolchain/Dockerfile +++ b/toolchain/Dockerfile @@ -143,6 +143,7 @@ RUN touch /opt/x-tools/switch-arm.sh && chmod +x /opt/x-tools/switch-arm.sh && c export ARCH=arm export CHOST="$CHOST" export CROSS_COMPILE="$CHOST-" +PATH="\$PATH:/opt/x-tools/$NGCONFIG/bin" export PKG_CONFIG_LIBDIR="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/usr/lib/pkgconfig:/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/lib/pkgconfig:/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/opt/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" export SYSROOT="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" From b5bba437fbd4b02dc3a6d716ec7692ba522019fe Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 30 Oct 2025 21:26:29 -0600 Subject: [PATCH 2/3] Remove rust env from toolchain switch --- toolchain/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile index b4167d4..db46bca 100644 --- a/toolchain/Dockerfile +++ b/toolchain/Dockerfile @@ -149,7 +149,6 @@ export PKG_CONFIG_SYSROOT_DIR="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" export SYSROOT="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" export NGCONFIG="$NGCONFIG" export TARGET_PREFIX="$CHOST" -export CARGO_BUILD_TARGET="armv7-unknown-linux-gnueabihf" EOF RUN touch /opt/x-tools/switch-aarch64.sh && chmod +x /opt/x-tools/switch-aarch64.sh && cat < /opt/x-tools/switch-aarch64.sh @@ -162,7 +161,6 @@ export PKG_CONFIG_SYSROOT_DIR="/opt/x-tools/$NGCONFIG_AARCH64/$NGCONFIG_AARCH64/ export SYSROOT="/opt/x-tools/$NGCONFIG_AARCH64/$NGCONFIG_AARCH64/sysroot" export NGCONFIG="$NGCONFIG_AARCH64" export TARGET_PREFIX="$CHOST_AARCH64" -export CARGO_BUILD_TARGET="aarch64-unknown-linux-gnu" EOF # Configure Opkg From fd14f344a66371c93c8eb64d80ca553d443bfcd9 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 30 Oct 2025 21:26:51 -0600 Subject: [PATCH 3/3] Add rust env to rust image switch.sh Updated build target configuration for Rust. --- rust/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/Dockerfile b/rust/Dockerfile index 8e13490..725dd1e 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -12,8 +12,8 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -q \ # Add rust binaries to PATH ENV PATH="$PATH:/root/.cargo/bin" -# Set default build target to armv7 -ENV CARGO_BUILD_TARGET="armv7-unknown-linux-gnueabihf" - # Target reMarkable architecture by default COPY config /root/.cargo/config + +RUN echo 'export CARGO_BUILD_TARGET="aarch64-unknown-linux-gnu"' >> /opt/x-tools/switch-aarch64.sh \ + && echo 'export CARGO_BUILD_TARGET="armv7-unknown-linux-gnueabihf"' >> /opt/x-tools/switch-arm.sh