Attachment #366566 for bug #496512




		print_info 1 "kernel: --clean is disabled; not running 'make clean'."
	fi

	local add_config
	if isTrue ${MENUCONFIG}
	then
		add_config=menuconfig
	elif isTrue ${CMD_NCONFIG}
	then
		add_config=nconfig
	elif isTrue ${CMD_GCONFIG}
	then
		add_config=nconfig
	elif isTrue ${CMD_XCONFIG}
	then
		add_config=nconfig
		CMD_XCONFIG=0
	fi

	if [ x"${add_config}" != x"" ]
	then
		print_info 1 'kernel: >> Invoking ${add_config}...'
		compile_generic ${add_config} kernel
		[ "$?" ] || gen_die 'Error: ${add_config} failed!'
	fi

	# Force this on if we are using --genzimage




	set_config_with_override BOOL   SPLASH               CMD_SPLASH
	set_config_with_override BOOL   TUXONICE             CMD_TUXONICE             "no"
	set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
	set_config_with_override BOOL   CLEAN                CMD_CLEAN
	set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
	set_config_with_override BOOL   GCONFIG              CMD_GCONFIG
	set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG
	set_config_with_override BOOL   NCONFIG              CMD_NCONFIG
	set_config_with_override BOOL   XCONFIG              CMD_XCONFIG

	set_config_with_override STRING MINKERNPACKAGE       CMD_MINKERNPACKAGE
	set_config_with_override STRING MODULESPACKAGE       CMD_MODULESPACKAGE

Lines 14-22 Link Here

(-)a/genkernel.conf (+9 lines)
14	# Run 'make oldconfig' before compiling this kernel?	14	# Run 'make oldconfig' before compiling this kernel?
15	OLDCONFIG="yes"	15	OLDCONFIG="yes"
16		16
		17	# Run 'make gconfig' before compiling this kernel?
		18	GCONFIG="no"
		19
17	# Run 'make menuconfig' before compiling this kernel?	20	# Run 'make menuconfig' before compiling this kernel?
18	MENUCONFIG="no"	21	MENUCONFIG="no"
19		22
		23	# Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel?
		24	NCONFIG="no"
		25
		26	# Run 'make xconfig' before compiling this kernel?
		27	XCONFIG="no"
		28
20	# Run 'make clean' before compilation?	29	# Run 'make clean' before compilation?
21	# If set to NO, implies MRPROPER WILL NOT be run	30	# If set to NO, implies MRPROPER WILL NOT be run
22	# Also, if clean is NO, it won't copy over any configuration	31	# Also, if clean is NO, it won't copy over any configuration

Return to bug 496512

Lines 25-37 Link Here

(-)a/gen_cmdline.sh (-3 / +9 lines)
25	echo " Kernel Configuration settings"	25	echo " Kernel Configuration settings"
26	echo " --menuconfig Run menuconfig after oldconfig"	26	echo " --menuconfig Run menuconfig after oldconfig"
27	echo " --no-menuconfig Do not run menuconfig after oldconfig"	27	echo " --no-menuconfig Do not run menuconfig after oldconfig"
28	echo " --gconfig Run gconfig after oldconfig"	28	echo " --nconfig Run nconfig after oldconfig"
		29	echo " --no-nconfig Do not run nconfig after oldconfig"
		30	echo " --gconfig Run gconfig after oldconfig"
29	echo " --no-gconfig Don't run gconfig after oldconfig"	31	echo " --no-gconfig Don't run gconfig after oldconfig"
30	echo " --xconfig Run xconfig after oldconfig"	32	echo " --xconfig Run xconfig after oldconfig"
31	echo " --no-xconfig Don't run xconfig after oldconfig"	33	echo " --no-xconfig Don't run xconfig after oldconfig"
32	echo " --save-config Save the configuration to /etc/kernels"	34	echo " --save-config Save the configuration to /etc/kernels"
33	echo " --no-save-config Don't save the configuration to /etc/kernels"	35	echo " --no-save-config Don't save the configuration to /etc/kernels"
34	echo " --virtio Include VirtIO kernel code"	36	echo " --virtio Include VirtIO kernel code"
35	echo " Kernel Compile settings"	37	echo " Kernel Compile settings"
36	echo " --oldconfig Implies --no-clean and runs a 'make oldconfig'"	38	echo " --oldconfig Implies --no-clean and runs a 'make oldconfig'"
37	echo " --clean Run make clean before compilation"	39	echo " --clean Run make clean before compilation"
Lines 373-378 Link Here
373	CMD_MENUCONFIG=0	375	CMD_MENUCONFIG=0
374	print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"	376	print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
375	;;	377	;;
		378	--nconfig\|--no-nconfig)
		379	CMD_NCONFIG=`parse_optbool "$*"`
		380	print_info 2 "CMD_NCONFIG: ${CMD_NCONFIG}"
		381	;;
