From 532fb38d5ae34f7422bf23b76f0b15e9042efcbe Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Mon, 3 Nov 2025 22:52:54 -0500 Subject: [PATCH] chore(code): move crates/sprout to crates/boot and name it edera-sprout-boot --- Cargo.lock | 2 +- Cargo.toml | 2 +- DEVELOPMENT.md | 2 +- crates/{sprout => boot}/Cargo.toml | 4 ++-- crates/{sprout => boot}/README.md | 0 crates/{sprout => boot}/build.rs | 0 crates/{sprout => boot}/src/actions.rs | 0 crates/{sprout => boot}/src/actions/chainload.rs | 0 crates/{sprout => boot}/src/actions/edera.rs | 0 crates/{sprout => boot}/src/actions/print.rs | 0 crates/{sprout => boot}/src/autoconfigure.rs | 0 crates/{sprout => boot}/src/autoconfigure/bls.rs | 0 crates/{sprout => boot}/src/autoconfigure/linux.rs | 0 crates/{sprout => boot}/src/autoconfigure/windows.rs | 0 crates/{sprout => boot}/src/config.rs | 0 crates/{sprout => boot}/src/config/loader.rs | 0 crates/{sprout => boot}/src/context.rs | 0 crates/{sprout => boot}/src/drivers.rs | 0 crates/{sprout => boot}/src/entries.rs | 0 crates/{sprout => boot}/src/extractors.rs | 0 .../src/extractors/filesystem_device_match.rs | 0 crates/{sprout => boot}/src/generators.rs | 0 crates/{sprout => boot}/src/generators/bls.rs | 0 crates/{sprout => boot}/src/generators/bls/entry.rs | 0 crates/{sprout => boot}/src/generators/list.rs | 0 crates/{sprout => boot}/src/generators/matrix.rs | 0 crates/{sprout => boot}/src/main.rs | 0 crates/{sprout => boot}/src/menu.rs | 0 crates/{sprout => boot}/src/options.rs | 0 crates/{sprout => boot}/src/options/env.rs | 0 crates/{sprout => boot}/src/options/parser.rs | 0 crates/{sprout => boot}/src/phases.rs | 0 crates/{sprout => boot}/src/sbat.csv | 0 crates/{sprout => boot}/src/sbat.rs | 0 crates/{sprout => boot}/src/utils.rs | 0 crates/{sprout => boot}/src/utils/vercmp.rs | 0 36 files changed, 5 insertions(+), 5 deletions(-) rename crates/{sprout => boot}/Cargo.toml (87%) rename crates/{sprout => boot}/README.md (100%) rename crates/{sprout => boot}/build.rs (100%) rename crates/{sprout => boot}/src/actions.rs (100%) rename crates/{sprout => boot}/src/actions/chainload.rs (100%) rename crates/{sprout => boot}/src/actions/edera.rs (100%) rename crates/{sprout => boot}/src/actions/print.rs (100%) rename crates/{sprout => boot}/src/autoconfigure.rs (100%) rename crates/{sprout => boot}/src/autoconfigure/bls.rs (100%) rename crates/{sprout => boot}/src/autoconfigure/linux.rs (100%) rename crates/{sprout => boot}/src/autoconfigure/windows.rs (100%) rename crates/{sprout => boot}/src/config.rs (100%) rename crates/{sprout => boot}/src/config/loader.rs (100%) rename crates/{sprout => boot}/src/context.rs (100%) rename crates/{sprout => boot}/src/drivers.rs (100%) rename crates/{sprout => boot}/src/entries.rs (100%) rename crates/{sprout => boot}/src/extractors.rs (100%) rename crates/{sprout => boot}/src/extractors/filesystem_device_match.rs (100%) rename crates/{sprout => boot}/src/generators.rs (100%) rename crates/{sprout => boot}/src/generators/bls.rs (100%) rename crates/{sprout => boot}/src/generators/bls/entry.rs (100%) rename crates/{sprout => boot}/src/generators/list.rs (100%) rename crates/{sprout => boot}/src/generators/matrix.rs (100%) rename crates/{sprout => boot}/src/main.rs (100%) rename crates/{sprout => boot}/src/menu.rs (100%) rename crates/{sprout => boot}/src/options.rs (100%) rename crates/{sprout => boot}/src/options/env.rs (100%) rename crates/{sprout => boot}/src/options/parser.rs (100%) rename crates/{sprout => boot}/src/phases.rs (100%) rename crates/{sprout => boot}/src/sbat.csv (100%) rename crates/{sprout => boot}/src/sbat.rs (100%) rename crates/{sprout => boot}/src/utils.rs (100%) rename crates/{sprout => boot}/src/utils/vercmp.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 900723e..9841cd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ ] [[package]] -name = "edera-sprout" +name = "edera-sprout-boot" version = "0.0.22" dependencies = [ "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 4cc53bb..3baa8fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [workspace] members = [ + "crates/boot", "crates/build", "crates/config", "crates/eficore", - "crates/sprout", ] resolver = "3" diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index cf1a808..e0af708 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -15,10 +15,10 @@ as an argument to boot.sh to boot the specified architecture. Sprout is split into multiple crates: +- `edera-sprout-boot` as `crates/boot`: Bootloader entrypoint for Sprout. - `edera-sprout-build` at `crates/build`: Build logic for Sprout. - `edera-sprout-config` at `crates/config`: Serialization structures for the Sprout configuration file. - `edera-sprout-eficore` at `crates/eficore`: Core library for Sprout EFI code. -- `edera-sprout` as `crates/sprout`: Main crate that contains the Sprout bootloader logic. It is intended that overtime Sprout will be split into even more crates. diff --git a/crates/sprout/Cargo.toml b/crates/boot/Cargo.toml similarity index 87% rename from crates/sprout/Cargo.toml rename to crates/boot/Cargo.toml index 58538fc..7c2a24e 100644 --- a/crates/sprout/Cargo.toml +++ b/crates/boot/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "edera-sprout" -description = "Modern UEFI bootloader" +name = "edera-sprout-boot" +description = "Sprout: Modern UEFI Bootloader" license.workspace = true version.workspace = true homepage.workspace = true diff --git a/crates/sprout/README.md b/crates/boot/README.md similarity index 100% rename from crates/sprout/README.md rename to crates/boot/README.md diff --git a/crates/sprout/build.rs b/crates/boot/build.rs similarity index 100% rename from crates/sprout/build.rs rename to crates/boot/build.rs diff --git a/crates/sprout/src/actions.rs b/crates/boot/src/actions.rs similarity index 100% rename from crates/sprout/src/actions.rs rename to crates/boot/src/actions.rs diff --git a/crates/sprout/src/actions/chainload.rs b/crates/boot/src/actions/chainload.rs similarity index 100% rename from crates/sprout/src/actions/chainload.rs rename to crates/boot/src/actions/chainload.rs diff --git a/crates/sprout/src/actions/edera.rs b/crates/boot/src/actions/edera.rs similarity index 100% rename from crates/sprout/src/actions/edera.rs rename to crates/boot/src/actions/edera.rs diff --git a/crates/sprout/src/actions/print.rs b/crates/boot/src/actions/print.rs similarity index 100% rename from crates/sprout/src/actions/print.rs rename to crates/boot/src/actions/print.rs diff --git a/crates/sprout/src/autoconfigure.rs b/crates/boot/src/autoconfigure.rs similarity index 100% rename from crates/sprout/src/autoconfigure.rs rename to crates/boot/src/autoconfigure.rs diff --git a/crates/sprout/src/autoconfigure/bls.rs b/crates/boot/src/autoconfigure/bls.rs similarity index 100% rename from crates/sprout/src/autoconfigure/bls.rs rename to crates/boot/src/autoconfigure/bls.rs diff --git a/crates/sprout/src/autoconfigure/linux.rs b/crates/boot/src/autoconfigure/linux.rs similarity index 100% rename from crates/sprout/src/autoconfigure/linux.rs rename to crates/boot/src/autoconfigure/linux.rs diff --git a/crates/sprout/src/autoconfigure/windows.rs b/crates/boot/src/autoconfigure/windows.rs similarity index 100% rename from crates/sprout/src/autoconfigure/windows.rs rename to crates/boot/src/autoconfigure/windows.rs diff --git a/crates/sprout/src/config.rs b/crates/boot/src/config.rs similarity index 100% rename from crates/sprout/src/config.rs rename to crates/boot/src/config.rs diff --git a/crates/sprout/src/config/loader.rs b/crates/boot/src/config/loader.rs similarity index 100% rename from crates/sprout/src/config/loader.rs rename to crates/boot/src/config/loader.rs diff --git a/crates/sprout/src/context.rs b/crates/boot/src/context.rs similarity index 100% rename from crates/sprout/src/context.rs rename to crates/boot/src/context.rs diff --git a/crates/sprout/src/drivers.rs b/crates/boot/src/drivers.rs similarity index 100% rename from crates/sprout/src/drivers.rs rename to crates/boot/src/drivers.rs diff --git a/crates/sprout/src/entries.rs b/crates/boot/src/entries.rs similarity index 100% rename from crates/sprout/src/entries.rs rename to crates/boot/src/entries.rs diff --git a/crates/sprout/src/extractors.rs b/crates/boot/src/extractors.rs similarity index 100% rename from crates/sprout/src/extractors.rs rename to crates/boot/src/extractors.rs diff --git a/crates/sprout/src/extractors/filesystem_device_match.rs b/crates/boot/src/extractors/filesystem_device_match.rs similarity index 100% rename from crates/sprout/src/extractors/filesystem_device_match.rs rename to crates/boot/src/extractors/filesystem_device_match.rs diff --git a/crates/sprout/src/generators.rs b/crates/boot/src/generators.rs similarity index 100% rename from crates/sprout/src/generators.rs rename to crates/boot/src/generators.rs diff --git a/crates/sprout/src/generators/bls.rs b/crates/boot/src/generators/bls.rs similarity index 100% rename from crates/sprout/src/generators/bls.rs rename to crates/boot/src/generators/bls.rs diff --git a/crates/sprout/src/generators/bls/entry.rs b/crates/boot/src/generators/bls/entry.rs similarity index 100% rename from crates/sprout/src/generators/bls/entry.rs rename to crates/boot/src/generators/bls/entry.rs diff --git a/crates/sprout/src/generators/list.rs b/crates/boot/src/generators/list.rs similarity index 100% rename from crates/sprout/src/generators/list.rs rename to crates/boot/src/generators/list.rs diff --git a/crates/sprout/src/generators/matrix.rs b/crates/boot/src/generators/matrix.rs similarity index 100% rename from crates/sprout/src/generators/matrix.rs rename to crates/boot/src/generators/matrix.rs diff --git a/crates/sprout/src/main.rs b/crates/boot/src/main.rs similarity index 100% rename from crates/sprout/src/main.rs rename to crates/boot/src/main.rs diff --git a/crates/sprout/src/menu.rs b/crates/boot/src/menu.rs similarity index 100% rename from crates/sprout/src/menu.rs rename to crates/boot/src/menu.rs diff --git a/crates/sprout/src/options.rs b/crates/boot/src/options.rs similarity index 100% rename from crates/sprout/src/options.rs rename to crates/boot/src/options.rs diff --git a/crates/sprout/src/options/env.rs b/crates/boot/src/options/env.rs similarity index 100% rename from crates/sprout/src/options/env.rs rename to crates/boot/src/options/env.rs diff --git a/crates/sprout/src/options/parser.rs b/crates/boot/src/options/parser.rs similarity index 100% rename from crates/sprout/src/options/parser.rs rename to crates/boot/src/options/parser.rs diff --git a/crates/sprout/src/phases.rs b/crates/boot/src/phases.rs similarity index 100% rename from crates/sprout/src/phases.rs rename to crates/boot/src/phases.rs diff --git a/crates/sprout/src/sbat.csv b/crates/boot/src/sbat.csv similarity index 100% rename from crates/sprout/src/sbat.csv rename to crates/boot/src/sbat.csv diff --git a/crates/sprout/src/sbat.rs b/crates/boot/src/sbat.rs similarity index 100% rename from crates/sprout/src/sbat.rs rename to crates/boot/src/sbat.rs diff --git a/crates/sprout/src/utils.rs b/crates/boot/src/utils.rs similarity index 100% rename from crates/sprout/src/utils.rs rename to crates/boot/src/utils.rs diff --git a/crates/sprout/src/utils/vercmp.rs b/crates/boot/src/utils/vercmp.rs similarity index 100% rename from crates/sprout/src/utils/vercmp.rs rename to crates/boot/src/utils/vercmp.rs