Geändert:

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

diff --git a/make.sh b/make.sh
index b0cefc36ecb5dae8307c7edf0b955dc759c653d1..87f50dc20cac04ce3c4cdd5f94b69687a3e5aaf6 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -356,8 +356,8 @@ ipfiredist() {
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
-       test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-       mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
+#      test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+#      mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
        return 0
 }
 
@@ -667,6 +667,8 @@ buildipcop() {
   ipcopmake wget
   ipcopmake bridge-utils
   ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
   ipcopmake stund
   ipcopmake lpd
   ipcopmake openvpn
@@ -766,16 +768,20 @@ buildpackages() {
 
   # Build IPFire packages
   ipfiredist asterisk
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
   ipfiredist libtiff
   ipfiredist libxml2
   ipfiredist mc
   ipfiredist postfix
   ipfiredist pwlib
+  ipfiredist sane
   ipfiredist spandsp
   ipfiredist sudo
+  ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  cp -f $LFS/paks/* $BASEDIR/packages >> $LOGFILE 2>&1
+  cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
 
   # Cleanup
   stdumount
@@ -1094,7 +1100,7 @@ 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 -c $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
        else