From eb64b9fb384cdaeee397b47eed4b7d34b75b8a2e Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Wed, 13 Aug 2025 15:35:29 +0000
Subject: [PATCH] Revert "Merge branch 'remove-orb' into 'master'"

This reverts commit 620a7a79fc6b470c22f849f871fb2b8c7aaf10b3
---
 config/desktop-minimal.toml           | 4 +++-
 config/riscv64gc/demo.toml            | 4 +++-
 config/riscv64gc/desktop-minimal.toml | 4 +++-
 config/riscv64gc/desktop.toml         | 4 +++-
 config/riscv64gc/jeremy.toml          | 4 +++-
 config/x86_64/ci.toml                 | 3 +++
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 3201d99d..7394cce3 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -12,7 +12,9 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/riscv64gc/demo.toml b/config/riscv64gc/demo.toml
index 91c452ab..7d58679f 100644
--- a/config/riscv64gc/demo.toml
+++ b/config/riscv64gc/demo.toml
@@ -14,7 +14,9 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/riscv64gc/desktop-minimal.toml b/config/riscv64gc/desktop-minimal.toml
index 91c452ab..7d58679f 100644
--- a/config/riscv64gc/desktop-minimal.toml
+++ b/config/riscv64gc/desktop-minimal.toml
@@ -14,7 +14,9 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/riscv64gc/desktop.toml b/config/riscv64gc/desktop.toml
index 91c452ab..7d58679f 100644
--- a/config/riscv64gc/desktop.toml
+++ b/config/riscv64gc/desktop.toml
@@ -14,7 +14,9 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/riscv64gc/jeremy.toml b/config/riscv64gc/jeremy.toml
index 91c452ab..7d58679f 100644
--- a/config/riscv64gc/jeremy.toml
+++ b/config/riscv64gc/jeremy.toml
@@ -14,7 +14,9 @@ filesystem_size = 256
 orbdata = {}
 orbital = {}
 orbterm = {}
-orbutils = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
 
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index ea37b38c..c972da28 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -141,6 +141,9 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
+#orbutils-background = {} # needs recipe update
+#orbutils-launcher = {} # needs recipe update
+#orbutils-orblogin = {} # needs recipe update
 osdemo = {}
 #pango = {} # undefined references to std::__throw_system_error(int)
 #pastel = {} # needs crate patches for redox-unix