Buildfixes...

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

diff --git a/make.sh b/make.sh
index 48940fb696c8ded75a86fe410675b5501f5dc2af..727989613c1f4ea729bfd1fc9c630b38a29041d8 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,34 +545,37 @@ 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
+  installmake sysfsutils
+#  installmake hwinfo
   installmake slang
   installmake util-linux
   installmake newt
   installmake pciutils
-  installmake pcmcia-cs
-  installmake kbd
+  installmake pcmciautils
   installmake installer
   installmake scsi.img
   installmake driver.img
   installmake initrd
   installmake boot.img
+  installmake kbd
+# exiterror STOP HERE!
+#  ipfiremake syslinux
+#  ipfiremake as86
+#  ipfiremake mbr
 }
 
 buildpackages() {
   LOGFILE="$BASEDIR/log/_build.packages.log"
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
-  echo -ne "`date -u '+%b %e %T'`: Stage5 packages build \n" | tee -a $LOGFILE
   # Strip files
-  echo "`date -u '+%b %e %T'`: Stripping files" | tee -a $LOGFILE
+  echo -n "Stripping files" | tee -a $LOGFILE
   find $LFS/lib $LFS/usr/lib $LFS/usr/share/rrdtool-* $LFS/install ! -type l \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
        ! -name 'libc.so' ! -name 'libpthread.so' ! -name 'libcrypto.so.0.9.7.sha1' \
         -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
@@ -579,26 +584,25 @@ buildpackages() {
   find $LFS/{,s}bin $LFS/usr/{,s}bin $LFS/usr/local/{,s}bin ! -type l \
        -exec file {} \; | grep " ELF " | cut -f1 -d ':' | xargs $LFS/tools/bin/strip --strip-all >> $LOGFILE 2>&1
   # there add -v to strip to verify
+  beautify message DONE
 
-  if [ 'i386' = $MACHINE ]; then
-       # Create fcdsl packages
-       echo "`date -u '+%b %e %T'`: Building fcdsl tgz" | tee -a $LOGFILE
-       cp $LFS/install/images/fcdsl/license.txt $LFS  >> $LOGFILE 2>&1
-       touch $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
-       cd $LFS && tar cvfz $LFS/install/images/$SNAME-fcdsl-$VERSION.$MACHINE.tgz \
-               lib/modules/$KVER/misc/fcdsl*.o.gz \
-               lib/modules/$KVER-smp/misc/fcdsl*.o.gz \
-               usr/lib/isdn/{fds?base.bin,fd?ubase.frm} \
-               etc/fcdsl/fcdsl*.conf \
-               etc/drdsl/{drdsl,drdsl.ini} \
-               license.txt \
-               var/run/{need-depmod-$KVER,need-depmod-$KVER-smp} >> $LOGFILE 2>&1
-       rm -f $LFS/license.txt >> $LOGFILE 2>&1
-       cd $BASEDIR
-  fi
+#   Create fcdsl packages
+#  echo "`date -u '+%b %e %T'`: Building fcdsl tgz" | tee -a $LOGFILE
+#  cp $LFS/install/images/fcdsl/license.txt $LFS  >> $LOGFILE 2>&1
+#  touch $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
+#  cd $LFS && tar cvfz $LFS/install/images/$SNAME-fcdsl-$VERSION.$MACHINE.tgz \
+#      lib/modules/$KVER/misc/fcdsl*.o.gz \
+#      lib/modules/$KVER-smp/misc/fcdsl*.o.gz \
+#      usr/lib/isdn/{fds?base.bin,fd?ubase.frm} \
+#      etc/fcdsl/fcdsl*.conf \
+#      etc/drdsl/{drdsl,drdsl.ini} \
+#      license.txt \
+#      var/run/{need-depmod-$KVER,need-depmod-$KVER-smp} >> $LOGFILE 2>&1
+#  rm -f $LFS/license.txt >> $LOGFILE 2>&1
+#  cd $BASEDIR
   
   # Generating list of packages used
-  echo "`date -u '+%b %e %T'`: Generating packages list from logs" | tee -a $LOGFILE
+  echo -n "Generating packages list from logs" | tee -a $LOGFILE
   rm -f $BASEDIR/doc/packages-list
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
        if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
@@ -606,10 +610,11 @@ buildpackages() {
        fi
   done
   echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$' \
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$' \
        $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
+  beautify message DONE
 
   # Create ISO for CDROM
   ipfiremake cdrom
@@ -815,7 +820,7 @@ newpak)
        fi
        exit 0
        ;;
-prefetch)
+downloadsrc)
        if [ ! -d $BASEDIR/cache ]; then
                mkdir $BASEDIR/cache
        fi
@@ -1101,11 +1106,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 +1128,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 +1141,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