From a36dde03c3559d84c73ee7b3f1ad13ab9bf912bc Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Sat, 13 Dec 2025 00:50:43 +0900 Subject: [PATCH 1/3] wip: Point namespace-improvement branches. --- config/server.toml | 6 ++++++ recipes/core/base-initfs/recipe.toml | 3 ++- recipes/core/base/recipe.toml | 9 +++++++-- recipes/core/kernel/recipe.toml | 7 ++++++- recipes/core/redoxfs/recipe.toml | 5 ++++- recipes/core/relibc/recipe.toml | 6 +++++- recipes/core/userutils/recipe.toml | 5 ++++- 7 files changed, 34 insertions(+), 7 deletions(-) diff --git a/config/server.toml b/config/server.toml index 5e985216e..ff0e7cf21 100644 --- a/config/server.toml +++ b/config/server.toml @@ -32,3 +32,9 @@ inputd -A 2 nowait getty 2 nowait getty /scheme/debug/no-preserve -J """ +[[files]] +path = "/etc/login_config.toml" +data = """ +[user_schemes.user] +schemes = ["memory","sudo","sys","file","rand","null","ip","icmp","tcp","udp","thisproc","pty","orbital","display.vesa","uds_stream","uds_dgram","pipe","time","event"] +""" diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index 2e0618185..0b4aec41f 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -8,6 +8,7 @@ dependencies = [ ] script = """ BINS=( + namespace init logd ramfs @@ -89,7 +90,7 @@ mkdir -pv "${COOKBOOK_BUILD}/initfs/bin" "${COOKBOOK_BUILD}/initfs/lib/drivers" for bin in "${BINS[@]}" do case "${bin}" in - init | logd | ramfs | randd | zerod | pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd) + namespace | init | logd | ramfs | randd | zerod | pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd) cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_BUILD}/initfs/bin" ;; *) diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index a5dfe66ce..04ed27b54 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -1,11 +1,16 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/base.git" +# git = "https://gitlab.redox-os.org/redox-os/base.git" +git = "https://gitlab.redox-os.org/Ibuki.O/base.git" +# branch = "unlinkat" +# branch = "filter-uidgid" +branch = "namespace-improvement" +# branch = "debug" [build] template = "custom" script = """ mkdir -pv "${COOKBOOK_STAGE}/usr/bin" -for package in audiod ipcd ptyd; do +for package in audiod ipcd ptyd; do "${COOKBOOK_CARGO}" build \ --manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \ ${build_flags} diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml index 38b66b43f..b5387123e 100644 --- a/recipes/core/kernel/recipe.toml +++ b/recipes/core/kernel/recipe.toml @@ -1,5 +1,10 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/kernel.git" +# git = "https://gitlab.redox-os.org/redox-os/kernel.git" +git = "https://gitlab.redox-os.org/Ibuki.O/kernel.git" +# branch = "schemelist" +# branch = "unlinkat" +# branch = "filter-uidgid" +branch = "namespace-improvement" [build] template = "custom" diff --git a/recipes/core/redoxfs/recipe.toml b/recipes/core/redoxfs/recipe.toml index c6609e329..9cc75e4d0 100644 --- a/recipes/core/redoxfs/recipe.toml +++ b/recipes/core/redoxfs/recipe.toml @@ -1,5 +1,8 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/redoxfs.git" +# git = "https://gitlab.redox-os.org/redox-os/redoxfs.git" +git = "https://gitlab.redox-os.org/Ibuki.O/redoxfs.git" +# branch = "scheme_root_fd" +branch = "unlinkat" [build] template = "custom" diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml index ccc26a5d0..33baa652b 100644 --- a/recipes/core/relibc/recipe.toml +++ b/recipes/core/relibc/recipe.toml @@ -1,5 +1,9 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/relibc.git" +# git = "https://gitlab.redox-os.org/redox-os/relibc.git" +git = "https://gitlab.redox-os.org/Ibuki.O/relibc.git" +# branch = "unlinkat" +# branch = "filter-uidgid" +branch = "namespace-improvement" [build] template = "custom" diff --git a/recipes/core/userutils/recipe.toml b/recipes/core/userutils/recipe.toml index 666bfeb10..477cfd2d8 100644 --- a/recipes/core/userutils/recipe.toml +++ b/recipes/core/userutils/recipe.toml @@ -1,5 +1,8 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/userutils.git" +# git = "https://gitlab.redox-os.org/redox-os/userutils.git" +git = "https://gitlab.redox-os.org/Ibuki.O/userutils.git" +# branch = "scheme_root_fd" +branch = "namespace-improvement" [build] template = "custom" From df166250fc6c855742b6a9392876b9235aa6ffe0 Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Sat, 13 Dec 2025 01:01:43 +0900 Subject: [PATCH 2/3] wip: Clean comments. --- recipes/core/base/recipe.toml | 4 ---- recipes/core/kernel/recipe.toml | 4 ---- recipes/core/relibc/recipe.toml | 3 --- recipes/core/userutils/recipe.toml | 2 -- 4 files changed, 13 deletions(-) diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 04ed27b54..b51b4d052 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -1,10 +1,6 @@ [source] -# git = "https://gitlab.redox-os.org/redox-os/base.git" git = "https://gitlab.redox-os.org/Ibuki.O/base.git" -# branch = "unlinkat" -# branch = "filter-uidgid" branch = "namespace-improvement" -# branch = "debug" [build] template = "custom" diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml index b5387123e..fa17b1a0a 100644 --- a/recipes/core/kernel/recipe.toml +++ b/recipes/core/kernel/recipe.toml @@ -1,9 +1,5 @@ [source] -# git = "https://gitlab.redox-os.org/redox-os/kernel.git" git = "https://gitlab.redox-os.org/Ibuki.O/kernel.git" -# branch = "schemelist" -# branch = "unlinkat" -# branch = "filter-uidgid" branch = "namespace-improvement" [build] diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml index 33baa652b..7bdf241a9 100644 --- a/recipes/core/relibc/recipe.toml +++ b/recipes/core/relibc/recipe.toml @@ -1,8 +1,5 @@ [source] -# git = "https://gitlab.redox-os.org/redox-os/relibc.git" git = "https://gitlab.redox-os.org/Ibuki.O/relibc.git" -# branch = "unlinkat" -# branch = "filter-uidgid" branch = "namespace-improvement" [build] diff --git a/recipes/core/userutils/recipe.toml b/recipes/core/userutils/recipe.toml index 477cfd2d8..ce71098ee 100644 --- a/recipes/core/userutils/recipe.toml +++ b/recipes/core/userutils/recipe.toml @@ -1,7 +1,5 @@ [source] -# git = "https://gitlab.redox-os.org/redox-os/userutils.git" git = "https://gitlab.redox-os.org/Ibuki.O/userutils.git" -# branch = "scheme_root_fd" branch = "namespace-improvement" [build] From 96dd268e51fa876919b848aea6d248aa43af47b9 Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Sat, 13 Dec 2025 09:54:22 +0900 Subject: [PATCH 3/3] wip: Remove comments from redoxfs recipe. --- recipes/core/redoxfs/recipe.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/core/redoxfs/recipe.toml b/recipes/core/redoxfs/recipe.toml index 9cc75e4d0..d613cae22 100644 --- a/recipes/core/redoxfs/recipe.toml +++ b/recipes/core/redoxfs/recipe.toml @@ -1,7 +1,5 @@ [source] -# git = "https://gitlab.redox-os.org/redox-os/redoxfs.git" git = "https://gitlab.redox-os.org/Ibuki.O/redoxfs.git" -# branch = "scheme_root_fd" branch = "unlinkat" [build]