mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-02 01:28:42 +08:00
Merge branch 'namespace-improvemnt' into 'master'
Draft: Add namespace to base-initfs recipe and login_config See merge request redox-os/redox!1790
This commit is contained in:
commit
f7f5871598
@ -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"]
|
||||
"""
|
||||
|
||||
@ -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"
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/redox-os/base.git"
|
||||
git = "https://gitlab.redox-os.org/Ibuki.O/base.git"
|
||||
branch = "namespace-improvement"
|
||||
|
||||
[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}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/redox-os/kernel.git"
|
||||
git = "https://gitlab.redox-os.org/Ibuki.O/kernel.git"
|
||||
branch = "namespace-improvement"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/redox-os/redoxfs.git"
|
||||
git = "https://gitlab.redox-os.org/Ibuki.O/redoxfs.git"
|
||||
branch = "unlinkat"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/redox-os/relibc.git"
|
||||
git = "https://gitlab.redox-os.org/Ibuki.O/relibc.git"
|
||||
branch = "namespace-improvement"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
[source]
|
||||
git = "https://gitlab.redox-os.org/redox-os/userutils.git"
|
||||
git = "https://gitlab.redox-os.org/Ibuki.O/userutils.git"
|
||||
branch = "namespace-improvement"
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user