[PATCH] Install recent rustc in Debian stable

[PATCH] Install recent rustc in Debian stable

[Marc Poulhiès]

Debian stable container is used for building all GCC frontends, except
for rust (gccrs) because Debian's rustc is too old for the few
dependencies the frontend has.

Installing a more recent rustc allows the building of the
frontend (until it can self-host).

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
---
 builder/containers/Containerfile-debian-stable | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/builder/containers/Containerfile-debian-stable b/builder/containers/Containerfile-debian-stable
index b2e7614..9f77599 100644
--- a/builder/containers/Containerfile-debian-stable
+++ b/builder/containers/Containerfile-debian-stable
@@ -39,4 +39,10 @@ RUN wget -O /home/builder/bb-start.sh \
 # And now run the script
 USER builder
 WORKDIR /home/builder
+
+# Rust from Debian stable is too old to build the small dependencies of GCCRS
+# The project currently use 1.72.0, so install and use the same.
+RUN (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0 --no-modify-path)
+ENV PATH="/home/builder/.cargo/bin:${PATH}"
+
 ENTRYPOINT /home/builder/bb-start.sh
-- 
2.42.0

Re: [PATCH] Install recent rustc in Debian stable

[Marc]

Marc Poulhiès <dkm@kataplop.net> writes:

> +# Rust from Debian stable is too old to build the small dependencies of GCCRS
> +# The project currently use 1.72.0, so install and use the same.
> +RUN (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0 --no-modify-path)

"someone" already raised a possible issue with this curl|sh install
method.

I don't have strong feeling about that. I can also download the shell
script and execute it. Or follow another install method.

FWIW, it's the recommended way of using rustup:

https://rustup.rs/

Let me know if you'd prefer I change this.

Also, I recalled that there's already a gccrust builder, so there must
be a container with a recent enough rustc: maybe the gcc-all could use
the same container? I didn't find the info last night.

Marc

Re: [PATCH] Install recent rustc in Debian stable

[Mark Wielaard]

Hi Marc,

On Tue, Aug 27, 2024 at 09:08:24AM +0200, Marc wrote:
> Marc Poulhiès <dkm@kataplop.net> writes:
> 
> > +# Rust from Debian stable is too old to build the small dependencies of GCCRS
> > +# The project currently use 1.72.0, so install and use the same.
> > +RUN (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0 --no-modify-path)
> 
> "someone" already raised a possible issue with this curl|sh install
> method.

It might just be a "feeling", we do trust the distro image and package
repositories after all. But just piping a shell script from a website
into the shell does feel a little iffy.

> I don't have strong feeling about that. I can also download the shell
> script and execute it. Or follow another install method.

The script seems to mainly be to detect which architecture/distro you
are running and which tools are installed to download another
downloader binary rust-init. It then tries to execute this binary to
download other binaries (cargo, clippy, rust-docs, rust-std, rustc and
rustfmt).

Since we are after a specific version, could we try to fetch that one directly?
https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init
And then check against the expected sha256sum?

Then at least we know we got the "correct" downloader.

> FWIW, it's the recommended way of using rustup:
> 
> https://rustup.rs/
> 
> Let me know if you'd prefer I change this.

Let me know what you think of the above. Paranoid?

Also, maybe we should create a new container, just for a full gcc
(with rust) builder to keep the default Debian container smaller (we
can then also drop gdc and gnat).

> Also, I recalled that there's already a gccrust builder, so there must
> be a container with a recent enough rustc: maybe the gcc-all could use
> the same container? I didn't find the info last night.

There are a couple of container and non-container builders that try to
build gccrust (non-gcc-tree):
https://builder.sourceware.org/buildbot/#/builders?tags=gccrust
Most currently fail because they don't have a recent cargo installed.

Lets look at those (and switch them to the gcc tree?) after we got
this debian container build going.

Cheers,

Mark

[PATCH v2] Install recent rustc in Debian stable

[Marc Poulhiès]

Debian stable container is used for building all GCC frontends, except
for rust (gccrs) because Debian's rustc is too old for the few
dependencies the frontend has.

Installing a more recent rustc allows the building of the
frontend (until it can self-host).

Include the signatures for both archive and the "Rust Language (Tag and
Release Signing Key) <rust-key@rust-lang.org>" key.

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
---
Hello Mark,

Here's a new version of my patch. I've tried to take into account all comments
(from here and IRC). It now downloads the compiler (rustc) and libstd archives
and check their signature against the local (checked-in) .asc files + rust gpg
key. Not really sure how to handle the .asc and gpg key. They are currently in
'rustc-aux/' subdir. Let me know if there's something better to do here.

Marc

 .../containers/Containerfile-debian-stable    | 18 ++++
 ...1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc | 16 ++++
 .../containers/rustc-aux/rust-key.gpg.ascii   | 86 +++++++++++++++++++
 ...1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc | 16 ++++
 4 files changed, 136 insertions(+)
 create mode 100644 builder/containers/rustc-aux/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
 create mode 100644 builder/containers/rustc-aux/rust-key.gpg.ascii
 create mode 100644 builder/containers/rustc-aux/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc

