diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-27 12:55:49 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-27 12:55:49 -0300 |
| commit | e0b07f6fa76917ee536f4a85396eabe5f2ec6b9a (patch) | |
| tree | 26eb9e5c155d3a9667ba1e7eb37bdb465ebd8dcf /tools | |
| parent | 41b0ac1b93c7969a7b69df4d958f2b3dc5165518 (diff) | |
| download | pfsense-e0b07f6fa76917ee536f4a85396eabe5f2ec6b9a.zip pfsense-e0b07f6fa76917ee536f4a85396eabe5f2ec6b9a.tar.gz | |
Use a single parameter to define -j parameter for build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 6 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index d8660a2..f2d9b7c 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -326,7 +326,7 @@ make_world() { fi # Set default parameters - export MAKE_ARGS="${MAKEJ_WORLD} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" + export MAKE_ARGS="${MAKEJ} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} makeargs="${MAKE_ARGS}" @@ -1678,7 +1678,7 @@ buildkernel() { echo ">>> KERNCONFDIR: ${KERNCONFDIR}" echo ">>> ARCH: ${TARGET_ARCH}" - makeargs="${MAKEJ_KERNEL} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" + makeargs="${MAKEJ} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" echo ">>> Builder is running the command: script -aq $LOGFILE make $makeargs buildkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE (script -q $LOGFILE make -C ${FREEBSD_SRC_DIR} $makeargs buildkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' } @@ -1696,7 +1696,7 @@ installkernel() { fi mkdir -p ${STAGE_CHROOT_DIR}/boot - makeargs="${MAKEJ_KERNEL} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}" + makeargs="${MAKEJ} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}" echo ">>> Builder is running the command: script -aq $LOGFILE make ${makeargs} installkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' gzip -f9 $KERNEL_DESTDIR/boot/kernel/kernel diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 6e96e1b..56a3345 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -181,8 +181,7 @@ if [ -z "${NO_MAKEJ}" ]; then fi fi -export MAKEJ_WORLD=${MAKEJ_WORLD:-"${_CPUS}"} -export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"${_CPUS}"} +export MAKEJ=${MAKEJ:-"${_CPUS}"} export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ix ixv"} |
