Skip to content

Commit e280c5f

Browse files
committed
build: update deps
Signed-off-by: YdrMaster <ydrml@hotmail.com>
1 parent 2ea3bab commit e280c5f

File tree

7 files changed

+62
-54
lines changed

7 files changed

+62
-54
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1616

1717
- Use derive macro based RustSBI interface, with separate functions for legacy stdio
1818
- Update sbi-testing to version 0.0.1
19-
- Update sbi-spec to version 0.0.6
19+
- Update sbi-spec to version 0.0.7
2020
- Use crate *fast-trap* version 0.0.1 in rustsbi-qemu for trap handling
2121
- Use crate *rcore-console* version 0.0.0 in rustsbi-qemu and test-kernel for `print!` and `println!`
2222
- Use crate *aclint* version 0.0.0 in rustsbi-qemu for aclint structs
2323
- Use crate *os-xtask-utils* version 0.0.0 in xtask builder
2424
- Use crate *sifive-test-device* version 0.0.0 instead of qemu-exit
2525
- Use crate *uart16550* version 0.0.1 for 16550 definition
2626
- Use `wfi` for suspend and stop without enable mie
27+
- Remove crate *once_cell* from dependencies
2728

2829
### Fixed
2930

Cargo.lock

Lines changed: 48 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bench-kernel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
sbi-rt = "0.0.3-rc.5"
11+
sbi-rt = "0.0.3"
1212
riscv = "0.10.1"
1313
uart16550 = "0.0.1"
1414
rcore-console = "0.0.0"

hsm-cell/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
sbi-spec = "0.0.7-alpha.3"
9+
sbi-spec = "0.0.7"
1010

1111
[lib]
1212
name = "hsm_cell"

rustsbi-qemu/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ edition = "2021"
1717
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1818

1919
[dependencies]
20-
rustsbi = { git = "https://github.com/rustsbi/rustsbi", rev = "4c40cd", features = [
21-
"machine",
22-
] }
23-
sbi-spec = { version = "0.0.7-alpha.3", features = ["legacy"] }
20+
rustsbi = { version = "0.4.0-alpha.1", features = ["machine"] }
21+
sbi-spec = { version = "0.0.7", features = ["legacy"] }
2422
riscv = "0.10.1"
2523
spin = "0.9"
2624
rcore-console = "0.0.0"

xtask/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ publish = false
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
clap = { version = "4.4", features = ["derive"] }
12+
clap = { version = "4.5", features = ["derive"] }
1313
os-xtask-utils = "0.0.0"
14-
once_cell = "1.18"

xtask/src/main.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
extern crate clap;
33

44
use clap::Parser;
5-
use once_cell::sync::Lazy;
65
use os_xtask_utils::{BinUtil, Cargo, CommandExt, Qemu};
76
use std::{
87
fs, io,
98
path::{Path, PathBuf},
109
process,
10+
sync::OnceLock,
1111
};
1212

13-
static PROJECT: Lazy<&'static Path> =
14-
Lazy::new(|| Path::new(std::env!("CARGO_MANIFEST_DIR")).parent().unwrap());
13+
fn project() -> &'static Path {
14+
static PROJECT: OnceLock<&'static Path> = OnceLock::new();
15+
PROJECT.get_or_init(|| Path::new(std::env!("CARGO_MANIFEST_DIR")).parent().unwrap())
16+
}
1517

1618
#[derive(Parser)]
1719
#[clap(name = "RustSBI-Qemu")]
@@ -68,7 +70,7 @@ impl BuildArgs {
6870
})
6971
.target(target)
7072
.invoke();
71-
let elf = PROJECT
73+
let elf = project()
7274
.join("target")
7375
.join(target)
7476
.join(if self.debug { "debug" } else { "release" })
@@ -105,7 +107,7 @@ impl AsmArgs {
105107
/// 如果设置了 `kernel` 但不是 'test' 或 'test-kernel',将 `kernel` 指定的二进制文件反汇编,并保存到指定位置。
106108
fn dump(self) {
107109
let elf = self.build.make(package(self.build.kernel.as_ref()), false);
108-
let out = PROJECT.join(self.output.unwrap_or(format!(
110+
let out = project().join(self.output.unwrap_or(format!(
109111
"{}.asm",
110112
elf.file_stem().unwrap().to_string_lossy()
111113
)));

0 commit comments

Comments
 (0)