Merge branch 'merge_nulld_zerod' into 'master'

Merge nulld and zerod.

See merge request redox-os/cookbook!319
This commit is contained in:
Jeremy Soller 2023-12-07 15:31:34 +00:00
commit 052c893cb7
3 changed files with 9 additions and 7 deletions

View File

@ -7,7 +7,6 @@ dependencies = [
"drivers-initfs",
"init",
"logd",
"nulld",
"ramfs",
"randd",
"redoxfs",

View File

@ -1,5 +0,0 @@
[source]
git = "https://gitlab.redox-os.org/redox-os/nulld.git"
[build]
template = "cargo"

View File

@ -2,4 +2,12 @@
git = "https://gitlab.redox-os.org/redox-os/zerod.git"
[build]
template = "cargo"
template = "custom"
script = """
cookbook_cargo --bin zerod
# TODO: symlinks aren't supported by redox-initfs
#ln -sv zerod "${COOKBOOK_STAGE}/bin/nulld"
cp "${COOKBOOK_STAGE}/bin/zerod" "${COOKBOOK_STAGE}/bin/nulld"
"""