make.sh: Automatically determine parallelism flags.

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

diff --git a/make.sh b/make.sh
index 773718ab5a56dcb141fccc5477acb73351a069e2..fe3634f0bb19c0d795f863652e77d22a069f6c2b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -179,11 +179,12 @@ prepareenv() {
     set +h
     LC_ALL=POSIX
     if [ -z $MAKETUNING ]; then
-        if [ "${MACHINE:0:3}" = "arm" ]; then
-            MAKETUNING="-j2"
-        else
-            MAKETUNING="-j6"
-        fi
+       CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)"
+       if [ -z "${CPU_COUNT}" ]; then
+               CPU_COUNT=1
+       fi
+
+       MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))"
     fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@ -380,7 +381,6 @@ buildipfire() {
   ipfiremake rpi-firmware
   ipfiremake bc
   ipfiremake u-boot
-  ipfiremake u-boot-panda
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then
 
@@ -418,12 +418,9 @@ buildipfire() {
     ipfiremake cryptodev               KCFG="-rpi"
 #    ipfiremake compat-drivers         KCFG="-rpi"
 
-    # arm-omap (Panda Board) kernel build
-#    ipfiremake linux                  KCFG="-omap"
-#    ipfiremake v4l-dvb                        KCFG="-omap"
-#    ipfiremake mISDN                  KCFG="-omap" NOPCI=1
-#    ipfiremake cryptodev              KCFG="-omap"
-#    ipfiremake compat-drivers         KCFG="-omap"
+    # arm multi platform (Panda, Wandboard ...) kernel build
+    ipfiremake linux                   KCFG="-multi"
+    ipfiremake cryptodev               KCFG="-multi"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux                   KCFG="-kirkwood"
@@ -775,6 +772,7 @@ buildipfire() {
   ipfiremake arm
   ipfiremake wavemon
   ipfiremake iptraf-ng
+  ipfiremake iotop
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -804,7 +802,6 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake as86
-  ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
   installmake strip