From a19a406e4dfe4363dd7f757525920cb7adfe059f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 8 Jan 2024 15:56:37 -0700
Subject: [PATCH] initfs: move /usr/bin executables to /bin

---
 recipes/core/initfs/recipe.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/recipes/core/initfs/recipe.toml b/recipes/core/initfs/recipe.toml
index ddb39b60c..6c468e712 100644
--- a/recipes/core/initfs/recipe.toml
+++ b/recipes/core/initfs/recipe.toml
@@ -27,6 +27,14 @@ elif [ -e ${COOKBOOK_RECIPE}/${TARGET}/init.rc ]; then
     cp "${COOKBOOK_RECIPE}/${TARGET}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc"
 fi
 
+# Move /usr/bin files to /bin
+mkdir -p "${COOKBOOK_BUILD}/initfs/bin"
+if [ -d "${COOKBOOK_BUILD}/initfs/usr/bin" ]
+then
+    mv "${COOKBOOK_BUILD}/initfs/usr/bin/"* "${COOKBOOK_BUILD}/initfs/bin"
+    rmdir "${COOKBOOK_BUILD}/initfs/usr/bin"
+fi
+
 for bin in ${INITFS_RM_BINS}; do
   rm -f "${COOKBOOK_BUILD}/initfs/bin/$bin"
 done
-- 
GitLab