Attachment #172130 for bug #247246

View | Details | Raw Unified | Return to bug 247246
Collapse All | Expand All




	local target=${1}
	local argstype=${2}

	if [ "${argstype}" = 'kernel' ] || [ "${argstype}" = 'runtask' ] || [ "${argstype}" = 'kerneltask' ]
	then
		export_kernel_args
		MAKE=${KERNEL_MAKE}

		MAKE=${UTILS_MAKE}
	fi
	case "${argstype}" in
		kernel|kerneltask) ARGS="`compile_kernel_args`" ;;
		utils) ARGS="`compile_utils_args`" ;;
		*) ARGS="" ;; # includes runtask
	esac

	# the eval usage is needed in the next set of code
	# as ARGS can contain spaces and quotes, eg:
	# ARGS='CC="ccache gcc"'
	if [ "${argstype}" == 'runtask' ] || [ "${argstype}" == 'kerneltask' ]
	then
		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/-j1} ${ARGS} ${target} $*" 1 0 1
		eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*
		RET=$?
	elif [ "${LOGLEVEL}" -gt "1" ]


	unset MAKE
	unset ARGS
	if [ "${argstype}" = 'kernel' ] || [ "${argstype}" = 'kerneltask' ]
	then
		unset_kernel_args
	elif [ "${argstype}" = 'utils' ]

Lines 60-66 Link Here

(-)genkernel.orig/gen_configkernel.sh (-1 / +1 lines)
60	if isTrue ${MENUCONFIG}	60	if isTrue ${MENUCONFIG}
61	then	61	then
62	print_info 1 'config: >> Invoking menuconfig...'	62	print_info 1 'config: >> Invoking menuconfig...'
63	compile_generic menuconfig runtask	63	compile_generic menuconfig kerneltask
64	[ "$?" ] \|\| gen_die 'Error: menuconfig failed!'	64	[ "$?" ] \|\| gen_die 'Error: menuconfig failed!'
65	elif isTrue ${CMD_GCONFIG}	65	elif isTrue ${CMD_GCONFIG}
66	then	66	then

Return to bug 247246

Lines 221-227 Link Here

(-)genkernel.orig/gen_compile.sh (-5 / +5 lines)
221	local target=${1}	221	local target=${1}
222	local argstype=${2}	222	local argstype=${2}
223		223
224	if [ "${argstype}" = 'kernel' ] \|\| [ "${argstype}" = 'runtask' ]	224	if [ "${argstype}" = 'kernel' ] \|\| [ "${argstype}" = 'runtask' ] \|\| [ "${argstype}" = 'kerneltask' ]
225	then	225	then
226	export_kernel_args	226	export_kernel_args
227	MAKE=${KERNEL_MAKE}	227	MAKE=${KERNEL_MAKE}
Lines 231-237 Link Here
231	MAKE=${UTILS_MAKE}	231	MAKE=${UTILS_MAKE}
232	fi	232	fi
233	case "${argstype}" in	233	case "${argstype}" in
234	kernel) ARGS="`compile_kernel_args`" ;;	234	kernel\|kerneltask) ARGS="`compile_kernel_args`" ;;
235	utils) ARGS="`compile_utils_args`" ;;	235	utils) ARGS="`compile_utils_args`" ;;
236	*) ARGS="" ;; # includes runtask	236	*) ARGS="" ;; # includes runtask
237	esac	237	esac
Lines 240-248 Link Here
240	# the eval usage is needed in the next set of code	240	# the eval usage is needed in the next set of code
241	# as ARGS can contain spaces and quotes, eg:	241	# as ARGS can contain spaces and quotes, eg:
242	# ARGS='CC="ccache gcc"'	242	# ARGS='CC="ccache gcc"'
243	if [ "${argstype}" == 'runtask' ]	243	if [ "${argstype}" == 'runtask' ] \|\| [ "${argstype}" == 'kerneltask' ]
244	then	244	then
245	print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/j1} ${ARGS} ${target} $*" 1 0 1	245	print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/-j1} ${ARGS} ${target} $*" 1 0 1
246	eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*	246	eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*
247	RET=$?	247	RET=$?
248	elif [ "${LOGLEVEL}" -gt "1" ]	248	elif [ "${LOGLEVEL}" -gt "1" ]
Lines 262-268 Link Here
262		262
263	unset MAKE	263	unset MAKE
264	unset ARGS	264	unset ARGS
265	if [ "${argstype}" = 'kernel' ]	265	if [ "${argstype}" = 'kernel' ] \|\| [ "${argstype}" = 'kerneltask' ]
266	then	266	then
267	unset_kernel_args	267	unset_kernel_args
268	elif [ "${argstype}" = 'utils' ]	268	elif [ "${argstype}" = 'utils' ]