Kernel-Update und umfassende Arbeiten daran.

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

diff --git a/make.sh b/make.sh
index 82b324b43a1b62476320dda49198830fb8e9cd1f..e27222d88ee4b3e0d742e61bc699355ad6641d07 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,8 @@ 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 ipp2p                     SMP=1
 #  ipfiremake 3cp4218          PASS=SMP
 #  ipfiremake amedyn                   PASS=SMP
 #  ipfiremake cxacru                   PASS=SMP
@@ -344,6 +343,7 @@ buildipfire() {
 #  ipfiremake promise-sata-300-tx      PASS=SMP
   ipfiremake zaptel                    PASS=S
   ipfiremake linux
+  ipfiremake ipp2p
 #  ipfiremake 3cp4218
 #  ipfiremake amedyn
 #  ipfiremake cxacru
@@ -411,6 +411,7 @@ buildipfire() {
   ipfiremake ibod
   ipfiremake initscripts
   ipfiremake iptables
+  ipfiremake ipp2p                     IPT=1
   ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -555,7 +556,6 @@ buildinstaller() {
   installmake gettext
   installmake kbd
   installmake popt
-  installmake kudzu
   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs
@@ -564,6 +564,7 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake pcmciautils
+  installmake kudzu
   installmake installer
   installmake scsi.img # this is to be deleted
   installmake driver.img       # this is to be deleted
@@ -598,7 +599,7 @@ buildpackages() {
   # Create images for install
   ipfiremake cdrom
   ipfiremake pxe
-  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -935,10 +936,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