Großes Update:

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

diff --git a/make.sh b/make.sh
index e8972eb66ddc4efcdb1614dfc00f1ca8b7f0f35f..803baeee5e9b77de4dc04e7e1c8e798e122f2fb3 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -29,7 +29,7 @@
   SLOGAN="We secure your network"      # Software slogan
   CONFIG_ROOT=/var/ipfire              # Configuration rootdir
   NICE=10
-  MAX_RETRIES=3                                # prefetch/check loop
+  MAX_RETRIES=3                        # prefetch/check loop
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
@@ -335,6 +335,7 @@ ipcopmake() {
 
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
+         if [ "`ls -w1 $BASEDIR/packages/ | grep $1; echo $?`" -ne "0" ]; 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 \
@@ -352,11 +353,12 @@ ipfiredist() {
                if [ $? -ne 0 ]; then
                        exiterror "Packaging $1"
                fi
+         else
+               echo "`date -u '+%b %e %T'`: Package $1 already exists" | tee -a $LOGFILE
+         fi            
        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/
        return 0
 }
 
@@ -602,6 +604,7 @@ buildipcop() {
   ipcopmake iproute2
   ipcopmake iptstate
   ipcopmake iputils
+  ipcopmake l7-protocols
   ipcopmake isapnptools
   ipcopmake isdn4k-utils
   ipcopmake kudzu
@@ -633,6 +636,8 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake GeoIP
+  ipcopmake fwhits
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -654,14 +659,17 @@ buildipcop() {
   ipcopmake 3c5x9setup
   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!
   ipcopmake berkeley
   ipcopmake BerkeleyDB ## The Perl module
+  ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
+  ipcopmake openvpn
   ipcopmake pkg-config
   ipcopmake glib
   ipcopmake xampp
@@ -686,6 +694,7 @@ buildipcop() {
   ipcopmake fetchmail
   ipcopmake cyrusimap
   ipcopmake procmail
+  ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
   ipcopmake spamassassin
@@ -696,17 +705,22 @@ buildipcop() {
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
-  ipcopmake openvpn
+  echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
+  ipcopmake applejuice
   ipcopmake edonkeyclc
   ipcopmake sane
   ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  ipcopmake screen
   ipcopmake nmap
+  ipcopmake htop
   ipcopmake nfs
+  ipcopmake ncftp
+  ipcopmake ethereal
 #  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
+#  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -795,11 +809,12 @@ buildpackages() {
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
-  # Build IPFire packages
+  ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
+  ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
   ipfiredist mc
@@ -811,7 +826,9 @@ buildpackages() {
   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
+  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf $LFS/paks
+  rm -rf $BASEDIR/build/tmp/*
 
   # Cleanup
   stdumount
@@ -1057,13 +1074,17 @@ gettoolchain)
                if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
                        echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-                       cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
+                       cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
                        rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
        fi
        ;;
+paks)
+       prepareenv
+       buildpackages
+       ;;
 update)
        echo "Load the latest source-files:"
        svn update
@@ -1071,11 +1092,10 @@ update)
 commit)
        echo "Upload the changed files:"
        svn commit
-       svn up > /dev/null
        ;;
 make)
        echo "Do a complete compile:"   
-       ./make.sh prefetch && ./make.sh build
+       ./make.sh prefetch && ./make.sh gettoolchain && ./make.sh build
        ;;
 diff)
        echo -ne "Make a local diff to last SVN revision: "
@@ -1083,8 +1103,32 @@ diff)
        echo "Finished!"
        echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
        ;;
+sync)
+       echo -e "Syncing Cache to FTP:"
+       echo -ne "Password for mirror.ipfire.org: "; read PASS
+       rm -f doc/packages-to-remove-from-ftp
+       ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/source/ > ftplist
+       for i in `ls -w1 cache/`; do
+               grep $i ftplist
+               if [ "$?" -ne "0" ]; then
+                       ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/source cache/$i
+                       if [ "$?" -eq "0" ]; then
+                               echo -e "$i was successfully uploaded to the ftp server."
+                       else
+                               echo -e "There was an error while uploading $i to the ftp server."
+                       fi
+               fi
+       done
+       for i in `cat ftplist`; do
+               ls -w1 cache/ | grep $i
+               if [ "$?" -eq "1" ]; then
+                       echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
+               fi
+       done
+       rm -f ftplist
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|toolchain|update}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;