From df50b6fa30a8a7e9108e1317904742170c77f914 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:57:56 +0200
Subject: [PATCH] Move drivers to /usr/lib/drivers

---
 recipes/core/drivers-initfs/recipe.toml | 11 +++++++++--
 recipes/core/drivers/recipe.toml        | 15 ++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/recipes/core/drivers-initfs/recipe.toml b/recipes/core/drivers-initfs/recipe.toml
index 74a1f4825..8baa45ab0 100644
--- a/recipes/core/drivers-initfs/recipe.toml
+++ b/recipes/core/drivers-initfs/recipe.toml
@@ -52,7 +52,7 @@ case "${TARGET}" in
         ;;
 esac
 
-mkdir -pv "${COOKBOOK_STAGE}/bin"
+mkdir -pv "${COOKBOOK_STAGE}/bin" "${COOKBOOK_STAGE}/lib/drivers"
 export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
 export CARGO_PROFILE_RELEASE_PANIC=abort
 "${COOKBOOK_CARGO}" build --release \
@@ -60,7 +60,14 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+    case "${bin}" in
+      pcid | fbcond | inputd | vesad | lived | ps2d | acpid)
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+        ;;
+      *)
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/lib/drivers"
+        ;;
+    esac
 done
 
 mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
diff --git a/recipes/core/drivers/recipe.toml b/recipes/core/drivers/recipe.toml
index 84619553d..f9828931e 100644
--- a/recipes/core/drivers/recipe.toml
+++ b/recipes/core/drivers/recipe.toml
@@ -33,7 +33,7 @@ case "${TARGET}" in
 esac
 
 #Build each driver in the list
-mkdir -pv "${COOKBOOK_STAGE}/bin"
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/lib/drivers"
 export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
 export CARGO_PROFILE_RELEASE_PANIC=abort
 "${COOKBOOK_CARGO}" build --release \
@@ -41,16 +41,13 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
+    if [[ "${bin}" == "pcid" ]]; then
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/bin"
+    else
+        cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"
+    fi
 done
 
-mkdir -pv "${COOKBOOK_STAGE}/bin"
-${FIND} "target/${TARGET}/release" \
-    -maxdepth 1 \
-    -executable \
-    -type f \
-    -exec cp -v {} "${COOKBOOK_STAGE}/bin/" ';'
-
 mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
 cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"