mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Fix find_recipe in scripts
This commit is contained in:
parent
93d87b80df
commit
5cd67650fc
@ -54,7 +54,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# if no command name is given, assume it's the same as the recipe name
|
# if no command name is given, assume it's the same as the recipe name
|
||||||
RECIPE_DIR="$(target/release/find_recipe $RECIPE_NAME)"
|
RECIPE_DIR="$(target/release/repo find $RECIPE_NAME)"
|
||||||
if [ -z "$COMMAND" ]
|
if [ -z "$COMMAND" ]
|
||||||
then
|
then
|
||||||
COMMAND="$RECIPE_NAME"
|
COMMAND="$RECIPE_NAME"
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
# This script runs "make f.recipe" and "cargo update" in the specified recipe
|
# This script runs "make f.recipe" and "cargo update" in the specified recipe
|
||||||
|
|
||||||
recipe_name="$1"
|
recipe_name="$1"
|
||||||
recipe_path=$(find recipes -name "$recipe_name" -maxdepth 4)
|
recipe_path=$(target/release/repo find $recipe_name)
|
||||||
|
|
||||||
make f."$recipe_name"
|
make f."$recipe_name"
|
||||||
cd "$recipe_path"/source
|
cd "$recipe_path"/source
|
||||||
|
|||||||
@ -24,14 +24,14 @@ fi
|
|||||||
|
|
||||||
for package in $(installer/target/release/redox_installer --list-packages -c config/$(uname -m)/desktop.toml)
|
for package in $(installer/target/release/redox_installer --list-packages -c config/$(uname -m)/desktop.toml)
|
||||||
do
|
do
|
||||||
package_source="$(target/release/find_recipe ${package})"
|
package_source="$(target/release/repo find ${package})"
|
||||||
REPOS+=("${package}=${package_source}/source")
|
REPOS+=("${package}=${package_source}/source")
|
||||||
done
|
done
|
||||||
|
|
||||||
# TODO: resolve dependencies instead of manually adding these initfs packages
|
# TODO: resolve dependencies instead of manually adding these initfs packages
|
||||||
for package in init logd ramfs randd zerod
|
for package in init logd ramfs randd zerod
|
||||||
do
|
do
|
||||||
package_source="$(target/release/find_recipe ${package})"
|
package_source="$(target/release/repo find ${package})"
|
||||||
REPOS+=("${package}=${package_source}/source")
|
REPOS+=("${package}=${package_source}/source")
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@ -48,7 +48,7 @@ do
|
|||||||
recipe_path="recipes/$recipe"
|
recipe_path="recipes/$recipe"
|
||||||
else
|
else
|
||||||
recipe_name="$recipe"
|
recipe_name="$recipe"
|
||||||
recipe_path="$(target/release/find_recipe $recipe_name)"
|
recipe_path="$(target/release/repo find $recipe_name)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for command in $(find "$recipe_path/target/$target/stage/usr/bin" -type f 2> /dev/null) \
|
for command in $(find "$recipe_path/target/$target/stage/usr/bin" -type f 2> /dev/null) \
|
||||||
|
|||||||
@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
# This script print the recipe configuration
|
# This script print the recipe configuration
|
||||||
|
|
||||||
cat $(target/release/find_recipe "$1")/recipe.*
|
cat $(target/release/repo find "$1")/recipe.*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user