Merge branch 'find-recipe' into 'master'

Fix find_recipe in scripts

See merge request redox-os/redox!2252
This commit is contained in:
Jeremy Soller 2026-07-16 11:33:56 -06:00
commit 81af77078e
5 changed files with 6 additions and 6 deletions

View File

@ -54,7 +54,7 @@ then
fi
# 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" ]
then
COMMAND="$RECIPE_NAME"

View File

@ -3,7 +3,7 @@
# This script runs "make f.recipe" and "cargo update" in the specified recipe
recipe_name="$1"
recipe_path=$(find recipes -name "$recipe_name" -maxdepth 4)
recipe_path=$(target/release/repo find $recipe_name)
make f."$recipe_name"
cd "$recipe_path"/source

View File

@ -24,14 +24,14 @@ fi
for package in $(installer/target/release/redox_installer --list-packages -c config/$(uname -m)/desktop.toml)
do
package_source="$(target/release/find_recipe ${package})"
package_source="$(target/release/repo find ${package})"
REPOS+=("${package}=${package_source}/source")
done
# TODO: resolve dependencies instead of manually adding these initfs packages
for package in init logd ramfs randd zerod
do
package_source="$(target/release/find_recipe ${package})"
package_source="$(target/release/repo find ${package})"
REPOS+=("${package}=${package_source}/source")
done

View File

@ -48,7 +48,7 @@ do
recipe_path="recipes/$recipe"
else
recipe_name="$recipe"
recipe_path="$(target/release/find_recipe $recipe_name)"
recipe_path="$(target/release/repo find $recipe_name)"
fi
for command in $(find "$recipe_path/target/$target/stage/usr/bin" -type f 2> /dev/null) \

View File

@ -2,4 +2,4 @@
# This script print the recipe configuration
cat $(target/release/find_recipe "$1")/recipe.*
cat $(target/release/repo find "$1")/recipe.*