mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-17 15:34:18 +08:00
Some filesystem config improvements and cleanup
This commit is contained in:
parent
d8969fde8f
commit
36568bbf37
@ -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 = {}
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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 = {}
|
||||
|
||||
@ -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 = {}
|
||||
|
||||
@ -11,11 +11,5 @@ prompt = false
|
||||
|
||||
# Package settings
|
||||
[packages]
|
||||
acid = {}
|
||||
relibc-tests = {}
|
||||
os-test = {}
|
||||
openposixtestsuite = {}
|
||||
redox-posix-tests = {}
|
||||
vttest = {}
|
||||
redox-tests = {}
|
||||
benchmarks = {}
|
||||
hello-redox = {}
|
||||
|
||||
@ -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 = {}
|
||||
|
||||
@ -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 = {}
|
||||
|
||||
6
recipes/groups/auto-test/auto-test.ion
Normal file
6
recipes/groups/auto-test/auto-test.ion
Normal file
@ -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
|
||||
17
recipes/groups/auto-test/recipe.toml
Normal file
17
recipes/groups/auto-test/recipe.toml
Normal file
@ -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",
|
||||
]
|
||||
22
recipes/groups/demo/recipe.toml
Normal file
22
recipes/groups/demo/recipe.toml
Normal file
@ -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",
|
||||
]
|
||||
21
recipes/groups/desktop/recipe.toml
Normal file
21
recipes/groups/desktop/recipe.toml
Normal file
@ -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",
|
||||
]
|
||||
@ -8,7 +8,6 @@ dependencies = [
|
||||
"gnu-make",
|
||||
"gnu-grep",
|
||||
"ripgrep",
|
||||
"libffi",
|
||||
"rustpython",
|
||||
"lua54",
|
||||
"nasm",
|
||||
|
||||
@ -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",
|
||||
]
|
||||
|
||||
17
recipes/groups/server/recipe.toml
Normal file
17
recipes/groups/server/recipe.toml
Normal file
@ -0,0 +1,17 @@
|
||||
# server variant meta-package
|
||||
[package]
|
||||
dependencies = [
|
||||
"bash",
|
||||
"bottom",
|
||||
"ca-certificates",
|
||||
#"contain",
|
||||
"coreutils",
|
||||
"curl",
|
||||
"diffutils",
|
||||
"extrautils",
|
||||
"findutils",
|
||||
"git",
|
||||
"installer",
|
||||
"ion",
|
||||
"kibi",
|
||||
]
|
||||
6
recipes/groups/sys-gui/recipe.toml
Normal file
6
recipes/groups/sys-gui/recipe.toml
Normal file
@ -0,0 +1,6 @@
|
||||
[package]
|
||||
dependencies = [
|
||||
"orbital",
|
||||
"orbdata",
|
||||
"orbutils",
|
||||
]
|
||||
9
recipes/groups/sys/recipe.toml
Normal file
9
recipes/groups/sys/recipe.toml
Normal file
@ -0,0 +1,9 @@
|
||||
[package]
|
||||
dependencies = [
|
||||
"bootloader",
|
||||
"kernel",
|
||||
"relibc",
|
||||
"base",
|
||||
"coreutils",
|
||||
"base-initfs",
|
||||
]
|
||||
Loading…
Reference in New Issue
Block a user