Hinzugefügt:

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

diff --git a/make.sh b/make.sh
index 187e4dfec34e5b617c3fbbe08bc096d3009978bf..b0cefc36ecb5dae8307c7edf0b955dc759c653d1 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
 }
 
@@ -647,31 +643,39 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
-  ipcopmake sudo
-  ipcopmake xinetd
+## Zuerst die Libs und dann die Programme. Ordnung muss sein!
+  ipcopmake berkeley
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake libxml2
+  ipcopmake spandsp
+  ipcopmake lzo
   ipcopmake pkg-config
   ipcopmake glib
-  ipcopmake wget
-  ipcopmake berkeley-DB
   ipcopmake xampp
-  ipcopmake bridge-utils
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
-#  ipcopmake samba
+  ipcopmake samba
+  ipcopmake sudo
   ipcopmake mc
+  ipcopmake pwlib
+  ipcopmake openh323
+  ipcopmake xinetd
+  ipcopmake wget
+  ipcopmake bridge-utils
   ipcopmake postfix
   ipcopmake stund
   ipcopmake lpd
-  ipcopmake pwlib
-  ipcopmake openh323
+  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 lzo
-  ipcopmake openvpn
-
+# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -761,10 +765,18 @@ buildpackages() {
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
   # Build IPFire packages
+  ipfiredist asterisk
+  ipfiredist libtiff
+  ipfiredist libxml2
   ipfiredist mc
   ipfiredist postfix
+  ipfiredist pwlib
+  ipfiredist spandsp
   ipfiredist sudo
   ipfiredist xinetd
+  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+  cp -f $LFS/paks/* $BASEDIR/packages >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*