diff options
| author |   Tomasz Wasiak <tjwasiak@poczta.onet.pl> | 2013-12-30 17:14:39 +0000 |
|---|---|---|
| committer |   Robin H. Johnson <robbat2@gentoo.org> | 2017-01-07 17:50:39 -0800 |
| commit | 6421096929ebe8819fa0edeaa80d1496f802ff6f (patch) | |
| tree | 448de04070565fb033bde2b35e59ece1abff46f2 | |
| parent | Real root mount flags verbosity (diff) | |
| download | genkernel-6421096929ebe8819fa0edeaa80d1496f802ff6f.tar.gz genkernel-6421096929ebe8819fa0edeaa80d1496f802ff6f.tar.bz2 genkernel-6421096929ebe8819fa0edeaa80d1496f802ff6f.zip | |
Minor fixes and enhmacements in splash support
1. Check for FB_CON_DECOR in kernel configuration [fix]
2. Additional check for framebuffer support in kernel
3. Make --no-splash|SPLASH="no" default
(minor cleanup to apply)
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=496512#c7
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rwxr-xr-x | gen_configkernel.sh | 1 | ||||
| -rwxr-xr-x | gen_determineargs.sh | 2 | ||||
| -rwxr-xr-x | gen_initramfs.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 515a541e..e1a27494 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -196,6 +196,7 @@ config_kernel() { if isTrue ${SPLASH} then kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_SPLASH" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FB_CON_DECOR" "y" fi # VirtIO diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 09be5f34..cae8c66f 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -94,7 +94,7 @@ determine_real_args() { set_config_with_override STRING KERNEL_OUTPUTDIR CMD_KERNEL_OUTPUTDIR "${KERNEL_DIR}" set_config_with_override STRING MODPROBEDIR CMD_MODPROBEDIR "/etc/modprobe.d" - set_config_with_override BOOL SPLASH CMD_SPLASH + set_config_with_override BOOL SPLASH CMD_SPLASH "no" set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR set_config_with_override BOOL MRPROPER CMD_MRPROPER set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG diff --git a/gen_initramfs.sh b/gen_initramfs.sh index e81b4775..612ae86e 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -565,7 +565,7 @@ append_linker() { append_splash(){ splash_geninitramfs=`which splash_geninitramfs 2>/dev/null` - if [ -x "${splash_geninitramfs}" ] + if [ -x "${splash_geninitramfs}" ] && grep -q -E '^CONFIG_FRAMEBUFFER_CONSOLE=[y|m]' ${KERNEL_CONFIG} then [ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash [ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default |