Skip to content

Commit 9c12e5f

Browse files
committed
chore(code): move sprout code to crates/sprout and remove splash support for minimalism
1 parent b103fda commit 9c12e5f

52 files changed

Lines changed: 43 additions & 354 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,8 @@
1-
[package]
2-
name = "edera-sprout"
3-
description = "Modern UEFI bootloader"
4-
license = "Apache-2.0"
5-
version = "0.0.17"
6-
homepage = "https://sprout.edera.dev"
7-
repository = "https://github.com/edera-dev/sprout"
8-
edition = "2024"
9-
10-
[dependencies]
11-
anyhow = "1.0.100"
12-
bitflags = "2.10.0"
13-
toml = "0.9.8"
14-
log = "0.4.28"
15-
16-
[dependencies.image]
17-
version = "0.25.8"
18-
default-features = false
19-
features = ["png"]
20-
optional = true
21-
22-
[dependencies.serde]
23-
version = "1.0.228"
24-
features = ["derive"]
25-
26-
[dependencies.sha256]
27-
version = "1.6.0"
28-
default-features = false
29-
30-
[dependencies.uefi]
31-
version = "0.36.0"
32-
features = ["alloc", "logger"]
33-
34-
[dependencies.uefi-raw]
35-
version = "0.12.0"
36-
37-
[features]
38-
default = ["splash"]
39-
splash = ["dep:image"]
1+
[workspace]
2+
members = [
3+
"crates/sprout",
4+
]
5+
resolver = "3"
406

417
[profile.dev]
428
# We have to compile for opt-level = 2 due to optimization passes
@@ -57,15 +23,3 @@ inherits = "dev"
5723
strip = "debuginfo"
5824
debug = 0
5925
opt-level = 2
60-
61-
[patch.crates-io.simd-adler32]
62-
git = "https://github.com/edera-dev/sprout-patched-deps.git"
63-
rev = "2c4fcc84b50d40c28f540d4271109ea0ca7e1268"
64-
65-
[patch.crates-io.moxcms]
66-
git = "https://github.com/edera-dev/sprout-patched-deps.git"
67-
rev = "2c4fcc84b50d40c28f540d4271109ea0ca7e1268"
68-
69-
[[bin]]
70-
name = "sprout"
71-
path = "src/main.rs"

crates/sprout/Cargo.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[package]
2+
name = "edera-sprout"
3+
description = "Modern UEFI bootloader"
4+
license = "Apache-2.0"
5+
version = "0.0.17"
6+
homepage = "https://sprout.edera.dev"
7+
repository = "https://github.com/edera-dev/sprout"
8+
edition = "2024"
9+
10+
[dependencies]
11+
anyhow = "1.0.100"
12+
bitflags = "2.10.0"
13+
toml = "0.9.8"
14+
log = "0.4.28"
15+
16+
[dependencies.serde]
17+
version = "1.0.228"
18+
features = ["derive"]
19+
20+
[dependencies.sha256]
21+
version = "1.6.0"
22+
default-features = false
23+
24+
[dependencies.uefi]
25+
version = "0.36.0"
26+
features = ["alloc", "logger"]
27+
28+
[dependencies.uefi-raw]
29+
version = "0.12.0"
30+
31+
[[bin]]
32+
name = "sprout"
33+
path = "src/main.rs"

crates/sprout/README.md

Lines changed: 3 additions & 0 deletions
File renamed without changes.
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ pub mod edera;
1010
/// EFI console print action.
1111
pub mod print;
1212

13-
/// Splash screen action.
14-
#[cfg(feature = "splash")]
15-
pub mod splash;
16-
1713
/// Declares an action that sprout can execute.
1814
/// Actions allow configuring sprout's internal runtime mechanisms with values
1915
/// that you can specify via other concepts.
@@ -29,10 +25,6 @@ pub struct ActionDeclaration {
2925
/// Print a string to the EFI console.
3026
#[serde(default)]
3127
pub print: Option<print::PrintConfiguration>,
32-
/// Show an image as a fullscreen splash screen.
33-
#[serde(default)]
34-
#[cfg(feature = "splash")]
35-
pub splash: Option<splash::SplashConfiguration>,
3628
/// Boot the Edera hypervisor and the root operating system.
3729
/// This action is an extension on top of the Xen EFI stub that
3830
/// is specific to Edera.
@@ -67,12 +59,6 @@ pub fn execute(context: Rc<SproutContext>, name: impl AsRef<str>) -> Result<()>
6759
return Ok(());
6860
}
6961

70-
#[cfg(feature = "splash")]
71-
if let Some(splash) = &action.splash {
72-
splash::splash(context.clone(), splash)?;
73-
return Ok(());
74-
}
75-
7662
// If we reach here, we don't know how to execute the action that was configured.
7763
// This is likely unreachable, but we should still return an error just in case.
7864
bail!("unknown action configuration");

0 commit comments

Comments
 (0)