Merge nulld and zerod.

2026-06-25 06:14:18 +08:00 · 2023-11-16 14:12:42 +01:00 · 2023-11-16 14:12:42 +01:00 · 5c45e5c280
commit 5c45e5c280
parent 7fa28704f5
3 changed files with 9 additions and 7 deletions
--- a/recipes/core/initfs/recipe.toml
+++ b/recipes/core/initfs/recipe.toml
@ -7,7 +7,6 @@ dependencies = [
  "drivers-initfs",
  "init",
  "logd",
-  "nulld",
  "ramfs",
  "randd",
  "redoxfs",
--- a/recipes/core/nulld/recipe.toml
+++ b/recipes/core/nulld/recipe.toml
@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/nulld.git"
-
-[build]
-template = "cargo"
--- a/recipes/core/zerod/recipe.toml
+++ b/recipes/core/zerod/recipe.toml
@ -2,4 +2,12 @@
 git = "https://gitlab.redox-os.org/redox-os/zerod.git"

 [build]
-template = "cargo"
+template = "custom"
+script = """
+cookbook_cargo --bin zerod
+
+# TODO: symlinks aren't supported by redox-initfs
+#ln -sv zerod "${COOKBOOK_STAGE}/bin/nulld"
+
+cp "${COOKBOOK_STAGE}/bin/zerod" "${COOKBOOK_STAGE}/bin/nulld"
+"""