X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=tools%2Fmake-functions;h=00d7d337cd6eab53c2274b270e9c483106176672;hp=1f66787da4d6323968312defaac4cba5745b2fb9;hb=d03334be56ab28f4b1ead47be49e6439b4350433;hpb=d6d435090b927be99e82a275a6b4d36529f2a788 diff --git a/tools/make-functions b/tools/make-functions index 1f66787da4..00d7d337cd 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -142,7 +142,13 @@ beautify() ;; build_end) BUILD_TIME_END=`date +%s` - echo -ne "${DONE}***Build is finished now and took $[ $BUILD_TIME_END - $BUILD_TIME_START ] secs!${NORMAL}\n" + seconds=$[ $BUILD_TIME_END - $BUILD_TIME_START ] + hours=$((seconds / 3600)) + seconds=$((seconds % 3600)) + minutes=$((seconds / 60)) + seconds=$((seconds % 60)) + + echo -ne "${DONE}***Build is finished now and took $hours hour(s) $minutes minute(s) $seconds second(s)!${NORMAL}\n" ;; make_pkg) echo "$2" | while read PKG_VER PROGRAM OPTIONS @@ -391,6 +397,7 @@ ipfiremake() { TERM=$TERM PS1='\u:\w\$ ' \ PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \ VERSION=$VERSION \ + CORE=$CORE \ CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \ @@ -486,9 +493,11 @@ batch_script() { if [ "$IPFIRE_REBUILD" -eq "0" ]; then export IPFIRE_START_TIME=`date` + + $0 clean evaluate 1 - $0 git update + $0 git update --force evaluate 1 mail_me UPDATE echo "### EXPORT SOURCES"