Merge branch 'fix-orbutils' into 'master'

Fix orbutils script and others

See merge request redox-os/redox!1982
This commit is contained in:
Jeremy Soller 2026-03-07 07:39:14 -07:00
commit 6a1bb873ae
4 changed files with 4 additions and 17 deletions

View File

@ -8,12 +8,7 @@ DYNAMIC_INIT
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui"
cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/usr/share/ui/apps"
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags}
cookbook_cargo
"""
[package]

View File

@ -8,13 +8,6 @@ DYNAMIC_INIT
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui"
cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/usr/share/ui/apps"
for project in orbutils launcher
do
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}/${project}" \
--root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags}
done
COOKBOOK_CARGO_PATH="orbutils" cookbook_cargo
COOKBOOK_CARGO_PATH="launcher" cookbook_cargo
"""

View File

@ -10,7 +10,6 @@ export CARGOFLAGS="--no-default-features --features chrono"
${COOKBOOK_CARGO} install \
--path "${COOKBOOK_SOURCE}/${COOKBOOK_CARGO_PATH}" \
--root "${COOKBOOK_STAGE}/usr" \
--no-track \
--no-default-features \
--features chrono \
${install_flags}

View File

@ -9,7 +9,7 @@ DYNAMIC_INIT
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags} \
--features orbital
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"