PXE Boot integriert.

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

diff --git a/make.sh b/make.sh
index 9e48e82ca2c043d8eba52eda7ceaaa1b13d75e84..1a66343bd25cb54a581477979542815b96bd053b 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                          # Software name
 SNAME="ipfire"                 # Short name
 VERSION="2.0b"                 # Version number
-SLOGAN="www.ipfire.eu"         # Software slogan
+SLOGAN="www.ipfire.org"                # Software slogan
 CONFIG_ROOT=/var/ipfire                # Configuration rootdir
 NICE=10                                # Nice level
 MAX_RETRIES=1                          # prefetch/check loop
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j4"
+    MAKETUNING="-j8"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -401,6 +401,7 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
+  ipfiremake reiserfsprogs
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
@@ -417,7 +418,7 @@ buildipfire() {
   ipfiremake l7-protocols
 #  ipfiremake isapnptools # ERROR :(
 #  ipfiremake isdn4k-utils # What about mISDN???
-#  ipfiremake kudzu # ERROR :(
+  ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake mingetty
@@ -550,16 +551,20 @@ buildinstaller() {
   installmake busybox
   installmake udev
   installmake sysvinit
+  installmake gettext
   installmake e2fsprogs
   installmake misc-progs
   installmake sysfsutils
 #  installmake hwinfo
   installmake slang
   installmake util-linux
+  installmake reiserfsprogs
   installmake newt
   installmake pciutils
   installmake pcmciautils
   installmake kbd
+  installmake popt
+  installmake kudzu
   installmake installer
   installmake scsi.img
   installmake driver.img
@@ -573,32 +578,8 @@ buildpackages() {
   LOGFILE="$BASEDIR/log/_build.packages.log"
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
-  # Strip files
-  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
-  # add -ls before -exec if you want to verify what files are stripped
 
-  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
-
-#   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
+  installmake strip
   
   # Generating list of packages used
   echo -n "Generating packages list from logs" | tee -a $LOGFILE
@@ -615,12 +596,12 @@ buildpackages() {
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
 
-  # Create ISO for CDROM
+  # Create images for install
+  ipfiremake pxe
   ipfiremake cdrom
-  rm -f $LFS/install/images/*usb*
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
-  ipfirepackages
+#  ipfirepackages
 
   # Cleanup
   stdumount
@@ -1013,7 +994,7 @@ uploadsrc)
                grep -q $i /var/tmp/ftplist
                if [ "$?" -ne "0" ]; then
                        echo -ne "$i"
-                       ncftpput -bb -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT $IPFIRE_FTP_URL_INT $IPFIRE_FTP_PATH_INT/ $i > /dev/null 2>&1
+                       ncftpput -bb -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT $IPFIRE_FTP_URL_INT $IPFIRE_FTP_PATH_INT/ $i >> $BASEDIR/log/_build.uploadsrc.log 2>&1
                        if [ "$?" -eq "0" ]; then
                                beautify message DONE
                        else