Calamaris-Proxy-Logdatei-Analyzer eingebaut.

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

diff --git a/make.sh b/make.sh
index 58d7e24d698a197ec6bad59e258134f0e5b5d80a..3fd133fc166a32b3b21a79758f3f68bddca3705a 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -395,10 +395,12 @@ buildipfire() {
   ipfiremake fcron
   ipfiremake GD
   ipfiremake GD-Graph
+  ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
   ipfiremake initscripts
+  ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p                     IPT=1
@@ -462,6 +464,7 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
+  ipfiremake calamaris
   ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
@@ -531,7 +534,10 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake iptraf
+  ipfiremake bwm-ng
   ipfiremake nagios
+  ipfiremake tripwire
+  ipfiremake sysstat
 }
 
 buildinstaller() {
@@ -539,6 +545,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -598,18 +606,17 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  for i in $IPFVER
-  do
-       if [ $i == "devel" ]; then
-               if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
-                       ipfiremake cdrom ED=$i
-               fi
-       else
-               ipfiremake cdrom ED=$i
+  if [ "$DEVEL" == "1" ]; then
+               ipfiremake cdrom ED=devel
        fi
-  done
+       ipfiremake cdrom ED=full
+       
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop0 ]; then
+       ipfiremake usb-stick
+  fi
   ipfiremake pxe
-  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -632,7 +639,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -910,9 +916,12 @@ svn)
                                $0 changelog
                        fi
                fi
+               update_langs
                svn commit
                $0 svn up
-               $0 uploadsrc
+               if [ -n "$FTP_CACHE_URL" ]; then
+                       $0 uploadsrc
+               fi
          ;;
          dist)
                if [ $3 ]; then
@@ -939,10 +948,12 @@ svn)
                evaluate 1
          ;;
          diff|di)
+         update_langs
                echo -ne "Make a local diff to last svn revision"
                svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
                evaluate 1
                echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+               svn status
          ;;
        esac
        ;;
@@ -1048,6 +1059,9 @@ pxe)
        esac
        exit 0
        ;;
+lang)
+       update_langs
+       ;;
 "")
        clear
        svn info