Geändert:

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

diff --git a/make.sh b/make.sh
index 51bb5f92b1435783833e93c0e9a33ad941f388e8..5959202cae67705d479dd97679e0a7e32cbc2081 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -337,7 +337,6 @@ ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
 #         if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-               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 \
@@ -656,7 +655,6 @@ buildipcop() {
   #ipcopmake speedycgi
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  ipcopmake saslauthd PASS=2
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake squidguard
@@ -666,7 +664,7 @@ buildipcop() {
   #ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+#  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
@@ -682,6 +680,7 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
@@ -711,21 +710,22 @@ buildipcop() {
   echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
   ipcopmake asterisk
+  ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake edonkeyclc
-  ipcopmake sane
+#  ipcopmake sane
   echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
   ipcopmake ntop
-  ipcopmake rsync
+#  ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  ipcopmake nfs
   ipcopmake nmap
   ipcopmake iftop
-  ipcopmake nfs
   ipcopmake ncftp
   ipcopmake cftp
   ipcopmake etherwake
@@ -836,8 +836,13 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  for i in `ls $BASEDIR/packages`; do
+       touch $BASEDIR/build/install/packages/$i.empty
+  done
   ipfiredist applejuice
   ipfiredist asterisk
+  ipfiredist clamav
+  ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -847,14 +852,13 @@ ipfirepackages() {
   ipfiredist libxml2
   ipfiredist ntop
   ipfiredist postfix
-  ipfiredist pwlib
+  ipfiredist procmail
   ipfiredist samba
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-  rm -rf $LFS/paks
-  rm -rf $BASEDIR/build/tmp/*
+  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
 }
 
 # See what we're supposed to do
@@ -1090,8 +1094,8 @@ gettoolchain)
        ;;
 paks)
        prepareenv
-       buildpackages
-       # ipfirepackages
+       # buildpackages
+       ipfirepackages
        ;;
 update)
        echo "Load the latest source-files:"