From 70735600ede19db8e1cfa7dd52ecf69ddd9784d3 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 28 Feb 2026 17:09:30 +0100
Subject: [PATCH 1/2] Remove support for target specific driver configs

Init now handles running services conditional on the architecture and board.
---
 recipes/core/base-initfs/recipe.toml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index fd3fdc35f..d83649430 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -69,11 +69,6 @@ rm -rf "${COOKBOOK_BUILD}/initfs"
 mkdir -p "${COOKBOOK_BUILD}/initfs/lib/init.d"
 
 cp "${COOKBOOK_SOURCE}/init.d"/* "${COOKBOOK_BUILD}/initfs/lib/init.d/"
-if [ -e ${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers.${BOARD} ]; then
-    cp "${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers.${BOARD}" "${COOKBOOK_BUILD}/initfs/lib/init.d/40_drivers"
-elif [ -e ${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers ]; then
-    cp "${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers" "${COOKBOOK_BUILD}/initfs/lib/init.d/40_drivers"
-fi
 
 mkdir -pv "${COOKBOOK_BUILD}/initfs/lib/pcid.d"
 cp -v "${COOKBOOK_SOURCE}/drivers/initfs.toml" "${COOKBOOK_BUILD}/initfs/lib/pcid.d/initfs.toml"

From 0a5879deabcb8851cb4df0d22594c3610d05fcf3 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 28 Feb 2026 17:10:12 +0100
Subject: [PATCH 2/2] Unset RUSTFLAGS for redox-initfs-ar

Otherwise using DYNAMIC_INIT for base-initfs gives a linker error.
---
 recipes/core/base-initfs/recipe.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index d83649430..0766fad37 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -114,7 +114,7 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \
     -z max-page-size=4096 \
     "${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a"
 
-env -u CARGO 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"
+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"
 
 mkdir -v "${COOKBOOK_STAGE}/boot"
 cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/boot/initfs"