From 2712e76adcf4e8d64a125d2668e9a8c0d8c17bf2 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 10 May 2024 10:52:29 +0200 Subject: [PATCH 1/2] feat: Update base image and cargo-audit version --- rust-nostd-esp/Dockerfile | 4 ++-- rust-std-esp/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust-nostd-esp/Dockerfile b/rust-nostd-esp/Dockerfile index a441ac7..7b53b64 100644 --- a/rust-nostd-esp/Dockerfile +++ b/rust-nostd-esp/Dockerfile @@ -1,10 +1,10 @@ -FROM espressif/idf-rust:all_1.77.0.0 +FROM espressif/idf-rust:all_1.78.0.0 USER esp ENV USER=esp # Install extra crates -RUN cargo install cargo-audit@0.17.6 && \ +RUN cargo install cargo-audit && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \ diff --git a/rust-std-esp/Dockerfile b/rust-std-esp/Dockerfile index 66f523a..2961d1d 100644 --- a/rust-std-esp/Dockerfile +++ b/rust-std-esp/Dockerfile @@ -1,10 +1,10 @@ -FROM espressif/idf-rust:all_1.77.0.0 +FROM espressif/idf-rust:all_1.78.0.0 USER esp ENV USER=esp # Install extra crates -RUN cargo install cargo-audit@0.17.6 && \ +RUN cargo install cargo-audit && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \ From d22a49732e3f9792e27523a7737c58f0c5025fef Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Fri, 10 May 2024 11:03:19 +0200 Subject: [PATCH 2/2] feat: Add -a flag --- rust-nostd-esp/Dockerfile | 12 ++++++------ rust-nostd-esp/config.toml | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rust-nostd-esp/Dockerfile b/rust-nostd-esp/Dockerfile index 7b53b64..31b43e5 100644 --- a/rust-nostd-esp/Dockerfile +++ b/rust-nostd-esp/Dockerfile @@ -13,12 +13,12 @@ RUN cargo install cargo-audit && \ chmod u+x "${HOME}/.cargo/bin/rnamer" # Generate project templates -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32 -d mcu=esp32 -d advanced=false -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32c3 -d mcu=esp32c3 -d advanced=false -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32c6 -d mcu=esp32c6 -d advanced=false -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32h2 -d mcu=esp32h2 -d advanced=false -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32s2 -d mcu=esp32s2 -d advanced=false -RUN cargo generate --vcs none esp-rs/esp-template --name rust-project-esp32s3 -d mcu=esp32s3 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32 -d mcu=esp32 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32c3 -d mcu=esp32c3 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32c6 -d mcu=esp32c6 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32h2 -d mcu=esp32h2 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32s2 -d mcu=esp32s2 -d advanced=false +RUN cargo generate -a --vcs none esp-rs/esp-template --name rust-project-esp32s3 -d mcu=esp32s3 -d advanced=false # Add alloc to the build-std property RUN find . -name "config.toml" -type f -exec sed -i 's/build-std = \["core"\]/build-std = \["alloc", "core"\]/g' {} + diff --git a/rust-nostd-esp/config.toml b/rust-nostd-esp/config.toml index 96aadcf..33e3367 100644 --- a/rust-nostd-esp/config.toml +++ b/rust-nostd-esp/config.toml @@ -4,7 +4,6 @@ runner = "espflash flash --monitor" [build] rustflags = [ - "-C", "link-arg=-Tlinkall.x", "-C", "force-frame-pointers", ]