Updated qemu to current stable.

[people/pmueller/ipfire-2.x.git] / tools / make-functions

diff --git a/tools/make-functions b/tools/make-functions
index c8b63e7ca41c39ffe49102f0364e81c03b2a8ff0..00d7d337cd6eab53c2274b270e9c483106176672 100644 (file)
--- 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,19 +493,20 @@ batch_script() {
 
        if [ "$IPFIRE_REBUILD" -eq "0" ]; then
                export IPFIRE_START_TIME=`date`
+
+               $0 clean
                evaluate 1
 
-               echo "### RUNNING SVN-UPDATE"
-               $0 svn update
-               evaluate 1 mail_me SVNUPDATE
+               $0 git update --force
+               evaluate 1 mail_me UPDATE
 
                echo "### EXPORT SOURCES"
-               $0 svn dist
-               evaluate 1 mail_me SVNDIST
+               $0 git dist
+               evaluate 1 mail_me DIST
        fi
 
        echo "### RUNNING BUILD"
-       $0 build #--devel
+       $0 build
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"
@@ -526,8 +534,8 @@ mail_me() {
        case "$1" in
                success)
                        cat <<END >> /tmp/ipfire_mail_body.$$
-Subject: SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname`
-Building IPFire on `hostname` in Revision $SVN_REVISION was successfull!
+Subject: SUCCESS: IPFIRE-BUILD on `hostname`
+Building IPFire on `hostname` was successfull!
 You can find the ISO on your ftp server if you told the script where it is.
 
 Statistics:
@@ -543,7 +551,7 @@ END
                ;;
                *)
                        cat <<END >> /tmp/ipfire_mail_body.$$
-Subject: ERROR $1: IPFIRE-BUILD R$SVN_REVISION on `hostname`
+Subject: ERROR $1: IPFIRE-BUILD on `hostname`
 When I was building IPFire on `hostname`, I have found an ERROR with name $1!
 Here you can see the logs and detect the reason for this error.
 
@@ -560,6 +568,7 @@ END
                ;;
        esac
 
+sleep 15
        python tools/sendEmail < /tmp/ipfire_mail_body.$$
        if [ "$?" -eq "0" ]; then
                beautify message DONE