mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-24 05:44:17 +08:00
Merge branch 'fix-orbutils' into 'master'
Fix orbutils script and others See merge request redox-os/redox!1982
This commit is contained in:
commit
6a1bb873ae
@ -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]
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user