Merge remote-tracking branch 'origin/next' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 06:53:33 +0000 (07:53 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 06:53:33 +0000 (07:53 +0100)
1  2 
make.sh

diff --combined make.sh
+++ b/make.sh
@@@ -217,6 -217,12 +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 +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" \
@@@ -1061,29 -1067,29 +1067,29 @@@ buildipfire() 
    case "${BUILD_ARCH}" in
        x86_64)
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                lfsmake2 linux                  KCFG="-pae"
 -              lfsmake2 backports                      KCFG="-pae"
 -              lfsmake2 e1000e                 KCFG="-pae"
 -              lfsmake2 igb                            KCFG="-pae"
 -              lfsmake2 ixgbe                  KCFG="-pae"
 +#             lfsmake2 backports                      KCFG="-pae"
 +#             lfsmake2 e1000e                 KCFG="-pae"
 +#             lfsmake2 igb                            KCFG="-pae"
 +#             lfsmake2 ixgbe                  KCFG="-pae"
                lfsmake2 xtables-addons         KCFG="-pae"
                lfsmake2 linux-initrd                   KCFG="-pae"
  
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
@@@ -1526,7 -1532,8 +1532,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() {