From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B79B0139085 for ; Sun, 8 Jan 2017 01:57:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53D6821C06B; Sun, 8 Jan 2017 01:57:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CB4C21C03C for ; Sun, 8 Jan 2017 01:57:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13E60341586 for ; Sun, 8 Jan 2017 01:57:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3907B2625 for ; Sun, 8 Jan 2017 01:57:50 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1483840239.6421096929ebe8819fa0edeaa80d1496f802ff6f.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh gen_determineargs.sh gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6421096929ebe8819fa0edeaa80d1496f802ff6f X-VCS-Branch: master Date: Sun, 8 Jan 2017 01:57:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aba204aa-0c91-48d7-a410-f25fc2105eaf X-Archives-Hash: e28dfebe86c1965d5a1980720d9df011 commit: 6421096929ebe8819fa0edeaa80d1496f802ff6f Author: Tomasz Wasiak poczta onet pl> AuthorDate: Mon Dec 30 17:14:39 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jan 8 01:50:39 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64210969 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 gentoo.org> gen_configkernel.sh | 1 + gen_determineargs.sh | 2 +- gen_initramfs.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 515a541..e1a2749 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 09be5f3..cae8c66 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 e81b477..612ae86 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