From 09fece19f739cb4a051615c938cb919349690e73 Mon Sep 17 00:00:00 2001 From: Josen-B Date: Tue, 10 Feb 2026 09:19:10 +0000 Subject: [PATCH 1/3] fix: update dependencies using crates.io version --- Cargo.toml | 2 +- core/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e9e5fe37..4951b45d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,7 +73,7 @@ scope-local = "0.1" slab = { version = "0.4.9", default-features = false } spin = "0.10" starry-process = "0.2" -starry-signal = { version = "0.2", git = "https://github.com/Starry-OS/starry-signal.git", tag = "dev-v02" } +starry-signal = "0.2.4-preview.1" starry-vm = "0.2" starry-core = { path = "./core" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 67a43e1d..a4beff17 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -29,7 +29,7 @@ extern-trait.workspace = true hashbrown = { workspace = true } inherit-methods-macro = "0.1.0" kernel_guard = "0.1" -kernel-elf-parser = { git = "https://github.com/Starry-OS/kernel_elf_parser.git", rev = "fdcce74" } +kernel-elf-parser = "0.3.4" kspin.workspace = true lazy_static = { workspace = true } linkme.workspace = true From ad22d17c76d944cafb8fdb354df7671bfff58eb8 Mon Sep 17 00:00:00 2001 From: Josen-B Date: Tue, 10 Feb 2026 09:28:35 +0000 Subject: [PATCH 2/3] chore: update subproject commit reference --- arceos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arceos b/arceos index 691da8f8..3919c000 160000 --- a/arceos +++ b/arceos @@ -1 +1 @@ -Subproject commit 691da8f8aef9d419b89e0179ea9ead3597ae3640 +Subproject commit 3919c000f0ccab787c41f3a7a5718603162d0c1f From da39073d7a4d3263f578c3503e0473f464548299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9D=E5=80=89=E6=B0=B4=E5=B8=8C?= Date: Wed, 11 Feb 2026 01:38:54 +0800 Subject: [PATCH 3/3] update deps and submodule --- Cargo.lock | 65 ++++++++++++++++++++++++++++-------------------------- Cargo.toml | 4 +--- arceos | 2 +- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad65fcce..7853ecbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -232,8 +232,9 @@ dependencies = [ [[package]] name = "axcpu" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axcpu.git?tag=dev-v03#72ef3859952b7340bae261c9a50c32705e602017" +version = "0.3.0-preview.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "627bdaa84f4a3c10e4e3858e7e671463d4dbeac6867643340a06d56d8ce24d24" dependencies = [ "aarch64-cpu", "axbacktrace", @@ -547,8 +548,9 @@ dependencies = [ [[package]] name = "axplat" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31df7b8c3331809075cb9997984768d3e1b636d31dfaf5ff74d813d0aa7a6ecb" dependencies = [ "axplat-macros", "bitflags 2.10.0", @@ -562,8 +564,9 @@ dependencies = [ [[package]] name = "axplat-aarch64-peripherals" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e1f4279666685604d0b4b0e95f3cf03a1d4ffe50fd7182cd0609723378c7e" dependencies = [ "aarch64-cpu", "arm-gic-driver", @@ -581,8 +584,9 @@ dependencies = [ [[package]] name = "axplat-aarch64-qemu-virt" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b8a9933a69632d59fb677f906630c9b480ead703feb22fcac1b2cc93323b87" dependencies = [ "axconfig-macros", "axcpu", @@ -594,8 +598,9 @@ dependencies = [ [[package]] name = "axplat-loongarch64-qemu-virt" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76805b4c143ed980152f4a5de57077052c8972a156aab1db55f88681a2b914ae" dependencies = [ "axconfig-macros", "axcpu", @@ -612,7 +617,8 @@ dependencies = [ [[package]] name = "axplat-macros" version = "0.1.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90dfaee06a112fe4f810c60af1a86bc080af2172185b491cacc307b84dff748" dependencies = [ "proc-macro2", "quote", @@ -621,8 +627,9 @@ dependencies = [ [[package]] name = "axplat-riscv64-qemu-virt" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5cf5f4d4ef9d0b1752dc922f574c0aadfdf20873e194744c1d5cc13b1a36e79" dependencies = [ "axconfig-macros", "axcpu", @@ -632,15 +639,16 @@ dependencies = [ "log", "riscv", "riscv_goldfish", - "riscv_plic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "riscv_plic", "sbi-rt", "uart_16550", ] [[package]] name = "axplat-riscv64-visionfive2" -version = "0.3.0" -source = "git+https://github.com/Starry-OS/axplat-riscv64-visionfive2.git?tag=dev-v03#55c5ea6c652742d92e9150c857864d5909197633" +version = "0.1.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe6b2ca955246cad4d51b8fd89804e117a293753ce5cd3705c70a974398f2ea" dependencies = [ "axconfig-macros", "axcpu", @@ -650,15 +658,16 @@ dependencies = [ "log", "riscv", "riscv_goldfish", - "riscv_plic 0.2.0 (git+https://github.com/arceos-org/riscv_plic.git?tag=dev-v02)", + "riscv_plic", "sbi-rt", "uart_16550", ] [[package]] name = "axplat-x86-pc" -version = "0.3.0" -source = "git+https://github.com/arceos-org/axplat_crates.git?tag=dev-v03#0df0713b1c20eafaeebdc6b0e194b2985e857949" +version = "0.3.1-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d6c1bd49e83e3422ee00691ba4962a844ed603394f677054fd98fb2a8fe7f" dependencies = [ "axconfig-macros", "axcpu", @@ -1447,8 +1456,9 @@ dependencies = [ [[package]] name = "kernel-elf-parser" -version = "0.3.3" -source = "git+https://github.com/Starry-OS/kernel_elf_parser.git?rev=fdcce74#fdcce740d718031224bdb8a77ff593b38e03cea7" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1495ab3ea0a7cee31d14901a858a732e282c139b3d17d3f935aebeeefcc34a" dependencies = [ "xmas-elf", "zero", @@ -1988,14 +1998,6 @@ dependencies = [ "tock-registers 0.10.1", ] -[[package]] -name = "riscv_plic" -version = "0.2.0" -source = "git+https://github.com/arceos-org/riscv_plic.git?tag=dev-v02#e2643d2cd44b862b9d505d7caf8938ddad33e205" -dependencies = [ - "tock-registers 0.10.1", -] - [[package]] name = "rlsf" version = "0.2.2" @@ -2284,8 +2286,9 @@ dependencies = [ [[package]] name = "starry-signal" -version = "0.2.3" -source = "git+https://github.com/Starry-OS/starry-signal.git?tag=dev-v02#0597c1695b7c724f6d40e0d5873eaa148679e8bd" +version = "0.2.4-preview.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ca4375da151b08a60f80291ea5a705e8c4e3e70195d26d26796210722c0f25" dependencies = [ "axcpu", "bitflags 2.10.0", diff --git a/Cargo.toml b/Cargo.toml index 4951b45d..e17a0c9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -129,9 +129,7 @@ starry-core.workspace = true starry-api.workspace = true [dependencies.axplat-riscv64-visionfive2] -version = "0.3" -git = "https://github.com/Starry-OS/axplat-riscv64-visionfive2.git" -tag = "dev-v03" +version = "0.1.0-pre.1" features = ["fp-simd", "irq", "rtc"] optional = true diff --git a/arceos b/arceos index 3919c000..3ee403f6 160000 --- a/arceos +++ b/arceos @@ -1 +1 @@ -Subproject commit 3919c000f0ccab787c41f3a7a5718603162d0c1f +Subproject commit 3ee403f6f5b91f04355d7681b0a9bd4861a0697a