From 9217bd350c44d08d6c2741254172ff9922a10c55 Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Mon, 5 Feb 2024 06:39:40 -0500
Subject: [PATCH 1/2] rust: add Rust 1.75.0

---
 src/core/build.mk           | 5 ++++-
 src/core/rust/Containerfile | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/build.mk b/src/core/build.mk
index a1f434c..5bbf1c4 100644
--- a/src/core/build.mk
+++ b/src/core/build.mk
@@ -270,5 +270,8 @@ out/rust1.72.tgz: out/rust1.71.tgz
 out/rust1.73.tgz: out/rust1.72.tgz
 	$(call build,core,rust,1.73.0,package,--build-arg BUILD_VERSION=1.72.0 --build-arg LLVM_VERSION=16)
 
-out/rust.tgz: out/rust1.73.tgz
+out/rust1.74.tgz: out/rust1.73.tgz
 	$(call build,core,rust,1.74.0,package,--build-arg BUILD_VERSION=1.73.0 --build-arg LLVM_VERSION=16)
+
+out/rust.tgz: out/rust1.74.tgz
+	$(call build,core,rust,1.75.0,package,--build-arg BUILD_VERSION=1.74.0 --build-arg LLVM_VERSION=16)
diff --git a/src/core/rust/Containerfile b/src/core/rust/Containerfile
index f570dda..3390847 100644
--- a/src/core/rust/Containerfile
+++ b/src/core/rust/Containerfile
@@ -29,6 +29,7 @@ ENV SRC_HASH_1_71_0=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb7977173057364203
 ENV SRC_HASH_1_72_0=ea9d61bbb51d76b6ea681156f69f0e0596b59722f04414b01c6e100b4b5be3a1
 ENV SRC_HASH_1_73_0=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
 ENV SRC_HASH_1_74_0=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049
+ENV SRC_HASH_1_75_0=5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088
 ARG REGISTRY
 ENV REGISTRY=${REGISTRY}
 ARG VERSION
@@ -114,6 +115,8 @@ FROM fetch as build
 RUN tar -xzf rustc-${VERSION}-src.tar.gz
 WORKDIR rustc-${VERSION}-src
 COPY --from=rust . /
+# Required by Rust >= 1.75.0
+RUN mkdir -p /home/user/.cargo/registry/src/index.crates.io-6f17d22bba15001f/
 RUN set -eux; \
     ./configure \
         --build="x86_64-unknown-linux-musl" \
-- 
2.40.1


From 0ddfd4c24e819844876ec9d01d3893400f861f6b Mon Sep 17 00:00:00 2001
From: ryan <ryan@distrust.co>
Date: Mon, 5 Feb 2024 21:03:14 -0500
Subject: [PATCH 2/2] rust: add registry in root as well

---
 src/core/rust/Containerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/rust/Containerfile b/src/core/rust/Containerfile
index 3390847..a3a906a 100644
--- a/src/core/rust/Containerfile
+++ b/src/core/rust/Containerfile
@@ -116,7 +116,7 @@ RUN tar -xzf rustc-${VERSION}-src.tar.gz
 WORKDIR rustc-${VERSION}-src
 COPY --from=rust . /
 # Required by Rust >= 1.75.0
-RUN mkdir -p /home/user/.cargo/registry/src/index.crates.io-6f17d22bba15001f/
+RUN mkdir -p $HOME/.cargo/registry/src/index.crates.io-6f17d22bba15001f/
 RUN set -eux; \
     ./configure \
         --build="x86_64-unknown-linux-musl" \
@@ -158,6 +158,8 @@ RUN set -eux; \
 
 FROM build as install
 USER 0:0
+# Required by Rust >= 1.75.0
+RUN mkdir -p /.cargo/registry/src/index.crates.io-6f17d22bba15001f/
 RUN set -eux; \
     python3 x.py install; \
     cd /rootfs/usr/lib/rustlib; \
-- 
2.40.1