From b772adc58003d58e2ae38b0640095cc3571665fc Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Wed, 31 May 2023 16:32:51 +0200 Subject: [PATCH 1/2] add ld-memory --- riotbuild/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index 04e2e123..b7e69d4d 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -364,6 +364,10 @@ RUN \ echo 'Cleaning up root-owned crates.io cache' >&2 && \ rm -rf /opt/rustup/.cargo/{git,registry,.package-cache} +# get ld-memory from pre-built containers (ld-memory is used for on-the-fly +# .ld linker script generation) +COPY --from=kaspar030/ld-memory:0.2 /ld-memory /usr/bin/ld-memory + # get Dockerfile version from build args ARG RIOTBUILD_VERSION=unknown ENV RIOTBUILD_VERSION $RIOTBUILD_VERSION From 81ac9c7abc72f7bfd761cc5a54e584cbde9d6d4f Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 2 Jun 2023 11:53:55 +0200 Subject: [PATCH 2/2] riotbuild: pin ld-memory version to 0.2.7 --- riotbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index b7e69d4d..7fe6c77b 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -366,7 +366,7 @@ RUN \ # get ld-memory from pre-built containers (ld-memory is used for on-the-fly # .ld linker script generation) -COPY --from=kaspar030/ld-memory:0.2 /ld-memory /usr/bin/ld-memory +COPY --from=kaspar030/ld-memory:0.2.7 /ld-memory /usr/bin/ld-memory # get Dockerfile version from build args ARG RIOTBUILD_VERSION=unknown