* Clamav, Samba und MC Update.

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

diff --git a/make.sh b/make.sh
index 8dd989ca1902ef22ab50658cdc3107305382acd6..eed5af188e345bfbe5b70366df97fc9ac61f35bf 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -280,6 +280,7 @@ buildbase() {
     lfsmake2 bzip2
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
+    lfsmake2 ed
     lfsmake2 file
     lfsmake2 findutils
     lfsmake2 flex
@@ -297,6 +298,7 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 modutils
+    lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
     lfsmake2 shadow
@@ -312,9 +314,6 @@ buildbase() {
 buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
-  ipfiremake inetutils
-  ipfiremake net-tools
-  ipfiremake ed
   ipfiremake configroot
   ipfiremake dhcp
   ipfiremake dhcpcd
@@ -325,8 +324,8 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-#  ipfiremake linux                    PASS=I # Can we remove the installer kernel?
-  ipfiremake linux                     PASS=S
+  ipfiremake linux                     SMP=1
+  ipfiremake ipp2p                     SMP=1
 #  ipfiremake 3cp4218          PASS=SMP
 #  ipfiremake amedyn                   PASS=SMP
 #  ipfiremake cxacru                   PASS=SMP
@@ -344,6 +343,7 @@ buildipfire() {
 #  ipfiremake promise-sata-300-tx      PASS=SMP
   ipfiremake zaptel                    PASS=S
   ipfiremake linux
+  ipfiremake ipp2p
 #  ipfiremake 3cp4218
 #  ipfiremake amedyn
 #  ipfiremake cxacru
@@ -411,6 +411,7 @@ buildipfire() {
   ipfiremake ibod
   ipfiremake initscripts
   ipfiremake iptables
+  ipfiremake ipp2p                     IPT=1
   ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -547,7 +548,14 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
-  ipfiremake uClibc
+  ipfiremake memtest
+  installmake linux-libc-header
+  installmake binutils
+  ipfiremake uClibc                    PASS=1
+  ipfiremake gcc                       INST=1
+  installmake uClibc                   PASS=2
+  installmake gcc                      INST=2
+  installmake uClibc                   PASS=3
   installmake busybox
   installmake udev
   installmake slang
@@ -564,6 +572,7 @@ buildinstaller() {
   installmake pciutils
   installmake pcmciautils
   installmake kudzu
+#  installmake bootsplash
   installmake installer
   installmake scsi.img # this is to be deleted
   installmake driver.img       # this is to be deleted
@@ -607,7 +616,7 @@ buildpackages() {
   rm -rf $BASEDIR/build/tmp/*
 
   # Generating total list of files
-  echo "`date -u '+%b %e %T'`: Generating files list from logs" | tee -a $LOGFILE
+  echo "Generating files list from logs" | tee -a $LOGFILE
   rm -f $BASEDIR/log/FILES
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
        if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
@@ -696,11 +705,14 @@ build)
                prepareenv
        fi
 
-       beautify build_stage "Building base"
+       beautify build_start
+       beautify build_stage_start "Building base"
        buildbase
+       beautify build_stage_end
 
-       beautify build_stage "Building IPFire"
+       beautify build_stage_start "Building IPFire"
        buildipfire
+       beautify build_stage_end
 
        # Setzen des IPFire Builds
        if [ "$FIREBUILD" ]; then
@@ -709,11 +721,14 @@ build)
                echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
        fi
 
-       beautify build_stage "Building installer"
+       beautify build_stage_start "Building installer"
        buildinstaller
+       beautify build_stage_end
 
-       beautify build_stage "Building packages"
+       beautify build_stage_start "Building packages"
        buildpackages
+       beautify build_stage_end
+       beautify build_end
        ;;
 shell)
        # enter a shell inside LFS chroot