From 7d06611aa92938727325dbda68ff3e0805a3ce13 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 26 Jul 2017 08:20:15 -0600
Subject: [PATCH] Update source, not build, as Cargo.lock is now committed
---
cook.sh | 27 +++++++++++++--------------
pkgutils | 2 +-
repo.sh | 4 ++--
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/cook.sh b/cook.sh
index a4f1b0bff..392e1da65 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 652916490..d3062a717 160000
--- a/pkgutils
+++ b/pkgutils
@@ -1 +1 @@
-Subproject commit 65291649009fa64d5b1c40129068471cc57f0c0d
+Subproject commit d3062a717c53601441c42cd4c974054f8084ee6d
diff --git a/repo.sh b/repo.sh
index ecde2d38b..083316b66 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
--
GitLab