linux-firmare: update to 5d98692

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

diff --git a/make.sh b/make.sh
index e3f32b73741f40927c0d6b8599bb090586093dbe..741b541f8851fc0ced8cf50a4dc5ee8921edb4ca 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -217,6 +217,12 @@ configure_build() {
                        parallelism=${cpu_max}
                fi
 
+               # limit to -j23 because perl will not build
+               # more
+               if [ ${parallelism} -gt 23 ]; then
+                       parallelism=23
+               fi
+
                MAKETUNING="-j${parallelism}"
        fi
 }
@@ -627,7 +633,7 @@ lfsmake2() {
        local PS1='\u:\w$ '
 
        enterchroot \
-               bash -x -c "cd /usr/src/lfs && \
+               ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
                        MAKETUNING=${MAKETUNING} \
                        make -f $* \
                        LFS_BASEDIR=/usr/src install" \
@@ -1036,9 +1042,7 @@ buildipfire() {
   lfsmake2 unzip
   lfsmake2 which
   lfsmake2 linux-firmware
-  lfsmake2 ath10k-firmware
   lfsmake2 dvb-firmwares
-  lfsmake2 mt7601u-firmware
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 bc
@@ -1526,7 +1530,8 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake1 strip
+  # use toolchain bash for chroot to strip
+  EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip
 }
 
 buildpackages() {