Skip to content

Commit

Permalink
fix: rust toolchain
Browse files Browse the repository at this point in the history
The download archive was using the `gnu` version which is glibc based.
Also update to use the right one for arm64.

Signed-off-by: Noel Georgi <git@frezbo.dev>
  • Loading branch information
frezbo committed Jan 26, 2024
1 parent 8cc79e6 commit f4b41d1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 0 additions & 2 deletions Pkgfile
Expand Up @@ -301,8 +301,6 @@ vars:

# renovate: datasource=github-tags depName=rust-lang/rust
rust_version: 1.75.0
rust_sha256: 473978b6f8ff216389f9e89315211c6b683cf95a966196e7914b46e8cf0d74f6
rust_sha512: fdb0642e93915c150dd352c1c49fda275f61e78a91a6ff7403bd275fceb86563403055c00a0c745911bc9e17656e80034d257274ad3d306b1f3314ec1c541dcb

# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/sed.git
sed_version: 4.9
Expand Down
16 changes: 12 additions & 4 deletions rust/pkg.yaml
Expand Up @@ -3,18 +3,26 @@ dependencies:
- stage: base
steps:
- sources:
- url: https://static.rust-lang.org/dist/rust-{{ .rust_version }}-x86_64-unknown-linux-gnu.tar.gz
# {{ if eq .ARCH "aarch64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr
- url: https://static.rust-lang.org/dist/rust-{{ .rust_version }}-aarch64-unknown-linux-musl.tar.gz
destination: rust.tar.gz
sha256: "{{ .rust_sha256 }}"
sha512: "{{ .rust_sha512 }}"
sha256: 26b5989525b7cf623f3868a37549736e0efe1142a08f191a97e29758cc640ac4
sha512: 54604c42a159d27b4f5e9792b44358963d08f757130eac2f3ba1c5275ef4c2c73e03ff198c983197c5a3d5aa4564bfb19135800d4c05b60668e4f9f8cd32eda4
# {{ else }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr
- url: https://static.rust-lang.org/dist/rust-{{ .rust_version }}-x86_64-unknown-linux-musl.tar.gz
destination: rust.tar.gz
sha256: cc6ef41aa811ab34f946fe2b4338d1107daf08642125fd566386bf45563597de
sha512: eb814763531dd751acec9ac60925c867a750f421c80f3bc110049a53b7a7c10b985dc77210d409e43650bdfb5788758e25cb87358de8a9556272d04480a2a246
# {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr
prepare:
- |
tar -xf rust.tar.gz --strip-components=1
install:
- |
./install.sh \
--destdir=/rootfs \
--prefix=${TOOLCHAIN}
--prefix=${TOOLCHAIN} \
--components=rustc,rust-std-{{ .ARCH }}-unknown-linux-musl,cargo
finalize:
- from: /rootfs
to: /

0 comments on commit f4b41d1

Please sign in to comment.