commit: fed47394442b82575d0397af560273a45a4c4724 Author: Tomasz Wasiak <tjwasiak <AT> poczta <DOT> onet <DOT> pl> AuthorDate: Mon Dec 30 17:06:29 2013 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Sun Jan 8 01:50:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fed47394
Kernel nconfig support Support for nconfig kernel configuration target. Minor fixes in [g|x]config support. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c2 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> gen_configkernel.sh | 29 ++++++++++++----------------- gen_determineargs.sh | 2 ++ genkernel.conf | 8 ++++---- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 8d53d20..515a541 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -91,30 +91,25 @@ config_kernel() { print_info 1 "kernel: --clean is disabled; not running 'make clean'." fi + local add_config if isTrue ${MENUCONFIG} then - print_info 1 'kernel: >> Invoking menuconfig...' - compile_generic menuconfig kernelruntask - [ "$?" ] || gen_die 'Error: menuconfig failed!' - elif isTrue ${NCONFIG} + add_config=menuconfig + elif isTrue ${CMD_NCONFIG} then - print_info 1 'kernel: >> Invoking nconfig...' - compile_generic nconfig kernelruntask - [ "$?" ] || gen_die 'Error: nconfig failed!' + add_config=nconfig elif isTrue ${CMD_GCONFIG} then - print_info 1 'kernel: >> Invoking gconfig...' - compile_generic gconfig kernel - [ "$?" ] || gen_die 'Error: gconfig failed!' - - CMD_XCONFIG=0 + add_config=gconfig + elif isTrue ${CMD_XCONFIG} + then + add_config=xconfig fi - if isTrue ${CMD_XCONFIG} - then - print_info 1 'kernel: >> Invoking xconfig...' - compile_generic xconfig kernel - [ "$?" ] || gen_die 'Error: xconfig failed!' + if [ x"${add_config}" != x"" ] + print_info 1 "kernel: >> Invoking ${add_config}..." + compile_generic $add_config kernelruntask + [ "$?" ] || gen_die "Error: ${add_config} failed!" fi # Force this on if we are using --genzimage diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 5f77c07..09be5f3 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -98,7 +98,9 @@ determine_real_args() { set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR set_config_with_override BOOL MRPROPER CMD_MRPROPER set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG + set_config_with_override BOOL GCONFIG CMD_GCONFIG set_config_with_override BOOL NCONFIG CMD_NCONFIG + set_config_with_override BOOL XCONFIG CMD_XCONFIG set_config_with_override BOOL CLEAN CMD_CLEAN set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE diff --git a/genkernel.conf b/genkernel.conf index d8f4ede..85a1763 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -16,12 +16,12 @@ OLDCONFIG="yes" # Run 'make menuconfig' before compiling this kernel? MENUCONFIG="no" - +# Run 'make gconfig' before compiling this kernel? +GCONFIG="no" # Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel? NCONFIG="no" - -# Note, that two previous lines are mutual exclusive (logically), while -# MENUCONFIG has a higher priority if both them is enabled. +# Run 'make xconfig' before compiling this kernel? +XCONFIG="no" # Run 'make clean' before compilation? # If set to NO, implies MRPROPER WILL NOT be run
