Skip to content

Commit 31ce18f

Browse files
committed
feat(kernel): 更新依赖版本并添加initrd路径配置
1 parent 3343b85 commit 31ce18f

File tree

4 files changed

+15
-38
lines changed

4 files changed

+15
-38
lines changed

kernel/Cargo.lock

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

kernel/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ version = "0.1.0"
44
edition = "2021"
55

66
[build-dependencies]
7-
anaxa-builder = "0.4.6"
7+
anaxa-builder = "0.5.0"
88
glob = "0.3.0"
99

1010
[dependencies]
11-
ab_glyph = { version = "0.2.31", default-features = false, features = ["libm"], optional = true }
11+
ab_glyph = { version = "0.2.31", default-features = false, features = [
12+
"libm",
13+
], optional = true }
1214
libm = { version = "0.2.15", optional = true }
13-
bitmap-allocator = "0.2.0"
1415
lazy_static = { version = "1.5.0", features = ["spin_no_std"] }
1516
limine = "0.5.0"
16-
linked_list_allocator = "0.10.5"
1717
log = "0.4.27"
1818
paste = "1.0.15"
1919
pic8259 = "0.11.0"
@@ -27,4 +27,3 @@ acpi = "6.0.1"
2727

2828
[features]
2929
ttf = ["dep:ab_glyph", "dep:libm"]
30-

kernel/src/Kconfig.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ type = "string"
1414
default = ""
1515
desc = "Additional Version String"
1616
help = "Additional version string to append to the kernel version."
17+
18+
[[config]]
19+
name = "INITRD_PATH"
20+
type = "cstr"
21+
default = "/initrd.cpio"
22+
desc = "Initrd Path"
23+
help = "Path to the initrd file."

kernel/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub static HHDM_REQUEST: limine::request::HhdmRequest = limine::request::HhdmReq
6464
#[unsafe(link_section = ".requests")]
6565
#[used]
6666
pub static MODULE_REQUEST: ModuleRequest = ModuleRequest::new()
67-
.with_internal_modules(&[&InternalModule::new().with_path(c"/initrd.cpio")]);
67+
.with_internal_modules(&[&InternalModule::new().with_path(config::INITRD_PATH)]);
6868

6969
/// This will extern the C function and make it to safe.
7070
///

0 commit comments

Comments
 (0)