Merge most initfs contents into a single base-initfs recipe

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"
+"""

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
+"""

recipes/core/init/recipe.toml

@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/init.git"
-
-[build]
-template = "cargo"

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'

recipes/core/logd/recipe.toml

@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/logd.git"
-
-[build]
-template = "cargo"

recipes/core/ramfs/recipe.toml

@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/ramfs.git"
-
-[build]
-template = "cargo"

recipes/core/randd/recipe.toml

@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/randd.git"
-
-[build]
-template = "cargo"

recipes/core/zerod/recipe.toml

@@ -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"
-"""