Merge branch 'orbital-bins' into 'master'

correct install path for orbutils and orbterm

See merge request redox-os/cookbook!341
This commit is contained in:
Jeremy Soller 2024-01-10 01:01:45 +00:00
commit 0199ab851c
2 changed files with 18 additions and 5 deletions

View File

@ -4,8 +4,12 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git"
[build]
template = "custom"
script = """
COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui"
cookbook_cargo
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
"""
[package]

View File

@ -4,12 +4,21 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git"
[build]
template = "custom"
script = """
COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui"
ORIGINAL_SOURCE="${COOKBOOK_SOURCE}"
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils"
cookbook_cargo
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/calculator"
cookbook_cargo
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
"""