Zum Test alle Kernelmodule in das Installationssystem getan.

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

diff --git a/make.sh b/make.sh
index f1ab85601379b44b28150eea44942986161c0093..1d36d55b78a1b8f3aad9018e68ab2d2560b603b0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0t4"                                                                        # Version number
+VERSION="2.0t5"                                                                        # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -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
@@ -333,7 +333,7 @@ buildipfire() {
   ipfiremake fcdslsl           SMP=1
   ipfiremake fcdslusb          SMP=1
   ipfiremake fcdslslusb        SMP=1
-#  ipfiremake promise-sata-300-tx      SMP=1
+  ipfiremake r8169                     SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
   ipfiremake linux
@@ -343,7 +343,7 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-#  ipfiremake promise-sata-300-tx
+  ipfiremake r8169
   ipfiremake zaptel
   ipfiremake fuse
   ipfiremake pkg-config
@@ -388,6 +388,7 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
+  ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake sysfsutils
   ipfiremake ntfs-3g
@@ -412,14 +413,13 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-  ipfiremake isdn4k-utils
   ipfiremake mISDN
+  ipfiremake isdn4k-utils
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
-  ipfiremake mtools
   ipfiremake nano
   ipfiremake nasm
   ipfiremake URI
@@ -504,6 +504,9 @@ buildipfire() {
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
+  ipfiremake libshout
+  ipfiremake icecast
+  ipfiremake ices
   ipfiremake mp3blaster
   ipfiremake libpri
   ipfiremake stund
@@ -634,35 +637,9 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  ipfiredist alsa
-#  ipfiredist amavisd
-  ipfiredist applejuice
-#  ipfiredist asterisk
-  ipfiredist clamav
-  ipfiredist cups
-  ipfiredist cyrus-sasl
-#  ipfiredist fetchmail
-#  ipfiredist gnump3d
-  ipfiredist guardian
-  ipfiredist ipfireseeder
-  ipfiredist java
-  ipfiredist libogg
-  ipfiredist libvorbis
-#  ipfiredist mailx
-#  ipfiredist mldonkey
-  ipfiredist mp3blaster
-  ipfiredist mpfire
-  ipfiredist mpg123
-#  ipfiredist nfs
-  ipfiredist openldap
-#  ipfiredist postfix
-  ipfiredist rtorrent
-  ipfiredist samba
-#  ipfiredist sox
-#  ipfiredist spamassassin
-  ipfiredist tripwire
-  ipfiredist vsftpd
-#  ipfiredist webcyradm
+       for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
+               [ -e $BASEDIR/lfs/$i ] && ipfiredist $i
+       done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*