From f8d87fd89d4cf851c9e3d64a0ce35abbcaee51a4 Mon Sep 17 00:00:00 2001 From: hky1999 <976929993@qq.com> Date: Tue, 17 Dec 2024 13:34:10 +0800 Subject: [PATCH 1/2] Bump version to v0.4.2, fix x86_64 dep version as v0.15.1 --- Cargo.toml | 2 +- page_table_entry/Cargo.toml | 2 +- page_table_multiarch/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9d7ba94..51931a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ ] [workspace.package] -version = "0.4.1" +version = "0.4.2" authors = ["Yuekai Jia "] license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" homepage = "https://github.com/arceos-org/arceos" diff --git a/page_table_entry/Cargo.toml b/page_table_entry/Cargo.toml index 41093e8..6f89325 100644 --- a/page_table_entry/Cargo.toml +++ b/page_table_entry/Cargo.toml @@ -22,7 +22,7 @@ memory_addr = "0.3" aarch64-cpu = "9.4" [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies] -x86_64 = "0.15" +x86_64 = "=0.15.1" [package.metadata.docs.rs] rustc-args = [ "--cfg" , "doc"] diff --git a/page_table_multiarch/Cargo.toml b/page_table_multiarch/Cargo.toml index 2b12ba9..22827e0 100644 --- a/page_table_multiarch/Cargo.toml +++ b/page_table_multiarch/Cargo.toml @@ -14,7 +14,7 @@ categories.workspace = true [dependencies] log = "0.4" memory_addr = "0.3" -page_table_entry = { path = "../page_table_entry", version = "0.4.1" } +page_table_entry = { path = "../page_table_entry", version = "0.4.2" } [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies] x86 = "0.52" From 5e68b75e34a5ac44ec72adf0b44f4ac5ef7480dd Mon Sep 17 00:00:00 2001 From: hky1999 <976929993@qq.com> Date: Tue, 17 Dec 2024 13:38:26 +0800 Subject: [PATCH 2/2] Fixed rust toolchain version as 2024-05-02 --- rust-toolchain.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..db01788 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +profile = "minimal" +channel = "nightly-2024-05-02" +components = ["rust-src", "llvm-tools", "rustfmt", "clippy"] +targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none", "aarch64-unknown-none-softfloat"]