From 6fd8691188fd18c50a52ae8a6f4ac2a414cc7fd8 Mon Sep 17 00:00:00 2001
From: Victor Dumitrescu <v.dumitrescu@outlook.com>
Date: Mon, 5 May 2025 11:31:38 +0200
Subject: [PATCH 1/2] RISC-V: Reinstate Hermit installer script

---
 src/riscv/scripts/install-rust-std-hermit.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 src/riscv/scripts/install-rust-std-hermit.sh

diff --git a/src/riscv/scripts/install-rust-std-hermit.sh b/src/riscv/scripts/install-rust-std-hermit.sh
new file mode 100755
index 000000000000..4d85ceb6c423
--- /dev/null
+++ b/src/riscv/scripts/install-rust-std-hermit.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# TODO RV-622: Remove Hermit from the code base
+# Remove this script once the use of Hermit has been removed from the SDK
+
+# Ensure the toolchain is installed.
+# The second command triggers installation for Rustup 1.28+.
+rustup show active-toolchain || rustup toolchain install
+
+version="$(rustc --version | awk '{print $2}')"
+url="https://github.com/hermit-os/rust-std-hermit/releases/download/${version}/rust-std-${version}-riscv64gc-unknown-hermit.tar.gz"
+
+td="$(mktemp -d)"
+mkdir -p "$td"
+
+curl -L "$url" | tar xz -C "$td" --strip-components=1
+"$td/install.sh"
+
+rm -rf "$td"
-- 
GitLab


From 7d841a633d06fd1687e1408e0a469f4933fcbc69 Mon Sep 17 00:00:00 2001
From: Victor Dumitrescu <v.dumitrescu@outlook.com>
Date: Mon, 5 May 2025 13:38:45 +0200
Subject: [PATCH 2/2] CI: Trigger `test_kernels` job on changes in `riscv`

---
 .gitlab/ci/pipelines/before_merging.yml | 1 +
 .gitlab/ci/pipelines/merge_train.yml    | 1 +
 ci/bin/common.ml                        | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index a3a9f2b26ac0..6cd25714de66 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -2632,6 +2632,7 @@ test_kernels:
     - kernels.mk
     - sdk/rust/**/*
     - src/kernel_*/**/*
+    - src/riscv/**/*
     when: on_success
   needs:
   - oc.docker:rust-toolchain:amd64
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index 9a7bc6351472..6dceeaa3b0c2 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -2631,6 +2631,7 @@ test_kernels:
     - kernels.mk
     - sdk/rust/**/*
     - src/kernel_*/**/*
+    - src/riscv/**/*
     when: on_success
   needs:
   - oc.docker:rust-toolchain:amd64
diff --git a/ci/bin/common.ml b/ci/bin/common.ml
index fd0d78361291..95d13c4ff8ed 100644
--- a/ci/bin/common.ml
+++ b/ci/bin/common.ml
@@ -520,7 +520,8 @@ let changeset_test_kernels =
   Changeset.(
     changeset_base
     @ changeset_images (* Run if the [rust-toolchain] image is updated *)
-    @ make ["kernels.mk"; "src/kernel_*/**/*"; "sdk/rust/**/*"])
+    @ make
+        ["kernels.mk"; "src/kernel_*/**/*"; "src/riscv/**/*"; "sdk/rust/**/*"])
 
 let changeset_test_etherlink_kernel =
   Changeset.(
-- 
GitLab