From 2ad9749da3d78ffe35e19949653ff5c78b1792f3 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 17 Feb 2026 22:15:00 +0100
Subject: [PATCH] Adapt config file locations for shared config locator

---
 recipes/core/base-initfs/recipe.toml | 14 +++++++-------
 recipes/core/base/recipe.toml        |  7 ++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index cc9e1bbf..123c9d38 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -66,18 +66,18 @@ case "${TARGET}" in
 esac
 
 rm -rf "${COOKBOOK_BUILD}/initfs"
-mkdir -p "${COOKBOOK_BUILD}/initfs/etc"
+mkdir -p "${COOKBOOK_BUILD}/initfs/lib/init.d"
 
-cp "${COOKBOOK_SOURCE}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc"
-cp "${COOKBOOK_SOURCE}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+cp "${COOKBOOK_SOURCE}/init.rc" "${COOKBOOK_BUILD}/initfs/lib/init.d/init.rc"
+cp "${COOKBOOK_SOURCE}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/lib/init_drivers.rc"
 if [ -e ${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc.${BOARD} ]; then
-    cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+    cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/lib/init_drivers.rc"
 elif [ -e ${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc ]; then
-    cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc"
+    cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/lib/init_drivers.rc"
 fi
 
-mkdir -pv "${COOKBOOK_BUILD}/initfs/etc/pcid"
-cp -v "${COOKBOOK_SOURCE}/drivers/initfs.toml" "${COOKBOOK_BUILD}/initfs/etc/pcid/initfs.toml"
+mkdir -pv "${COOKBOOK_BUILD}/initfs/lib/pcid.d"
+cp -v "${COOKBOOK_SOURCE}/drivers/initfs.toml" "${COOKBOOK_BUILD}/initfs/lib/pcid.d/initfs.toml"
 
 export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
 export CARGO_PROFILE_RELEASE_PANIC=abort
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index 1dc3dff9..da6805d9 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -67,13 +67,10 @@ do
     fi
 done
 
-mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
-cp -v "${COOKBOOK_SOURCE}/drivers/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"
-
-mkdir -pv "${COOKBOOK_STAGE}/etc/pcid.d"
+mkdir -pv "${COOKBOOK_STAGE}/lib/pcid.d"
 ${FIND} "${COOKBOOK_SOURCE}/drivers" -maxdepth 3 -type f -name 'config.toml' | while read conf
 do
     driver="$(basename "$(dirname "$conf")")"
-    cp -v "$conf" "${COOKBOOK_STAGE}/etc/pcid.d/$driver.toml"
+    cp -v "$conf" "${COOKBOOK_STAGE}/lib/pcid.d/$driver.toml"
 done
 """