From eb64b9fb384cdaeee397b47eed4b7d34b75b8a2e Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Wed, 13 Aug 2025 15:35:29 +0000 Subject: [PATCH 1/2] 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 From 80b0b5229700ba6ab2cf6de24e22b9b471c0d0b3 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Wed, 13 Aug 2025 15:42:15 +0000 Subject: [PATCH 2/2] Add minimal orbutils into CI --- config/aarch64/ci.toml | 3 +++ config/i686/ci.toml | 3 +++ config/riscv64gc/ci.toml | 3 +++ config/x86_64/ci.toml | 6 +++--- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml index 0eca1c88..d31d0169 100644 --- a/config/aarch64/ci.toml +++ b/config/aarch64/ci.toml @@ -53,6 +53,9 @@ orbdata = {} orbital = {} orbterm = {} orbutils = {} +orbutils-background = {} +orbutils-launcher = {} +orbutils-orblogin = {} patch = {} pcre = {} pkgutils = {} diff --git a/config/i686/ci.toml b/config/i686/ci.toml index 3d8b7835..e6794414 100644 --- a/config/i686/ci.toml +++ b/config/i686/ci.toml @@ -33,6 +33,9 @@ orbdata = {} orbital = {} orbterm = {} orbutils = {} +orbutils-background = {} +orbutils-launcher = {} +orbutils-orblogin = {} pkgutils = {} redoxfs = {} relibc = {} diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml index a4896ba7..45e07aa1 100644 --- a/config/riscv64gc/ci.toml +++ b/config/riscv64gc/ci.toml @@ -33,6 +33,9 @@ orbdata = {} orbital = {} orbterm = {} orbutils = {} +orbutils-background = {} +orbutils-launcher = {} +orbutils-orblogin = {} pkgutils = {} redoxfs = {} relibc = {} diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index c972da28..04ea65ec 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -141,9 +141,9 @@ orbdata = {} orbital = {} orbterm = {} orbutils = {} -#orbutils-background = {} # needs recipe update -#orbutils-launcher = {} # needs recipe update -#orbutils-orblogin = {} # needs recipe update +orbutils-background = {} +orbutils-launcher = {} +orbutils-orblogin = {} osdemo = {} #pango = {} # undefined references to std::__throw_system_error(int) #pastel = {} # needs crate patches for redox-unix