Hinzugefügt:

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

diff --git a/make.sh b/make.sh
index 2b94e94de656f64f4c0001d87a34f658dafbc480..7072e0d945222b8b117fcabff9bafa74972af326 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -355,7 +355,7 @@ ipfiredist() {
                        exiterror "Packaging $1"
                fi
          else
-               echo -e "`date -u '+%b %e %T'`: Packages with name $1 already exists!" | tee -a $LOGFILE
+               echo -e "`date -u '+%b %e %T'`: Package with name $1 already exists!" | tee -a $LOGFILE
          fi
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
@@ -543,6 +543,7 @@ buildipcop() {
        ipcopmake fcdslusb      SMP=1
        ipcopmake fcdslslusb    SMP=1
        ipcopmake fcpci SMP=1
+       ipcopmake fcclassic     SMP=1
        ipcopmake pulsar        SMP=1
        ipcopmake unicorn       SMP=1
   fi
@@ -563,7 +564,8 @@ buildipcop() {
        ipcopmake fcdslsl       
        ipcopmake fcdslusb      
        ipcopmake fcdslslusb 
-       ipcopmake fcpci 
+       ipcopmake fcpci
+       ipcopmake fcclassic
        ipcopmake pulsar        
        ipcopmake unicorn       
   fi
@@ -639,6 +641,8 @@ buildipcop() {
   ipcopmake Archive-Zip
   ipcopmake GeoIP
   ipcopmake fwhits
+  ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -650,6 +654,9 @@ buildipcop() {
   ipcopmake setup
   ipcopmake snort
   #ipcopmake speedycgi
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake tcpdump
@@ -662,8 +669,6 @@ buildipcop() {
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
-  ipcopmake berkeley
-  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
@@ -676,9 +681,6 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
-  ipcopmake saslauthd PASS=1
-  ipcopmake openldap
-  ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
@@ -832,6 +834,7 @@ ipfirepackages() {
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
+  ipfiredist java
   ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
@@ -1074,7 +1077,7 @@ gettoolchain)
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
                        echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
                        cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
-                       rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
+                       rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
@@ -1092,6 +1095,7 @@ update)
 commit)
        echo "Upload the changed files:"
        svn commit
+       ./make.sh sync
        svn up > /dev/null
        ;;
 make)
@@ -1128,10 +1132,9 @@ sync)
        done
        rm -f ftplist
        ;;
-pub)
+pub-iso)
        echo -e "Upload the ISO to the beta-mirror!"
        echo -ne "Password for mirror.ipfire.org: "; read PASS
-
        ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/beta/ | grep `svn info | grep Revision | cut -c 11-`
        if [ "$?" -eq "1" ]; then
                        cp $BASEDIR/ipfire-install-1.4.i386.iso $BASEDIR/ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
@@ -1148,8 +1151,18 @@ pub)
        fi
        rm -f ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso{,.md5}
        ;;
+pub-paks)
+       echo -e "Upload the packages to the beta-mirror!"
+       echo -ne "Password for mirror.ipfire.org: "; read PASS
+       ncftpput -z -u web3 -p $PASS mirror.ipfire.org /html/source-packages/packages/ packages/*
+       if [ "$?" -eq "0" ]; then
+               echo -e "The packages were successfully uploaded to the ftp server."
+       else
+               echo -e "There was an error while uploading the packages to the ftp server."
+       fi
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub|shell|sync|toolchain|update}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub-iso|pub-paks|shell|sync|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;