Geändert:

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

diff --git a/make.sh b/make.sh
index 31c5a4cc72635fe2c51ea1411d654bbf12bd1a79..87f50dc20cac04ce3c4cdd5f94b69687a3e5aaf6 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -337,7 +337,7 @@ ipcopmake() {
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-               cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/sbin/
+               cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
                chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
@@ -356,12 +356,8 @@ ipfiredist() {
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
-       if [ -e $BASEDIR/packages ]; then
-               mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-       else
-               mkdir -p $BASEDIR/packages
-               mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-       fi
+#      test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+#      mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
        return 0
 }
 
@@ -648,8 +644,9 @@ buildipcop() {
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
-  ipcopmake berkeley-DB
+  ipcopmake berkeley
   ipcopmake libtiff
+  ipcopmake libjpeg
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -658,6 +655,10 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2
+  ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
   ipcopmake pwlib
@@ -665,16 +666,15 @@ buildipcop() {
   ipcopmake xinetd
   ipcopmake wget
   ipcopmake bridge-utils
-  ipcopmake saslauthd PASS=1
-  ipcopmake openldap
-  ipcopmake saslauthd PASS=2
-  ipcopmake samba
   ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
   ipcopmake stund
   ipcopmake lpd
   ipcopmake openvpn
   ipcopmake asterisk
   ipcopmake edonkeyclc
+  ipcopmake sane
 #  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
@@ -767,13 +767,22 @@ buildpackages() {
   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/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -1091,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