From 36568bbf372b611fd5397a87193f09df1f3d7aca Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sat, 21 Feb 2026 19:17:18 -0300 Subject: [PATCH] Some filesystem config improvements and cleanup --- config/aarch64/ci.toml | 3 +++ config/auto-test.toml | 7 ++----- config/i586/ci.toml | 5 ++++- config/riscv64gc/ci.toml | 5 ++++- config/tests.toml | 8 +------- config/x86_64/ci.toml | 2 ++ config/x86_64/demo.toml | 6 +----- recipes/groups/auto-test/auto-test.ion | 6 ++++++ recipes/groups/auto-test/recipe.toml | 17 +++++++++++++++++ recipes/groups/demo/recipe.toml | 22 ++++++++++++++++++++++ recipes/groups/desktop/recipe.toml | 21 +++++++++++++++++++++ recipes/groups/dev-essential/recipe.toml | 1 - recipes/groups/redox-tests/recipe.toml | 7 +++++++ recipes/groups/server/recipe.toml | 17 +++++++++++++++++ recipes/groups/sys-gui/recipe.toml | 6 ++++++ recipes/groups/sys/recipe.toml | 9 +++++++++ 16 files changed, 122 insertions(+), 20 deletions(-) create mode 100644 recipes/groups/auto-test/auto-test.ion create mode 100644 recipes/groups/auto-test/recipe.toml create mode 100644 recipes/groups/demo/recipe.toml create mode 100644 recipes/groups/desktop/recipe.toml create mode 100644 recipes/groups/server/recipe.toml create mode 100644 recipes/groups/sys-gui/recipe.toml create mode 100644 recipes/groups/sys/recipe.toml diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml index 0ed0ece2..13a77dfe 100644 --- a/config/aarch64/ci.toml +++ b/config/aarch64/ci.toml @@ -13,6 +13,7 @@ prompt = false # Meta-packages below +# auto-test = {} # dev-essential = {} # dev-redox = {} # redox-tests = {} @@ -22,6 +23,7 @@ prompt = false # Normal packages below acid = {} +acid-bins = {} base = {} base-initfs = {} bash = {} @@ -286,6 +288,7 @@ zstd = {} # redox-fatfs = {} # redox-games = {} # relibc-tests = {} +# relibc-tests-bins = {} # rodioplay = {} # rs-nes = {} # rsync = {} diff --git a/config/auto-test.toml b/config/auto-test.toml index 69cb87bc..483b01c8 100644 --- a/config/auto-test.toml +++ b/config/auto-test.toml @@ -1,4 +1,5 @@ # Configuration for automated testing of essential test suites +# Smaller test suites are executed first to catch possible bugs or regressions faster include = ["net.toml"] @@ -9,11 +10,7 @@ filesystem_size = 1024 # Package settings [packages] -acid = {} -coreutils = {} -ion = {} -os-test-bins = {} -relibc-tests-bins = {} +auto-test = {} [[files]] path = "/usr/lib/init.d/30_console" diff --git a/config/i586/ci.toml b/config/i586/ci.toml index a84fb46a..e7275877 100644 --- a/config/i586/ci.toml +++ b/config/i586/ci.toml @@ -13,6 +13,7 @@ prompt = false # Meta-packages below +# auto-test = {} # dev-essential = {} # dev-redox = {} # redox-tests = {} @@ -21,7 +22,8 @@ prompt = false # Normal packages below -# acid = {} # will include rust and llvm21 +# acid = {} # rust require dynamic linking +acid-bins = {} base = {} base-initfs = {} bash = {} @@ -281,6 +283,7 @@ zlib = {} # redox-fatfs = {} # redox-games = {} # relibc-tests = {} +# relibc-tests-bins = {} # rodioplay = {} # rs-nes = {} # rsync = {} diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml index 2c52d47c..4f535066 100644 --- a/config/riscv64gc/ci.toml +++ b/config/riscv64gc/ci.toml @@ -13,6 +13,7 @@ prompt = false # Meta-packages below +# auto-test = {} # dev-essential = {} # dev-redox = {} # redox-tests = {} @@ -21,7 +22,8 @@ prompt = false # Normal packages below -# acid = {} # will include rust and llvm21 +# acid = {} # rust require dynamic linking +acid-bins = {} base = {} base-initfs = {} bash = {} @@ -282,6 +284,7 @@ zlib = {} # redox-fatfs = {} # redox-games = {} # relibc-tests = {} +# relibc-tests-bins = {} # rodioplay = {} # rs-nes = {} # rsync = {} diff --git a/config/tests.toml b/config/tests.toml index b0a9c0fe..eafbcbf6 100644 --- a/config/tests.toml +++ b/config/tests.toml @@ -11,11 +11,5 @@ prompt = false # Package settings [packages] -acid = {} -relibc-tests = {} -os-test = {} -openposixtestsuite = {} -redox-posix-tests = {} -vttest = {} +redox-tests = {} benchmarks = {} -hello-redox = {} diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index 1ad08c53..5847fb17 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -13,6 +13,7 @@ prompt = false # Meta-packages below +auto-test = {} dev-essential = {} dev-redox = {} llvm21-common = {} @@ -170,6 +171,7 @@ redox-games = {} redoxfs = {} relibc = {} relibc-tests = {} +relibc-tests-bins = {} ripgrep = {} rodioplay = {} rs-nes = {} diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index 80d222a9..fa506580 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -16,13 +16,9 @@ periodictable = {} intel-one-mono = {} # Shell Apps -bottom = {} -curl = {} -git = {} gnu-grep = {} htop = {} ripgrep = {} -sodium = {} terminfo = {} vim = {} @@ -36,7 +32,7 @@ sopwith = {} # syobonaction = {} # linking errors # Demos -acid = {} +auto-test = {} # nushell = {} orbclient = {} pixelcannon = {} diff --git a/recipes/groups/auto-test/auto-test.ion b/recipes/groups/auto-test/auto-test.ion new file mode 100644 index 00000000..58fb4e09 --- /dev/null +++ b/recipes/groups/auto-test/auto-test.ion @@ -0,0 +1,6 @@ +#!/usr/bin/env ion +export RUST_BACKTRACE=full +cd /home/user/acid +cargo test +bash /root/relibc-tests/run.sh +os-test-runner \ No newline at end of file diff --git a/recipes/groups/auto-test/recipe.toml b/recipes/groups/auto-test/recipe.toml new file mode 100644 index 00000000..c8f75dfe --- /dev/null +++ b/recipes/groups/auto-test/recipe.toml @@ -0,0 +1,17 @@ +# Meta-package for automated testing of essential test suites +# Smaller test suites are executed first to catch possible bugs or regressions faster +[build] +template = "custom" +script = """ +mkdir -pv "${COOKBOOK_STAGE}/usr/bin" +cp -rv "${COOKBOOK_RECIPE}/auto-test.ion" "${COOKBOOK_STAGE}/usr/bin/auto-test" +chmod a+x "${COOKBOOK_STAGE}/usr/bin/auto-test" +""" +[package] +dependencies = [ + "acid", + "coreutils", + "ion", + "os-test-bins", + "relibc-tests-bin", +] diff --git a/recipes/groups/demo/recipe.toml b/recipes/groups/demo/recipe.toml new file mode 100644 index 00000000..36be3c7d --- /dev/null +++ b/recipes/groups/demo/recipe.toml @@ -0,0 +1,22 @@ +# demo variant meta-package +[package] +dependencies = [ + "desktop", + "periodictable", + "intel-one-mono", + "gnu-grep", + "htop", + "ripgrep", + "terminfo", + "vim", + "dosbox", + "freedoom", + "neverball", + "prboom", + "redox-games", + "sopwith", + "orbclient", + "pixelcannon", + "rodioplay", + "freepats", +] diff --git a/recipes/groups/desktop/recipe.toml b/recipes/groups/desktop/recipe.toml new file mode 100644 index 00000000..36544a83 --- /dev/null +++ b/recipes/groups/desktop/recipe.toml @@ -0,0 +1,21 @@ +# desktop variant meta-package +[package] +dependencies = [ + "server", + "cosmic-edit", + "cosmic-files", + "cosmic-icons", + "cosmic-term", + "dejavu", + "freefont", + "hicolor-icon-theme", + "installer-gui", + "netsurf", + "orbdata", + "orbital", + "orbutils", + "patchelf", + "pop-icon-theme", + "rustpython", + "shared-mime-info", +] diff --git a/recipes/groups/dev-essential/recipe.toml b/recipes/groups/dev-essential/recipe.toml index f3bc72af..31fc40b8 100644 --- a/recipes/groups/dev-essential/recipe.toml +++ b/recipes/groups/dev-essential/recipe.toml @@ -8,7 +8,6 @@ dependencies = [ "gnu-make", "gnu-grep", "ripgrep", - "libffi", "rustpython", "lua54", "nasm", diff --git a/recipes/groups/redox-tests/recipe.toml b/recipes/groups/redox-tests/recipe.toml index e51a7487..1fb2a8c2 100644 --- a/recipes/groups/redox-tests/recipe.toml +++ b/recipes/groups/redox-tests/recipe.toml @@ -1,7 +1,14 @@ [package] dependencies = [ "acid", + "acid-bins", + "auto-test", + "hello-redox", "os-test", + "os-test-bins", + "openposixtestsuite", "redox-posix-tests", "relibc-tests", + "relibc-tests-bins", + "vttest", ] diff --git a/recipes/groups/server/recipe.toml b/recipes/groups/server/recipe.toml new file mode 100644 index 00000000..7a6441a6 --- /dev/null +++ b/recipes/groups/server/recipe.toml @@ -0,0 +1,17 @@ +# server variant meta-package +[package] +dependencies = [ + "bash", + "bottom", + "ca-certificates", + #"contain", + "coreutils", + "curl", + "diffutils", + "extrautils", + "findutils", + "git", + "installer", + "ion", + "kibi", +] diff --git a/recipes/groups/sys-gui/recipe.toml b/recipes/groups/sys-gui/recipe.toml new file mode 100644 index 00000000..f58cf047 --- /dev/null +++ b/recipes/groups/sys-gui/recipe.toml @@ -0,0 +1,6 @@ +[package] +dependencies = [ + "orbital", + "orbdata", + "orbutils", +] diff --git a/recipes/groups/sys/recipe.toml b/recipes/groups/sys/recipe.toml new file mode 100644 index 00000000..f04d92c2 --- /dev/null +++ b/recipes/groups/sys/recipe.toml @@ -0,0 +1,9 @@ +[package] +dependencies = [ + "bootloader", + "kernel", + "relibc", + "base", + "coreutils", + "base-initfs", +]