Zwischencommit Installer.

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

diff --git a/make.sh b/make.sh
index 48940fb696c8ded75a86fe410675b5501f5dc2af..b5d65fec67980341a10027f5fa847da4b7aa6d76 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -135,11 +135,11 @@ prepareenv() {
     echo -ne "Checking for necessary space on disk $BASE_DEV" | tee -a $LOGFILE
     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 (( 2202000 > $BASE_ASPACE )); then
+    if (( 2048000 > $BASE_ASPACE )); then
        BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
-       if (( 2202000 - $BASE_USPACE > $BASE_ASPACE )); then
+       if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
                beautify message FAIL
-               exiterror "Not enough temporary space available, need at least 2.1GB on $BASE_DEV"
+               exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
        fi
     else
        beautify message DONE
@@ -325,7 +325,7 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux                     PASS=I
+#  ipfiremake linux                    PASS=I # Can we remove the installer kernel?
   ipfiremake linux                     PASS=S
 #  ipfiremake 3cp4218          PASS=SMP
 #  ipfiremake amedyn                   PASS=SMP
@@ -342,6 +342,7 @@ buildipfire() {
 #  ipfiremake pulsar                   PASS=SMP
 #  ipfiremake unicorn          PASS=SMP
 #  ipfiremake promise-sata-300-tx      PASS=SMP
+  ipfiremake zaptel                    PASS=S
   ipfiremake linux
 #  ipfiremake 3cp4218
 #  ipfiremake amedyn
@@ -360,6 +361,7 @@ buildipfire() {
 #  ipfiremake pulsar
 #  ipfiremake unicorn
 #  ipfiremake promise-sata-300-tx
+  ipfiremake zaptel
 #  ipfiremake pcmciautils
   ipfiremake expat
   ipfiremake gdbm
@@ -374,12 +376,13 @@ buildipfire() {
   ipfiremake lcms
   ipfiremake libmng
   ipfiremake freetype
+  ipfiremake libart
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
-# ipfiremake libcap
+  ipfiremake libcap
   ipfiremake pciutils
   ipfiremake libxml2
   ipfiremake BerkeleyDB
@@ -410,7 +413,7 @@ buildipfire() {
   ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
-#  ipfiremake iputils
+  ipfiremake iputils
   ipfiremake l7-protocols
 #  ipfiremake isapnptools # ERROR :(
 #  ipfiremake isdn4k-utils # What about mISDN???
@@ -421,9 +424,9 @@ buildipfire() {
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
-exit 1
   ipfiremake nash
   ipfiremake nasm
+### The Perl Modules have to be updated! I will skip this now!
   ipfiremake URI
   ipfiremake HTML-Tagset
   ipfiremake HTML-Parser
@@ -447,6 +450,7 @@ exit 1
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake GeoIP
+###
   ipfiremake fwhits
   ipfiremake noip_updater
   ipfiremake ntp
@@ -461,7 +465,7 @@ exit 1
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
-  ipfiremake tcpdump
+#  ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
   ipfiremake wireless
@@ -477,7 +481,6 @@ exit 1
   ipfiremake pkg-config
   ipfiremake glib
   ipfiremake pammysql
-  ipfiremake saslauthd PASS=2
   ipfiremake xinetd
   ipfiremake ghostscript
   ipfiremake cups
@@ -501,11 +504,10 @@ exit 1
   ipfiremake clamav
   ipfiremake razor
   ipfiremake spamassassin
-#  ipfiremake amavisd
+  ipfiremake amavisd
   ipfiremake stund
-  ipfiremake zaptel
   ipfiremake libpri
-  ipfiremake bristuff
+# ipfiremake bristuff
   ipfiremake asterisk
   ipfiremake mpg123
   ipfiremake libmad
@@ -543,14 +545,16 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake syslinux
-  ipfiremake as86
-  ipfiremake mbr
   ipfiremake uClibc
   installmake busybox
+  installmake udev
   installmake sysvinit
   installmake e2fsprogs
   installmake misc-progs
+exiterror STOP HERE!
+  ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   installmake slang
   installmake util-linux
   installmake newt
@@ -815,7 +819,7 @@ newpak)
        fi
        exit 0
        ;;
-prefetch)
+downloadsrc)
        if [ ! -d $BASEDIR/cache ]; then
                mkdir $BASEDIR/cache
        fi
@@ -1101,11 +1105,11 @@ watch)
 "")
        clear
        svn info
-       select name in "Exit" "IPFIRE: Prefetch" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help"
+       select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help"
        do
        case $name in
-       "IPFIRE: Prefetch")
-               $0 prefetch
+       "IPFIRE: Downloadsrc")
+               $0 downloadsrc
                ;;
        "IPFIRE: Build (silent)")
                $0 build-silent
@@ -1123,7 +1127,7 @@ watch)
                $0 svn update
                ;;
        "Help")
-               echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
+               echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}"
                cat doc/make.sh-usage
                ;;
        "LOG: Tail")
@@ -1136,7 +1140,7 @@ watch)
        done
        ;;
 *)
-       echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
+       echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}"
        cat doc/make.sh-usage
        ;;
 esac