Geändert:

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

diff --git a/make.sh b/make.sh
index 49d58a08900acc89f517425e22e81822b6b6375e..cc7a80fa97e74f641d643561e895dc3f0351336e 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -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
@@ -718,9 +720,9 @@ buildipcop() {
   ipcopmake htop
   ipcopmake nfs
   ipcopmake ncftp
+  ipcopmake cftp
   ipcopmake ethereal
-#  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
-#  ipcopmake hddtemp
+  ipcopmake hddtemp
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
@@ -854,7 +856,7 @@ ipfirepackages() {
 case "$1" in 
 build)
        BUILDMACHINE=`uname -m`
-       PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4.*-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
+       PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/perl-*-tools ]; then
                if [ ! -n "$PACKAGE" ]; then
@@ -1067,18 +1069,18 @@ gettoolchain)
        URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
        echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        cd $BASEDIR/cache
-       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
-       else
-               if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
-                       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}
-               else
-                       exiterror "$PACKAGE.md5 did not match, check downloaded package"
-               fi
+#      else
+#              if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
+#                      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 -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
+#              else
+#                      exiterror "$PACKAGE.md5 did not match, check downloaded package"
+#              fi
        fi
        ;;
 paks)
@@ -1093,6 +1095,7 @@ update)
 commit)
        echo "Upload the changed files:"
        svn commit
+       ./make.sh sync
        svn up > /dev/null
        ;;
 make)