]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
Hinzugefuegt:
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index d9bfb84f929cf26137410a72a95606b18ccf143b..ef4dfc0fd838cb91033c8a61a6261124f9e2cb1d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -758,6 +758,8 @@ buildipcop() {
   ipcopmake etherwake
   ipcopmake ethereal
   ipcopmake tftp-hpa
+  ipcopmake subversion
+  ipcopmake iptraf
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
@@ -858,6 +860,8 @@ buildpackages() {
                cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
        fi
   done
+  cd $BASEDIR/packages; ls -w1 *.tar.gz | awk -F ".tar.gz" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
+  echo "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
 
@@ -877,6 +881,7 @@ ipfirepackages() {
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
+  ipfiredist iptraf
   ipfiredist java
   ipfiredist lame
   ipfiredist libogg
@@ -888,11 +893,13 @@ ipfirepackages() {
   ipfiredist nfs
   ipfiredist nmap
   ipfiredist ntop
+  ipfiredist portmap
   ipfiredist postfix
   ipfiredist procmail
   ipfiredist samba
   ipfiredist sox
   ipfiredist spamassassin
+  ipfiredist subversion
   ipfiredist web-cyradm
   ipfiredist xampp
 #  ipfiredist xinetd
@@ -1176,14 +1183,20 @@ svn)
          ;;
          commit|ci)
                clear
-               #$0 changelog
-               #echo "Upload the changed files..."
+               if [ -e /sbin/yast ]; then
+                       $0 changelog
+               fi
+               echo "Upload the changed files..."
                sleep 1
-               svn commit
+               IPFIRE_SVN_MESSAGE=/tmp/ipfire-svn-co-message.txt
+               rm -f $IPFIRE_SVN_MESSAGE
+               mcedit $IPFIRE_SVN_MESSAGE
+               svn commit -F $IPFIRE_SVN_MESSAGE
+               rm -f $IPFIRE_SVN_MESSAGE
                $0 svn up
          ;;
          dist)
-               $0 svn up
+               #$0 svn up
                echo -ne "Download source package from svn..."
                svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
                if [ "$?" -eq "0" ]; then
@@ -1193,7 +1206,7 @@ svn)
                        exit 1
                fi
                echo -n "Compress files..."
-               tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
+               tar cfz ipfire-source-r$SVN_REVISION.tar.gz ipfire-source
                if [ "$?" -eq "0" ]; then
                        echo ".Done!"
                else
@@ -1338,28 +1351,39 @@ upload)
        case "$2" in
          iso)
                echo -e "Uploading the iso to $IPFIRE_FTP_URL_EXT."
-               ncftpls -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT ftp://$IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/ | grep $SVN_REVISION
-               if [ "$?" -eq "1" ]; then
-                               cp $BASEDIR/ipfire-install-$VERSION.i386.iso $BASEDIR/ipfire-install-$VERSION.i386-r`svn info | grep Revision | cut -c 11-`.iso
-                               md5sum ipfire-install-$VERSION.i386-r$SVN_REVISION.iso > ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
-                               ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso
-                               ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
-                               ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-*-r$SVN_REVISION.tar.gz
-                               if [ "$?" -eq "0" ]; then
-                                       echo -e "The ISO of Revision $SVN_REVISION was successfully uploaded to the ftp server."
-                               else
-                                       echo -e "There was an error while uploading the iso to the ftp server."
-                                       exit 1
-                               fi
+               cat <<EOF > .ftp-commands
+mkdir $IPFIRE_FTP_PATH_EXT
+ls -lah
+quit
+EOF
+               ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands
+               rm -f .ftp-commands
+               md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5
+               ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso
+               ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso.md5
+               ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-r$SVN_REVISION.tar.gz
+               ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ svn_status
+               if [ "$?" -eq "0" ]; then
+                       echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/."
                else
