Hinzugefuegt:

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index fa6222534cbc1c9ba9376234f640dcc7a640cf1b..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
@@ -894,6 +899,7 @@ ipfirepackages() {
   ipfiredist samba
   ipfiredist sox
   ipfiredist spamassassin
+  ipfiredist subversion
   ipfiredist web-cyradm
   ipfiredist xampp
 #  ipfiredist xinetd
@@ -1177,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
@@ -1548,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