diff --git a/builder/containers/Containerfile-debian-stable b/builder/containers/Containerfile-debian-stable
index b2e7614..bfc2fa8 100644
--- a/builder/containers/Containerfile-debian-stable
+++ b/builder/containers/Containerfile-debian-stable
@@ -39,4 +39,22 @@ RUN wget -O /home/builder/bb-start.sh \
 # And now run the script
 USER builder
 WORKDIR /home/builder
+
+# Rust from Debian stable is too old to build the small dependencies of GCCRS
+# The project currently use 1.72.0, so install and use the same.
+RUN mkdir -p /home/builder/rustc-install
+RUN cd /home/builder/rustc-install && wget https://static.rust-lang.org/dist/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz
+RUN cd /home/builder/rustc-install && wget https://static.rust-lang.org/dist/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz
+COPY rustc-aux/* /home/builder/rustc-install
+RUN gpg --import /home/builder/rustc-install/rust-key.gpg.ascii && \
+    gpg --verify /home/builder/rustc-install/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc && \
+    gpg --verify /home/builder/rustc-install/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
+
+RUN cd /home/builder/rustc-install/ && \
+  tar xf rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz && \
+  tar xf rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz && \
+  cd rust-1.72.0-x86_64-unknown-linux-gnu && ./install.sh --prefix=/home/builder/rust-install && \
+  cd ../rust-std-1.72.0-x86_64-unknown-linux-gnu && ./install.sh --prefix=/home/builder/rust-install
+ENV PATH="/home/builder/rust-install/bin:${PATH}"
+
 ENTRYPOINT /home/builder/bb-start.sh
diff --git a/builder/containers/rustc-aux/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc b/builder/containers/rustc-aux/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
new file mode 100644
index 0000000..3aae063
--- /dev/null
+++ b/builder/containers/rustc-aux/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+wsFcBAABCgAQBQJk51mxCRCFq5bm+hvl/gAAY3sP+gOsRrgWYu6pplEbiGYue+0y
+DjqY8P2PDLGWIILDqV/ekVvwP+K9kVVW4LXHmGPfTNdOodVNArNRjwHUUYcTGt1K
+us0jRBvtE/igUAVkLYi8n5+Tveh47H0cfuMf4SEmsqTwLcIlJwvC7OsyP4re8imt
+oMewntwDQauCuylCLo62iRJXuFu9mfK8Q3sZSvJwMZJFIeHdT7b3ZNjzmtY/5qx0
+014FtxCbI4RTaaQBw0cvyCi/0cegL2P0R7UymGJsf9Y3oQWjvcuM7cDKsYAxXwzo
+RjQPopgkQZeCO4SA+GOfnfazR+U6lDDjHjCWBC2DiixzniFQsKMUhFnSa+Z6FZ4Y
+bqb5J40o5frhGo2cBTjHomwSlzKi1aenA7raFZJGdBlySMYcd2N7N6u8ZeIL/WVE
+RDjvJyEOlZlFNxszlll4+H2lCpwia2nH/dhyk8LbGBCdTTRhzhQfnOewdEM4vKGI
+1fyByKuzc6LlZGj0nnErKeNLpoEH4oRSWVsGLgETm/1ebCTtzYC4cklh9Ebtyv2F
+QDEeqAeOxJ4b/CGEJcvcYxuGvOIj9GtdOEFlMFhyUorOf2jXtPtvmIfjZkWMTHNs
+JJXgKgYXUvqdofUjn2LZBt1kwKFVqnWbQqatGTTwIzwa3A2k8ntwe5AvDBkbg3Qz
+XYE/1FG0TNkt0X3TVwFe
+=XduK
+-----END PGP SIGNATURE-----
diff --git a/builder/containers/rustc-aux/rust-key.gpg.ascii b/builder/containers/rustc-aux/rust-key.gpg.ascii
new file mode 100644
index 0000000..93e2282
--- /dev/null
+++ b/builder/containers/rustc-aux/rust-key.gpg.ascii
@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+Mve696B5tlHyc1KxjHR6w9GRsh4=
+=5FXw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/builder/containers/rustc-aux/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc b/builder/containers/rustc-aux/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
new file mode 100644
index 0000000..7403310
--- /dev/null
+++ b/builder/containers/rustc-aux/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+wsFcBAABCgAQBQJk51muCRCFq5bm+hvl/gAAH/MQAKmUHdPkREc4WyBNiNC5Rkw/
+BwqAw8qyxTVfPBAFqPmQHClCprplRW5wyOdX9b5hF33mCsuQLysK0bnrXX+C04qs
+RjSQPur6ea7Z2mpPceCdSQAtSzP3I56+j12WiRgdrTyF2Oq4LmYT4NrdgHevcCS6
+lFTinzjibxFlhWk3d2f6d6/2sZnXmm4Rd+TTnb94DpkK+lRs29/W7STFz+oxDyDr
+Wh2fqeuZjxKzQ/RXS4KqJivX271V68OFPdYY4ps/HeKRWhtuQr/ShMaQUaQVVcOf
+1MPE+Fip0/sLywaYB6Ooc5C7XBQiVdXEljAuSVuzwGum5C20+0FIjjjk+EnCY/qU
+S0BVInnRBEE7iNlCYyBKz7DH/fb66vDBKdEWbtsIgKssv8CZx+I+h8GAJ4Fe9nha
+1qxTFSqImDgsbozk7Ie/z2wp57d+S+kxk10QubAPIE/Qp6Xdu+G7wJEJ6bXRxMRJ
+aR+oxDVPSu8PvUoj6ffOblNYqFbcC4RpCRS5Mr8kZfPCaJnnF7dHgT773yLfRhiw
+FpffSIgOuz02YJ91ccN8ij77Ty38ek7lqh5JSBTPz9bYXnfanW9KMrEXNyNRubBk
+RTpmY4MWP+7urGMbYIkXHZyBo/zvKUmHT4+AUliLb+5MbxyuMlFpkRk/5HI604KH
+eV6rq8O4LQL57UqKWRJg
+=bTDK
+-----END PGP SIGNATURE-----
-- 
2.42.0

Re: [PATCH] Install recent rustc in Debian stable

[Frank Ch. Eigler]

Hi -

> > +RUN (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0 --no-modify-path)
> 
> "someone" already raised a possible issue with this curl|sh install
> method. [...]
> https://rustup.rs/

What a horror.  We'd have no idea what actually is installed or done.


- FChE

Re: [PATCH v2] Install recent rustc in Debian stable

[Mark Wielaard]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

Hi Marc,

On Wed, Aug 28, 2024 at 10:02:38AM +0200, Marc Poulhiès wrote:
> Debian stable container is used for building all GCC frontends, except
> for rust (gccrs) because Debian's rustc is too old for the few
> dependencies the frontend has.
> 
> Installing a more recent rustc allows the building of the
> frontend (until it can self-host).
> 
> Include the signatures for both archive and the "Rust Language (Tag and
> Release Signing Key) <rust-key@rust-lang.org>" key.
> 
> Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
> ---
>
> Here's a new version of my patch. I've tried to take into account
> all comments (from here and IRC). It now downloads the compiler
> (rustc) and libstd archives and check their signature against the
> local (checked-in) .asc files + rust gpg key. Not really sure how to
> handle the .asc and gpg key. They are currently in 'rustc-aux/'
> subdir. Let me know if there's something better to do here.

I tweaked it a little to just use the sha256 checksum (from the
.sha256 files and double checked by hand). Your solution whould have
been more generic, but we can only sent the ContainerFile itself to
the remote docker runtime. So the COPY directives only work locally,
not remotely. Hardcoding the checksums in the ContainerFile is less
generic, but does make sure we are downloading the exact expected
binaries.

Tweaked patch, as pushed, attached.

Thanks,

Mark

[-- Attachment #2: 0001-Install-recent-rustc-in-Debian-stable.patch --]
[-- Type: text/plain, Size: 2448 bytes --]

From 2eec9452c12bd307043823ad414c5fdbb78a1c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= <dkm@kataplop.net>
Date: Wed, 28 Aug 2024 10:02:38 +0200
Subject: [PATCH] Install recent rustc in Debian stable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Debian stable container is used for building all GCC frontends, except
for rust (gccrs) because Debian's rustc is too old for the few
dependencies the frontend has.

Installing a more recent rustc allows the building of the
frontend (until it can self-host).

Include the sha256 checksums for both archives and check that we are
downloading the expected binaries.

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 builder/containers/Containerfile-debian-stable | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/builder/containers/Containerfile-debian-stable b/builder/containers/Containerfile-debian-stable
index b2e76142c5ed..3a0e313a1e94 100644
--- a/builder/containers/Containerfile-debian-stable
+++ b/builder/containers/Containerfile-debian-stable
@@ -39,4 +39,21 @@ RUN wget -O /home/builder/bb-start.sh \
 # And now run the script
 USER builder
 WORKDIR /home/builder
+
+# Rust from Debian stable is too old to build the small dependencies of GCCRS
+# The project currently use 1.72.0, so install and use the same.
+RUN mkdir -p /home/builder/rustc-install \
+    && cd /home/builder/rustc-install \
+    && wget https://static.rust-lang.org/dist/rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz \
+    && echo "f2bbe23e685852104fd48d0e34ac981b0917e76c62cfcd6d0ac5283e4710c7b9  rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz" | sha256sum --check \
+    && wget https://static.rust-lang.org/dist/rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz \
+    && echo "89f6f6ef25e7e754940c54cc0584bfdb83e1df75019d5aa126e3fa66c2921b15  rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz" | sha256sum --check
+
+RUN cd /home/builder/rustc-install/ && \
+  tar xf rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz && \
+  tar xf rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz && \
+  cd rust-1.72.0-x86_64-unknown-linux-gnu && ./install.sh --prefix=/home/builder/rust-install && \
+  cd ../rust-std-1.72.0-x86_64-unknown-linux-gnu && ./install.sh --prefix=/home/builder/rust-install
+ENV PATH="/home/builder/rust-install/bin:${PATH}"
+
 ENTRYPOINT /home/builder/bb-start.sh
-- 
2.46.0