-                       echo -e "File with name ipfire-install-$VERSION.i386-r$SVN_REVISION.iso already exists on the ftp server!"
+                       echo -e "There was an error while uploading the iso to the ftp server."
+                       exit 1
+               fi
+               if [ "$3" = "--with-sources-cd" ]; then
+                       ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-sources-cd-$VERSION.$MACHINE.iso
                fi
-               rm -f ipfire-install-$VERSION.i386-r$SVN_REVISION.iso{,.md5}
                ;;
          paks)
+               cat <<EOF > .ftp-commands
+mkdir $IPFIRE_FTP_PATH_PAK
+ls -lah
+quit
+EOF
+               ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .ftp-commands
+               rm -f .ftp-commands
                ncftpput -z -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK $IPFIRE_FTP_PATH_PAK/ packages/*
                if [ "$?" -eq "0" ]; then
-                       echo -e "The packages were successfully uploaded to the ftp server."
+                       echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/."
                else
                        echo -e "There was an error while uploading the packages to the ftp server."
                        exit 1
@@ -1498,31 +1522,34 @@ unattended)
        ### This is our procedure that will compile the IPFire by herself...
        echo "### UPDATE LOGS"
        update_logs
-       echo "### SAVING TIME"
-       export IPFIRE_START_TIME=`date`
 
-       echo "### GETTING TOOLCHAIN"
-       $0 gettoolchain
+       if [ "$IPFIRE_REBUILD" -eq "0" ]; then
+               echo "### SAVING TIME"
+               export IPFIRE_START_TIME=`date`
 
-       echo "### RUNNING SVN-UPDATE"
-       $0 svn update
-       if [ $? -ne 0 ]; then
-               $0 mail SVNUPDATE
-               exit 1
-       fi
+               echo "### GETTING TOOLCHAIN"
+               $0 gettoolchain
+
+               echo "### RUNNING SVN-UPDATE"
+               $0 svn update
+               if [ $? -ne 0 ]; then
+                       $0 mail SVNUPDATE
+                       exit 1
+               fi
        
-       echo "### EXPORT SOURCES"
-       $0 svn dist
-       if [ $? -ne 0 ]; then
-               $0 mail SVNDIST
-               exit 1
-       fi
+               echo "### EXPORT SOURCES"
+               $0 svn dist
+               if [ $? -ne 0 ]; then
+                       $0 mail SVNDIST
+                       exit 1
+               fi
 
-       echo "### RUNNING PREFETCH"
-       $0 prefetch | grep -q "md5 difference"
-       if [ $? -eq 0 ]; then
-               $0 mail PREFETCH
-               exit 1
+               echo "### RUNNING PREFETCH"
+               $0 prefetch | grep -q "md5 difference"
+               if [ $? -eq 0 ]; then
+                       $0 mail PREFETCH
+                       exit 1
+               fi
        fi
 
        echo "### RUNNING BUILD"
@@ -1533,7 +1560,8 @@ unattended)
        fi
 
        echo "### MAKING SOURCES-ISO"
-       $0 sources-iso
+       echo "DISABLED by Delaco!"
+       #$0 sources-iso
 
        echo "### UPLOADING ISO"
        $0 upload iso
@@ -1554,10 +1582,16 @@ unattended)
        exit 0
        ;;
 batch)
-       if [ `screen -ls | grep batch` ]; then
+       if [ `screen -ls | grep -q ipfire` ]; then
                echo "Build is already running, sorry!"
                exit 1
        else
+               if [ "$2" = "--rebuild" ]; then
+                       export IPFIRE_REBUILD=1
+                       echo "REBUILD!"
+               else
+                       export IPFIRE_REBUILD=0
+               fi
                echo -n "IPFire-Batch-Build is starting..."
                screen -dmS ipfire $0 unattended
                if [ "$?" -eq "0" ]; then
@@ -1566,11 +1600,6 @@ batch)
                        echo ".ERROR!"
                        exit 1
                fi
-               #if [ "$2" -eq "-v" ]; then
-               #       screen -x ipfire
-               #else
-               #       echo "You may attach you with '-v'."
-               #fi
                exit 0
        fi
        ;;