Hinzugefuegt:

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

diff --git a/make.sh b/make.sh
index d71418f5e8d43f7a493262ae39e18056e60e1e53..d1fca3a693b27b44185e15b63b7361868f233b59 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -335,8 +335,7 @@ ipcopmake() {
 
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-         ls $BASEDIR/packages/$1* >& /dev/null
-         if [ $? -eq 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 \
@@ -354,9 +353,9 @@ ipfiredist() {
                if [ $? -ne 0 ]; then
                        exiterror "Packaging $1"
                fi
-         else
-               echo -e "`date -u '+%b %e %T'`: Package with name $1 already exists!" | tee -a $LOGFILE
-         fi
+          else
+               echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
+          fi
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
@@ -527,8 +526,8 @@ buildipcop() {
   if [ 'i386' = $MACHINE ]; then 
        # abuse the SMP flag, and make an minimal installer kernel first
        # so that the boot floppy always works.....
-       ipcopmake linux         LFS_PASS=ipcop SMP=installer
-       ipcopmake linux         LFS_PASS=ipcop SMP=1
+       ipcopmake linux         LFS_PASS=ipfire SMP=installer
+       ipcopmake linux         LFS_PASS=ipfire SMP=1
        ipcopmake 3cp4218       SMP=1
        ipcopmake amedyn        SMP=1
        ipcopmake cxacru        SMP=1
@@ -548,7 +547,7 @@ buildipcop() {
        ipcopmake unicorn       SMP=1
   fi
 
-  ipcopmake linux      LFS_PASS=ipcop
+  ipcopmake linux      LFS_PASS=ipfire
   ipcopmake 3cp4218    
   ipcopmake amedyn     
   ipcopmake cxacru     
@@ -639,6 +638,7 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake Locale-Country
   ipcopmake GeoIP
   ipcopmake fwhits
   ipcopmake berkeley
@@ -692,11 +692,15 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake wget
   ipcopmake bridge-utils
+  ipcopmake screen
+  ipcopmake hddtemp
+  ipcopmake htop
+  ipcopmake lynx
   echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE
   ipcopmake postfix
+  ipcopmake procmail
   ipcopmake fetchmail
   ipcopmake cyrusimap
-  ipcopmake procmail
   ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
@@ -712,18 +716,17 @@ buildipcop() {
   ipcopmake applejuice
   ipcopmake edonkeyclc
   ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
+  ipcopmake ntop
   ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
-  ipcopmake screen
   ipcopmake nmap
-  ipcopmake htop
+  ipcopmake iftop
   ipcopmake nfs
   ipcopmake ncftp
   ipcopmake cftp
   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
 }
 
@@ -764,7 +767,7 @@ buildpackages() {
   echo "`date -u '+%b %e %T'`: Stripping files" | tee -a $LOGFILE
   find $LFS/lib $LFS/usr/lib $LFS/usr/share/rrdtool-* $LFS/install ! -type l \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
        ! -name 'libc.so' ! -name 'libpthread.so' ! -name 'libcrypto.so.0.9.7.sha1' \
-       -ls -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
+        -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
   # add -ls before -exec if you want to verify what files are stripped
 
   find $LFS/{,s}bin $LFS/usr/{,s}bin $LFS/usr/local/{,s}bin ! -type l \
@@ -840,8 +843,10 @@ ipfirepackages() {
   ipfiredist libtiff
   ipfiredist libxml2
   ipfiredist mc
+  ipfiredist ntop
   ipfiredist postfix
   ipfiredist pwlib
+  ipfiredist samba
   ipfiredist sane
   ipfiredist spandsp
   ipfiredist sudo
@@ -857,7 +862,7 @@ ipfirepackages() {
 case "$1" in 
 build)
        BUILDMACHINE=`uname -m`
-       PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4.*-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
+       PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/perl-*-tools ]; then
                if [ ! -n "$PACKAGE" ]; then
@@ -1070,18 +1075,18 @@ 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 $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
-       else
-               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 xfz cache/$PACKAGE.tar.gz -C .
-                       rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
-               else
-                       exiterror "$PACKAGE.md5 did not match, check downloaded package"
-               fi
+#      else
+#              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 xfz cache/$PACKAGE.tar.gz -C .
+#                      rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
+#              else
+#                      exiterror "$PACKAGE.md5 did not match, check downloaded package"
+#              fi
        fi
        ;;
 paks)