diff --git a/cook.sh b/cook.sh index a4f1b0bff558f5495a20716a6c26c82ad2ffb00b..392e1da65fe6da04871f43eb63f5dc00254dd7c4 100755 --- a/cook.sh +++ b/cook.sh @@ -37,7 +37,6 @@ function op { case "$2" in dist) op $1 prepare - op $1 update op $1 build op $1 stage op $1 tar @@ -94,6 +93,19 @@ function op { rm -f source.tar fi ;; + update) + pushd source > /dev/null + skip=0 + if [ "$(type -t recipe_update)" = "function" ] + then + recipe_update + fi + if [ "$skip" -eq "0" ] + then + xargo update + fi + popd > /dev/null + ;; prepare) rm -rf sysroot mkdir sysroot @@ -143,19 +155,6 @@ function op { op $1 version fi ;; - update) - pushd build > /dev/null - skip=0 - if [ "$(type -t recipe_update)" = "function" ] - then - recipe_update - fi - if [ "$skip" -eq "0" ] - then - xargo update - fi - popd > /dev/null - ;; build) pushd build > /dev/null skip=0 diff --git a/pkgutils b/pkgutils index 65291649009fa64d5b1c40129068471cc57f0c0d..d3062a717c53601441c42cd4c974054f8084ee6d 160000 --- a/pkgutils +++ b/pkgutils @@ -1 +1 @@ -Subproject commit 65291649009fa64d5b1c40129068471cc57f0c0d +Subproject commit d3062a717c53601441c42cd4c974054f8084ee6d diff --git a/repo.sh b/repo.sh index ecde2d38ba336902f697bbdc5e6d56b9a242c5c1..083316b6652137e932d21213a8e7ed89b7bf4d8a 100755 --- a/repo.sh +++ b/repo.sh @@ -36,7 +36,7 @@ do if [ ! -f "recipes/$recipe/stage.tar.gz" ] then echo -e "\033[01;38;5;155mrepo - building $recipe\033[0m" >&2 - ./cook.sh "$recipe" update build stage tar + ./cook.sh "$recipe" build stage tar else TIME_BUILD="$($FIND recipes/$recipe/build -type f -not -path '*/.git*' -printf "%Ts\n" | sort -nr | head -n 1)" TIME_STAGE="$($STAT -c "%Y" recipes/$recipe/stage.tar.gz)" @@ -44,7 +44,7 @@ do if [ "$TIME_BUILD" -gt "$TIME_STAGE" -o "$TIME_RECIPE" -gt "$TIME_STAGE" ] then echo -e "\033[01;38;5;155mrepo - rebuilding $recipe\033[0m" >&2 - ./cook.sh "$recipe" untar unstage update build stage tar + ./cook.sh "$recipe" untar unstage build stage tar else echo -e "\033[01;38;5;155mrepo - $recipe up to date\033[0m" >&2 fi