Nagios rausgeschmissen...

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

diff --git a/make.sh b/make.sh
index 341ab387480b4de681764a9b6d4ba1112fa6f332..143f4f7f544f55dfb042e2fd47368d817274d73f 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-IPFVER="full"                          # Which versions should be compiled? (full|light|voice|devel)
+IPFVER="full"                          # Which versions should be compiled? (full|light|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    MAKETUNING="-j4"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -446,9 +446,6 @@ buildipfire() {
   ipfiremake Locale-Country
   ipfiremake XML-Parser
   ipfiremake glib
-  ipfiremake dbus
-  ipfiremake hal
-  ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
@@ -533,9 +530,7 @@ buildipfire() {
   ipfiremake etherwake
   ipfiremake ethereal
   ipfiremake tftp-hpa
-  ipfiremake iptraf
   ipfiremake bwm-ng
-  ipfiremake nagios
   ipfiremake tripwire
   ipfiremake sysstat
 }
@@ -573,11 +568,7 @@ buildinstaller() {
   installmake pciutils
   installmake zlib
   installmake wget
-  installmake libxml2
-  installmake dbus
-  installmake hal
   installmake hwdata
-  installmake hwinfo
   installmake kudzu
   installmake installer
   installmake initrd