From 0db68bb262cbb9d0ea735b6b2545b0c313d5f522 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 7 Mar 2026 16:09:58 +0100
Subject: [PATCH] Move kernel and initfs to /usr/lib/boot

---
 recipes/core/base-initfs/recipe.toml | 4 ++--
 recipes/core/kernel/recipe.toml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
index 0766fad37..e0c889c94 100644
--- a/recipes/core/base-initfs/recipe.toml
+++ b/recipes/core/base-initfs/recipe.toml
@@ -116,6 +116,6 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \
 
 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"
+mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
+cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/usr/lib/boot/initfs"
 """
diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml
index 38b66b43f..15cbc83b1 100644
--- a/recipes/core/kernel/recipe.toml
+++ b/recipes/core/kernel/recipe.toml
@@ -5,6 +5,6 @@ git = "https://gitlab.redox-os.org/redox-os/kernel.git"
 template = "custom"
 script = """
 make -f ${COOKBOOK_SOURCE}/Makefile
-mkdir -v "${COOKBOOK_STAGE}/boot"
-cp -v kernel "${COOKBOOK_STAGE}/boot"
+mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
+cp -v kernel "${COOKBOOK_STAGE}/usr/lib/boot"
 """