mISDN auch im Kernel auf Version 1.1.5 gebracht.

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

diff --git a/make.sh b/make.sh
index fc8e2a7800ca6db3ba48491bcadc79ed2e38bc6c..31e5fc013bcd8acb9b53003a7f4e061d17135114 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -82,11 +82,11 @@ prepareenv() {
     #                                                                          #
     ############################################################################
     if [ ! "$BASH" ]; then
-       exiterror "BASH environment variable is not set.  You're probably running the wrong shell."
+                       exiterror "BASH environment variable is not set.  You're probably running the wrong shell."
     fi
 
     if [ -z "${BASH_VERSION}" ]; then
-       exiterror "Not running BASH shell."
+                       exiterror "Not running BASH shell."
     fi
 
 
@@ -106,10 +106,10 @@ prepareenv() {
     echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE
     renice $NICE $$ > /dev/null
     if [ `nice` != "$NICE" ]; then
-       beautify message FAIL
-       exiterror "Failed to set correct nice level"
+                       beautify message FAIL
+                       exiterror "Failed to set correct nice level"
     else
-       beautify message DONE
+                       beautify message DONE
     fi
 
 
@@ -120,10 +120,10 @@ prepareenv() {
     ############################################################################
     echo -ne "Checking if we're running as root user" | tee -a $LOGFILE
     if [ `id -u` != 0 ]; then
-       beautify message FAIL
-       exiterror "Not building as root"
+                       beautify message FAIL
+                       exiterror "Not building as root"
     else
-       beautify message DONE
+                       beautify message DONE
     fi
 
 
@@ -136,13 +136,13 @@ prepareenv() {
     BASE_DEV=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'`
     BASE_ASPACE=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'`
     if (( 2048000 > $BASE_ASPACE )); then
-       BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
-       if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
-               beautify message FAIL
-               exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
-       fi
+                       BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
+                       if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
+                               beautify message FAIL
+                               exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
+                       fi
     else
-       beautify message DONE
+                       beautify message DONE
     fi
 
     ############################################################################
@@ -161,10 +161,10 @@ prepareenv() {
         rm -f /tools
     fi
     if [ ! -a /tools ]; then
-       ln -s $BASEDIR/build/tools /
+                       ln -s $BASEDIR/build/tools /
     fi
     if [ ! -h /tools ]; then
-       exiterror "Could not create /tools symbolic link."
+                       exiterror "Could not create /tools symbolic link."
     fi
 
     # Setup environment
@@ -389,13 +389,12 @@ buildipfire() {
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
-  ipfiremake squashfstools
   ipfiremake sysfsutils
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
-  ipfiremake GD
+  ipfiremake perl-GD
   ipfiremake GD-Graph
   ipfiremake GD-TextUtil
   ipfiremake gnupg
@@ -460,7 +459,7 @@ buildipfire() {
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
-  #ipfiremake snortsnarf
+  ipfiremake snortsnarf
   ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
@@ -471,7 +470,6 @@ buildipfire() {
   ipfiremake vlan
   ipfiremake wireless
   ipfiremake libsafe
-  ipfiremake 3c5x9setup
   ipfiremake pakfire
   ipfiremake java
   ipfiremake spandsp
@@ -497,18 +495,20 @@ buildipfire() {
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
-  ipfiremake stund
-  ipfiremake libpri
-# ipfiremake bristuff
-  ipfiremake asterisk
+  ipfiremake alsa
   ipfiremake mpg123
   ipfiremake mpfire
-  ipfiremake backup
+  ipfiremake guardian
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
+  ipfiremake mp3blaster
+  ipfiremake libpri
+  ipfiremake stund
+  ipfiremake asterisk
+  ipfiremake backup
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -533,8 +533,6 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake alsa
-  ipfiremake mp3blaster
   ipfiremake which
   ipfiremake lsof
 }
@@ -643,23 +641,27 @@ ipfirepackages() {
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrus-sasl
+  ipfiredist ethereal
 #  ipfiredist fetchmail
 #  ipfiredist gnump3d
+  ipfiredist guardian
   ipfiredist ipfireseeder
   ipfiredist java
   ipfiredist libogg
   ipfiredist libvorbis
-#  ipfiredist mailx
+  ipfiredist mailx
 #  ipfiredist mldonkey
   ipfiredist mp3blaster
   ipfiredist mpfire
   ipfiredist mpg123
 #  ipfiredist nfs
+  ipfiredist nmap
   ipfiredist openldap
 #  ipfiredist postfix
+  ipfiredist rsync
   ipfiredist rtorrent
   ipfiredist samba
-#  ipfiredist sox
+  ipfiredist sox
 #  ipfiredist spamassassin
   ipfiredist tripwire
   ipfiredist vsftpd