From d6d435090b927be99e82a275a6b4d36529f2a788 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 5 Apr 2008 18:22:38 +0200 Subject: [PATCH] Removed more stuff of the old SVN repository. --- make.sh | 18 +----------------- tools/make-functions | 17 ++++++++--------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/make.sh b/make.sh index b2cdaea0d..a2edd1566 100755 --- a/make.sh +++ b/make.sh @@ -711,13 +711,6 @@ build) beautify build_stage "Building IPFire" buildipfire - # Setzen des IPFire Builds - if [ "$SVN_REVISION" ]; then - echo "$SVN_REVISION" > $BASEDIR/build/var/ipfire/firebuild - else - echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild - fi - beautify build_stage "Building installer" buildinstaller @@ -731,11 +724,6 @@ shell) prepareenv entershell ;; -changelog) - echo -n "Loading new Changelog from SVN: " - svn log http://svn.ipfire.org/svn/ipfire > doc/ChangeLog - beautify message DONE - ;; clean) echo -en "${BOLD}Cleaning build directory...${NORMAL}" for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do @@ -1014,8 +1002,7 @@ lang) ;; "") clear - svn info - select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help" + select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "LOG: Tail" "Help" do case $name in "IPFIRE: Downloadsrc") @@ -1033,9 +1020,6 @@ lang) "IPFIRE: Clean") $0 clean ;; - "SVN: Update") - $0 svn update - ;; "Help") echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage diff --git a/tools/make-functions b/tools/make-functions index 62f33115d..1f66787da 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -488,17 +488,16 @@ batch_script() { export IPFIRE_START_TIME=`date` evaluate 1 - echo "### RUNNING SVN-UPDATE" - $0 svn update - evaluate 1 mail_me SVNUPDATE + $0 git update + 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 +525,8 @@ mail_me() { case "$1" in success) cat <> /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 +542,7 @@ END ;; *) cat <> /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. -- 2.39.2