Hauptsächlich Quellenupdate. Apache - Bind - hddtemp - hdparm - lame

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

diff --git a/make.sh b/make.sh
index c527cf1a03c146fcb6d6a7f8c9fad6406a54bd88..b51d3b6ce2c3ad1ece5fbf027c1fd521df13ca62 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
 }
 
@@ -646,6 +646,7 @@ buildipcop() {
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake berkeley
   ipcopmake libtiff
+  ipcopmake libjpeg
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -657,20 +658,27 @@ buildipcop() {
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
+  ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
   ipcopmake pwlib
   ipcopmake openh323
-  ipcopmake xinetd
   ipcopmake wget
   ipcopmake bridge-utils
   ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
   ipcopmake stund
-  ipcopmake lpd
+#  ipcopmake lpd
   ipcopmake openvpn
   ipcopmake asterisk
   ipcopmake edonkeyclc
+  ipcopmake sane
+  ipcopmake lame
+  ipcopmake gnump3d
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
 # ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
@@ -759,21 +767,25 @@ buildpackages() {
   # packages-list.txt is ready to be displayed for wiki page
 
   # Create ISO for CDRom and USB-superfloppy
-#  ipcopmake cdrom
-#  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  ipcopmake cdrom
+  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
   # 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
@@ -1092,7 +1104,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