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 DBD181396D9 for ; Tue, 31 Oct 2017 18:59:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D1DBE0EDE; Tue, 31 Oct 2017 18:59:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D23DFE0EDD for ; Tue, 31 Oct 2017 18:59:22 +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 9DFAD3416CC for ; Tue, 31 Oct 2017 18:59:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4003A12F for ; Tue, 31 Oct 2017 18:59:20 +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: <1509474736.7e7984bf05103fe1cf13c76327636893ccd051a7.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 7e7984bf05103fe1cf13c76327636893ccd051a7 X-VCS-Branch: master Date: Tue, 31 Oct 2017 18:59:20 +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: 2ffd09e9-0e91-4893-b031-0f08207e552d X-Archives-Hash: baea99d0c3d7e8b5b7accc7c7d9a888e commit: 7e7984bf05103fe1cf13c76327636893ccd051a7 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Oct 31 18:32:16 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Oct 31 18:32:16 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e7984bf gen_configkernel: if building non-modular, have to set =y not =m. Signed-off-by: Robin H. Johnson gentoo.org> gen_configkernel.sh | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 68c116f..476a883 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -120,11 +120,21 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" fi + # Do we support modules at all? + cfg_CONFIG_MODULES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULES") + if isTrue "$cfg_CONFIG_MODULES" ; then + # yes, we support modules, set 'm' for new stuff. + newcfg_setting='m' + else + # no, we support modules, set 'y' for new stuff. + newcfg_setting='y' + fi + # If the user has configured DM as built-in, we need to respect that. cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM") case "$cfg_CONFIG_BLK_DEV_DM" in y|m) ;; # Do nothing - *) cfg_CONFIG_BLK_DEV_DM='m' + *) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting} esac # Make sure lvm modules are on if --lvm @@ -133,12 +143,12 @@ config_kernel() { cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT") case "$cfg_CONFIG_DM_SNAPSHOT" in y|m) ;; # Do nothing - *) cfg_CONFIG_DM_SNAPSHOT='m' + *) cfg_CONFIG_DM_SNAPSHOT=${newcfg_setting} esac cfg_CONFIG_DM_MIRROR=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR") case "$cfg_CONFIG_DM_MIRROR" in y|m) ;; # Do nothing - *) cfg_CONFIG_DM_MIRROR='m' + *) cfg_CONFIG_DM_MIRROR=${newcfg_setting} esac kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}" @@ -151,12 +161,12 @@ config_kernel() { cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH") case "$cfg_CONFIG_DM_MULTIPATH" in y|m) ;; # Do nothing - *) cfg_CONFIG_DM_MULTIPATH='m' + *) cfg_CONFIG_DM_MULTIPATH=${newcfg_setting} esac cfg_CONFIG_DM_MULTIPATH_RDAC=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC") case "$cfg_CONFIG_DM_MULTIPATH_RDAC" in y|m) ;; # Do nothing - *) cfg_CONFIG_DM_MULTIPATH_RDAC='m' + *) cfg_CONFIG_DM_MULTIPATH_RDAC=${newcfg_setting} esac kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}" @@ -177,17 +187,17 @@ config_kernel() { cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS") case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in y|m) ;; # Do nothing - *) cfg_CONFIG_ISCSI_BOOT_SYSFS='m' + *) cfg_CONFIG_ISCSI_BOOT_SYSFS=${newcfg_setting} esac cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP") case "$cfg_CONFIG_ISCSI_TCP" in y|m) ;; # Do nothing - *) cfg_CONFIG_ISCSI_TCP='m' + *) cfg_CONFIG_ISCSI_TCP=${newcfg_setting} esac cfg_CONFIG_SCSI_ISCSI_ATTRS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS") case "$cfg_CONFIG_SCSI_ISCSI_ATTRS" in y|m) ;; # Do nothing - *) cfg_CONFIG_SCSI_ISCSI_ATTRS='m' + *) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting} esac kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"