Buildfixes...

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

diff --git a/make.sh b/make.sh
index 655a00c267d93b9ea166e6c1f23c4b35ec7d6430..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 (( 5242880 > $BASE_ASPACE )); then
+    if (( 2048000 > $BASE_ASPACE )); then
        BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
-       if (( 5242880 - $BASE_USPACE > $BASE_ASPACE )); then
+       if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
                beautify message FAIL
-               exiterror "Not enough temporary space available, need at least 5GB on $BASE_DEV"
+               exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
        fi
     else
        beautify message DONE
@@ -545,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
@@ -581,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
@@ -608,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