From 109ad72b831e5c11e92020f617c7ba0a451d797f Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 10 Mar 2024 19:38:39 +0100
Subject: [PATCH] Pass bootstrap code to redox-initfs-ar for inclusion in the
initfs
---
recipes/core/initfs/recipe.toml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes/core/initfs/recipe.toml b/recipes/core/initfs/recipe.toml
index 6c468e712..b4e186232 100644
--- a/recipes/core/initfs/recipe.toml
+++ b/recipes/core/initfs/recipe.toml
@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git"
[build]
template = "custom"
dependencies = [
+ "bootstrap",
"drivers-initfs",
"init",
"logd",
@@ -39,7 +40,7 @@ for bin in ${INITFS_RM_BINS}; do
rm -f "${COOKBOOK_BUILD}/initfs/bin/$bin"
done
-env -u CARGO cargo run --manifest-path "${COOKBOOK_SOURCE}/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" -o "${COOKBOOK_BUILD}/initfs.img"
+env -u CARGO cargo run --manifest-path "${COOKBOOK_SOURCE}/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" "${COOKBOOK_SYSROOT}/boot/bootstrap" -o "${COOKBOOK_BUILD}/initfs.img"
mkdir -v "${COOKBOOK_STAGE}/boot"
cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/boot/initfs"
--
GitLab