From 5c45e5c2809709789c65e73ea28b06276759526c Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Thu, 16 Nov 2023 14:12:42 +0100
Subject: [PATCH] Merge nulld and zerod.
---
recipes/core/initfs/recipe.toml | 1 -
recipes/core/nulld/recipe.toml | 5 -----
recipes/core/zerod/recipe.toml | 10 +++++++++-
3 files changed, 9 insertions(+), 7 deletions(-)
delete mode 100644 recipes/core/nulld/recipe.toml
diff --git a/recipes/core/initfs/recipe.toml b/recipes/core/initfs/recipe.toml
index 4f721c8ef..4bc9f307f 100644
--- 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",
diff --git a/recipes/core/nulld/recipe.toml b/recipes/core/nulld/recipe.toml
deleted file mode 100644
index f9c725468..000000000
--- a/recipes/core/nulld/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/nulld.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/zerod/recipe.toml b/recipes/core/zerod/recipe.toml
index 4606caf43..be70616ff 100644
--- 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"
+"""
--
GitLab