From af63354d2ce429460821e512ff095a46cbdec24b Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:52:50 +0100
Subject: [PATCH] Merge most initfs contents into a single base-initfs recipe

---
 recipes/core/base-initfs/recipe.toml | 21 +++++++++++++++++++++
 recipes/core/base/recipe.toml        |  8 ++++++++
 recipes/core/init/recipe.toml        |  5 -----
 recipes/core/initfs/recipe.toml      |  6 +-----
 recipes/core/logd/recipe.toml        |  5 -----
 recipes/core/ramfs/recipe.toml       |  5 -----
 recipes/core/randd/recipe.toml       |  5 -----
 recipes/core/zerod/recipe.toml       | 13 -------------
 8 files changed, 30 insertions(+), 38 deletions(-)
 create mode 100644 recipes/core/base-initfs/recipe.toml
 create mode 100644 recipes/core/base/recipe.toml
 delete mode 100644 recipes/core/init/recipe.toml
 delete mode 100644 recipes/core/logd/recipe.toml
 delete mode 100644 recipes/core/ramfs/recipe.toml
 delete mode 100644 recipes/core/randd/recipe.toml
 delete mode 100644 recipes/core/zerod/recipe.toml

diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml
new file mode 100644
index 00000000..efbd082e
--- /dev/null
+++ b/recipes/core/base-initfs/recipe.toml
@@ -0,0 +1,21 @@
+[source]
+same_as = "../base"
+
+[build]
+template = "custom"
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+for package in init logd ramfs randd zerod; do
+    "${COOKBOOK_CARGO}" build \
+        --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
+        ${build_flags}
+    cp -v \
+        "target/${TARGET}/${build_type}/${package}" \
+        "${COOKBOOK_STAGE}/usr/bin/${package}"
+done
+
+# TODO: symlinks aren't supported by redox-initfs
+#ln -sv zerod "${COOKBOOK_STAGE}/usr/bin/nulld"
+
+cp "${COOKBOOK_STAGE}/usr/bin/zerod" "${COOKBOOK_STAGE}/usr/bin/nulld"
+"""
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
new file mode 100644
index 00000000..dd4775c6
--- /dev/null
+++ b/recipes/core/base/recipe.toml
@@ -0,0 +1,8 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/base.git"
+
+[build]
+template = "custom"
+script = """
+# FIXME(bjorn3) fill in
+"""
diff --git a/recipes/core/init/recipe.toml b/recipes/core/init/recipe.toml
deleted file mode 100644
index 2c8fdea1..00000000
--- a/recipes/core/init/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/init.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/initfs/recipe.toml b/recipes/core/initfs/recipe.toml
index b4e18623..489a5433 100644
--- a/recipes/core/initfs/recipe.toml
+++ b/recipes/core/initfs/recipe.toml
@@ -4,14 +4,10 @@ git = "https://gitlab.redox-os.org/redox-os/redox-initfs.git"
 [build]
 template = "custom"
 dependencies = [
+  "base-initfs",
   "bootstrap",
   "drivers-initfs",
-  "init",
-  "logd",
-  "ramfs",
-  "randd",
   "redoxfs",
-  "zerod",
 ]
 script = """
 INITFS_RM_BINS='redoxfs-ar redoxfs-mkfs'
diff --git a/recipes/core/logd/recipe.toml b/recipes/core/logd/recipe.toml
deleted file mode 100644
index 6e906f11..00000000
--- a/recipes/core/logd/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/logd.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/ramfs/recipe.toml b/recipes/core/ramfs/recipe.toml
deleted file mode 100644
index dd8e751e..00000000
--- a/recipes/core/ramfs/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/ramfs.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/randd/recipe.toml b/recipes/core/randd/recipe.toml
deleted file mode 100644
index 911a1d79..00000000
--- a/recipes/core/randd/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/randd.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/zerod/recipe.toml b/recipes/core/zerod/recipe.toml
deleted file mode 100644
index 0e8a3384..00000000
--- a/recipes/core/zerod/recipe.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/zerod.git"
-
-[build]
-template = "custom"
-script = """
-cookbook_cargo --bin zerod
-
-# TODO: symlinks aren't supported by redox-initfs
-#ln -sv zerod "${COOKBOOK_STAGE}/usr/bin/nulld"
-
-cp "${COOKBOOK_STAGE}/usr/bin/zerod" "${COOKBOOK_STAGE}/usr/bin/nulld"
-"""