From 0997dbbbb54a301d4d446e7a0afdccfe683d9a40 Mon Sep 17 00:00:00 2001 From: Vasilito Date: Sat, 18 Apr 2026 00:48:58 +0100 Subject: [PATCH] Update base-initfs and base recipes for hardware detection Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- recipes/core/base-initfs/recipe.toml | 19 ++++++++++++------- recipes/core/base/recipe.toml | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index 4baf748f..994ee136 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -102,13 +102,18 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static -Clink-arg=-nostartfiles -Cli --manifest-path "${COOKBOOK_SOURCE}/bootstrap/Cargo.toml" \ --release \ --target-dir "${COOKBOOK_BUILD}" -"${GNU_TARGET}-ld" \ - -o "${COOKBOOK_BUILD}/bootstrap" \ - -nostdlib \ - --gc-sections \ - -T "${COOKBOOK_SOURCE}/bootstrap/src/${ARCH}.ld" \ - -z max-page-size=4096 \ - "${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a" + +if [ -f "${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a" ]; then + "${GNU_TARGET}-ld" \ + -o "${COOKBOOK_BUILD}/bootstrap" \ + -nostdlib \ + --gc-sections \ + -T "${COOKBOOK_SOURCE}/bootstrap/src/${ARCH}.ld" \ + -z max-page-size=4096 \ + "${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a" +else + cp -v "${COOKBOOK_BUILD}/${TARGET}/release/bootstrap" "${COOKBOOK_BUILD}/bootstrap" +fi env -u CARGO -u RUSTFLAGS cargo run --manifest-path "${COOKBOOK_SOURCE}/initfs/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" "${COOKBOOK_BUILD}/bootstrap" -o "${COOKBOOK_BUILD}/initfs.img" diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 30d8575c..cb175a02 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -38,6 +38,7 @@ BINS=( usbhidd usbhubd usbscsid + virtio-gpud virtio-netd xhcid inputd