From 2415c012d27fb6579a944dabd3859f1c4089b3a6 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 21 Feb 2025 20:17:22 +0100
Subject: [PATCH] Merge ipcd and ptyd into the base repo

---
 recipes/core/base/recipe.toml | 14 +++++++++++---
 recipes/core/ipcd/recipe.toml |  5 -----
 recipes/core/ptyd/recipe.toml |  5 -----
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 recipes/core/ipcd/recipe.toml
 delete mode 100644 recipes/core/ptyd/recipe.toml

diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index dd4775c60..1c3a1edab 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -1,8 +1,16 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/base.git"
+#[source]
+#git = "https://gitlab.redox-os.org/redox-os/base.git"
 
 [build]
 template = "custom"
 script = """
-# FIXME(bjorn3) fill in
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+for package in ipcd ptyd; 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
 """
diff --git a/recipes/core/ipcd/recipe.toml b/recipes/core/ipcd/recipe.toml
deleted file mode 100644
index 308574d29..000000000
--- a/recipes/core/ipcd/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/ipcd.git"
-
-[build]
-template = "cargo"
diff --git a/recipes/core/ptyd/recipe.toml b/recipes/core/ptyd/recipe.toml
deleted file mode 100644
index 6984bbd95..000000000
--- a/recipes/core/ptyd/recipe.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[source]
-git = "https://gitlab.redox-os.org/redox-os/ptyd.git"
-
-[build]
-template = "cargo"