diff options
| -rw-r--r-- | arch/mips/config.sh | 1 | ||||
| -rw-r--r-- | arch/sparc/config.sh | 2 | ||||
| -rw-r--r-- | arch/sparc64/config.sh | 2 | ||||
| -rwxr-xr-x | gen_cmdline.sh | 12 | ||||
| -rwxr-xr-x | gen_funcs.sh | 6 | ||||
| -rw-r--r-- | genkernel.conf | 2 |
6 files changed, 15 insertions, 10 deletions
diff --git a/arch/mips/config.sh b/arch/mips/config.sh index 8b8374ac..b258fb24 100644 --- a/arch/mips/config.sh +++ b/arch/mips/config.sh @@ -8,7 +8,6 @@ KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="./vmlinux" # Initrd/Initramfs Options -USECOLOR="yes" NOINITRDMODULES="yes" BUSYBOX=1 DMRAID=0 diff --git a/arch/sparc/config.sh b/arch/sparc/config.sh index 19c89acc..dbab06ff 100644 --- a/arch/sparc/config.sh +++ b/arch/sparc/config.sh @@ -7,4 +7,4 @@ KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinux" -USECOLOR="no" +NOCOLOR="true" diff --git a/arch/sparc64/config.sh b/arch/sparc64/config.sh index 620b03dd..8e828d24 100644 --- a/arch/sparc64/config.sh +++ b/arch/sparc64/config.sh @@ -7,4 +7,4 @@ KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="image" KERNEL_BINARY="arch/sparc64/boot/image arch/sparc/boot/image" -USECOLOR="no" +NOCOLOR="true" diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 038058f7..8e729feb 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -607,9 +607,15 @@ parse_cmdline() { print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}" ;; --color|--no-color) - USECOLOR=$(parse_optbool "$*") - print_info 2 "USECOLOR: ${USECOLOR}" - setColorVars + CMD_COLOR=$(parse_optbool "$*") + if isTrue "${CMD_COLOR}" + then + NOCOLOR=false + else + NOCOLOR=true + fi + print_info 2 "CMD_COLOR: ${CMD_COLOR}" + set_color_vars ;; --cleanup|--no-cleanup) CMD_CLEANUP=$(parse_optbool "$*") diff --git a/gen_funcs.sh b/gen_funcs.sh index 38a7a045..ed742d10 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -22,8 +22,8 @@ isTrue() { return 1 } -setColorVars() { - if isTrue "${USECOLOR}" +set_color_vars() { + if ! isTrue "${NOCOLOR}" then GOOD=$'\e[32;01m' WARN=$'\e[33;01m' @@ -40,7 +40,7 @@ setColorVars() { UNDER='' fi } -setColorVars +set_color_vars dump_debugcache() { TODEBUGCACHE=no diff --git a/genkernel.conf b/genkernel.conf index 9a5a8381..cd84e5c0 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -47,7 +47,7 @@ #SAVE_CONFIG="yes" # Enable color output in genkernel -USECOLOR="yes" +NOCOLOR="false" # Clear build cache dir on gernkernel start #CLEAR_CACHEDIR="no" |