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 CBD7D138335 for ; Tue, 26 Mar 2019 08:07:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 942C7E0886; Tue, 26 Mar 2019 08:07:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69293E0864 for ; Tue, 26 Mar 2019 08:07:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 212B8335CF3 for ; Tue, 26 Mar 2019 08:07:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 841A757E for ; Tue, 26 Mar 2019 08:07:13 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1553584325.ea29977b438633337a5ef69d8be318c038fd96b6.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: ea29977b438633337a5ef69d8be318c038fd96b6 X-VCS-Branch: master Date: Tue, 26 Mar 2019 08:07:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1457cd94-a629-47c0-abb3-5cdabd73dc1f X-Archives-Hash: 9a8af56e77ef44e6c75d40316caa44cc commit: ea29977b438633337a5ef69d8be318c038fd96b6 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 26 03:39:06 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 26 07:12:05 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ea29977b config_kernel(): rewrite --genzimage handling Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index b115344..a8627b4 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -127,8 +127,24 @@ config_kernel() { # Force this on if we are using --genzimage if isTrue "${CMD_GENZIMAGE}" then + print_info 1 "$(getIndent 1)>> Ensure that required kernel options for --genzimage are set..." # Make sure Ext2 support is on... - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" + cfg_CONFIG_EXT2_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS") + if ! isTrue "${cfg_CONFIG_EXT2_FS}" + then + cfg_CONFIG_EXT4_USE_FOR_EXT2=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2") + if ! isTrue "${cfg_CONFIG_EXT4_USE_FOR_EXT2}" + then + cfg_CONFIG_EXT4_FS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_FS") + if isTrue "${cfg_CONFIG_EXT4_FS}" + then + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT4_USE_FOR_EXT2" "y" + else + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y" + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" + fi + fi + fi fi # Do we support modules at all?