Skip to content

Restore Yggdrasil builder compatibility with manifest v4 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pyrex41 merged 1 commit into from
Sep 27, 2026
Merged

Restore Yggdrasil builder compatibility with manifest v4 #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions crates/yggdrasil-build/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Yggdrasil stage-2 builder (Rust target).
//!
//! `yggdrasil-build <shaken-dir> <outdir>` reads a Yggdrasil shaken
//! directory (manifest v3: `yggdrasil.manifest.txt`, a shaken
//! directory (manifest v3 or v4: `yggdrasil.manifest.txt`, a shaken
//! `kernel.kl`, user `.kl` files) and scaffolds a standalone Cargo
//! project in `<outdir>`:
//!
Expand Down Expand Up @@ -29,7 +29,7 @@ use std::process::ExitCode;

use klcompile::{compile_kl, CompileOptions, SkipPolicy, KERNEL_SLOW_DEFUNS};

/// Parsed Yggdrasil manifest v3 (`key=value` lines; unknown keys ignored).
/// Parsed Yggdrasil manifest v3/v4 (`key=value` lines; unknown keys ignored).
#[derive(Debug, Default)]
struct Manifest {
kernel: String,
Expand Down Expand Up @@ -60,9 +60,9 @@ fn parse_manifest(path: &Path) -> Result<Manifest, String> {
));
};
match key {
"manifest-version" if value != "3" => {
"manifest-version" if value != "3" && value != "4" => {
return Err(format!(
"unsupported manifest-version {value:?} (expected 3)"
"unsupported manifest-version {value:?} (expected 3 or 4)"
));
}
"kernel" => m.kernel = value.to_string(),
Expand Down Expand Up @@ -105,6 +105,7 @@ fn compile_options(label: &str) -> CompileOptions {
force_skip: KERNEL_SLOW_DEFUNS.iter().map(|s| s.to_string()).collect(),
},
emit_manifest: None,
seal_same_module: false,
}
}

Expand Down
Loading