376	--gconfig\|--no-gconfig)	382	--gconfig\|--no-gconfig)
377	CMD_GCONFIG=`parse_optbool "$*"`	383	CMD_GCONFIG=`parse_optbool "$*"`
378	print_info 2 "CMD_GCONFIG: ${CMD_GCONFIG}"	384	print_info 2 "CMD_GCONFIG: ${CMD_GCONFIG}"

Lines 79-103 Link Here

(-)a/gen_configkernel.sh (-12 / +13 lines)
79	print_info 1 "kernel: --clean is disabled; not running 'make clean'."	79	print_info 1 "kernel: --clean is disabled; not running 'make clean'."
80	fi	80	fi
81		81
		82	local add_config
82	if isTrue ${MENUCONFIG}	83	if isTrue ${MENUCONFIG}
83	then	84	then
84	print_info 1 'kernel: >> Invoking menuconfig...'	85	add_config=menuconfig
85	compile_generic menuconfig kernelruntask	86	elif isTrue ${CMD_NCONFIG}
86	[ "$?" ] \|\| gen_die 'Error: menuconfig failed!'	87	then
		88	add_config=nconfig
87	elif isTrue ${CMD_GCONFIG}	89	elif isTrue ${CMD_GCONFIG}
88	then	90	then
89	print_info 1 'kernel: >> Invoking gconfig...'	91	add_config=nconfig
90	compile_generic gconfig kernel	92	elif isTrue ${CMD_XCONFIG}
91	[ "$?" ] \|\| gen_die 'Error: gconfig failed!'	93	then
92		94	add_config=nconfig
93	CMD_XCONFIG=0
94	fi	95	fi
95		96
96	if isTrue ${CMD_XCONFIG}	97	if [ x"${add_config}" != x"" ]
97	then	98	then
98	print_info 1 'kernel: >> Invoking xconfig...'	99	print_info 1 'kernel: >> Invoking ${add_config}...'
99	compile_generic xconfig kernel	100	compile_generic ${add_config} kernel
100	[ "$?" ] \|\| gen_die 'Error: xconfig failed!'	101	[ "$?" ] \|\| gen_die 'Error: ${add_config} failed!'
101	fi	102	fi
102		103
103	# Force this on if we are using --genzimage	104	# Force this on if we are using --genzimage

Lines 96-104 Link Here

(-)a/gen_determineargs.sh (-1 / +4 lines)
96	set_config_with_override BOOL SPLASH CMD_SPLASH	96	set_config_with_override BOOL SPLASH CMD_SPLASH
97	set_config_with_override BOOL TUXONICE CMD_TUXONICE "no"	97	set_config_with_override BOOL TUXONICE CMD_TUXONICE "no"
98	set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR	98	set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
		99	set_config_with_override BOOL CLEAN CMD_CLEAN
99	set_config_with_override BOOL MRPROPER CMD_MRPROPER	100	set_config_with_override BOOL MRPROPER CMD_MRPROPER
		101	set_config_with_override BOOL GCONFIG CMD_GCONFIG
100	set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG	102	set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG
101	set_config_with_override BOOL CLEAN CMD_CLEAN	103	set_config_with_override BOOL NCONFIG CMD_NCONFIG
		104	set_config_with_override BOOL XCONFIG CMD_XCONFIG
102		105
103	set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE	106	set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE
104	set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE	107	set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE