Patch-O-Matic in den Kernel eingebaut.

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

diff --git a/make.sh b/make.sh
index 78c5d01e8aeafa7e9b8f46871ca7ce67a6a3c57c..fdd425d4afc4abe2f04c23a8b31364e2064932fe 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j8"
+    MAKETUNING="-j12"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -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,7 @@ 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 3cp4218          PASS=SMP
 #  ipfiremake amedyn                   PASS=SMP
 #  ipfiremake cxacru                   PASS=SMP
@@ -550,60 +548,35 @@ buildinstaller() {
   ipfiremake uClibc
   installmake busybox
   installmake udev
-  installmake sysvinit
+  installmake slang
+  installmake newt
   installmake gettext
-  installmake e2fsprogs
+  installmake kbd
+  installmake popt
+  installmake sysvinit
   installmake misc-progs
+  installmake e2fsprogs
+  installmake reiserfsprogs
   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
+  installmake scsi.img # this is to be deleted
+  installmake driver.img       # this is to be deleted
   installmake initrd
-  installmake boot.img
-#  ipfiremake as86
-#  ipfiremake mbr
+  installmake boot.img # this is to be deleted
+#  ipfiremake as86             # this is to be deleted
+#  ipfiremake mbr              # this is to be deleted
 }
 
 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
@@ -620,10 +593,10 @@ buildpackages() {
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
 
-  # Create ISO for CDROM
+  # Create images for install
   ipfiremake cdrom
-  rm -f $LFS/install/images/*usb*
-  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  ipfiremake pxe
+  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -960,10 +933,9 @@ svn)
                clear
                if [ -f /usr/bin/mcedit ]; then
                        export EDITOR=/usr/bin/mcedit
-               else
-                       if [ -f /usr/bin/nano ]; then
-                               export EDITOR=/usr/bin/nano
-                       fi
+               fi
+               if [ -f /usr/bin/nano ]; then
+                       export EDITOR=/usr/bin/nano
                fi
                echo -ne "Selecting editor $EDITOR..."
                beautify message DONE
@@ -1107,6 +1079,20 @@ batch)
 watch)
        watch_screen
        ;;
+pxe)
+       case "$2" in
+         start)
+               start_tftpd
+               ;;
+         stop)
+               stop_tftpd
+               ;;
+         reload)
+               reload_tftpd
+               ;;              
+       esac
+       exit 0
+       ;;
 "")
        clear
        svn info