Großes Update:

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

diff --git a/make.sh b/make.sh
index 7bb41c4729b0e777afef46f7993cd670ebdf7ff0..803baeee5e9b77de4dc04e7e1c8e798e122f2fb3 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -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
@@ -806,7 +809,6 @@ buildpackages() {
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
-  # Build IPFire packages
   ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist cyrusimap
@@ -826,6 +828,7 @@ buildpackages() {
   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/*
 
   # Cleanup
   stdumount
@@ -1071,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
@@ -1085,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: "