Project

General

Profile

« Previous | Next » 

Revision e0b07f6f

Added by Renato Botelho almost 9 years ago

Use a single parameter to define -j parameter for build

View differences:

tools/builder_common.sh
326 326
	fi
327 327

  
328 328
	# Set default parameters
329
	export MAKE_ARGS="${MAKEJ_WORLD} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
329
	export MAKE_ARGS="${MAKEJ} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
330 330

  
331 331
	echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE}
332 332
	makeargs="${MAKE_ARGS}"
......
1678 1678
	echo ">>> KERNCONFDIR: ${KERNCONFDIR}"
1679 1679
	echo ">>> ARCH:        ${TARGET_ARCH}"
1680 1680

  
1681
	makeargs="${MAKEJ_KERNEL} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}"
1681
	makeargs="${MAKEJ} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}"
1682 1682
	echo ">>> Builder is running the command: script -aq $LOGFILE make $makeargs buildkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE
1683 1683
	(script -q $LOGFILE make -C ${FREEBSD_SRC_DIR} $makeargs buildkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>'
1684 1684
}
......
1696 1696
	fi
1697 1697

  
1698 1698
	mkdir -p ${STAGE_CHROOT_DIR}/boot
1699
	makeargs="${MAKEJ_KERNEL} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}"
1699
	makeargs="${MAKEJ} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}"
1700 1700
	echo ">>> Builder is running the command: script -aq $LOGFILE make ${makeargs} installkernel KERNCONF=${KERNCONF}"  | tee -a $LOGFILE
1701 1701
	(script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>'
1702 1702
	gzip -f9 $KERNEL_DESTDIR/boot/kernel/kernel
tools/builder_defaults.sh
181 181
	fi
182 182
fi
183 183

  
184
export MAKEJ_WORLD=${MAKEJ_WORLD:-"${_CPUS}"}
185
export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"${_CPUS}"}
184
export MAKEJ=${MAKEJ:-"${_CPUS}"}
186 185

  
187 186
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"}
188 187

  

Also available in: Unified diff