[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     75c080f5bb346bf61d39614dac249fc4c8a1e38c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:48:04 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:12:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75c080f5

config_kernel(): rewrite --iscsi handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_configkernel.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 2bf0cc7..16662f6 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -236,10 +236,9 @@ config_kernel() {
        fi
 
        # Make sure iSCSI modules are enabled in the kernel, if --iscsi
-       # CONFIG_SCSI_ISCSI_ATTRS
-       # CONFIG_ISCSI_TCP
        if isTrue "${CMD_ISCSI}"
        then
+               print_info 1 "$(getIndent 1)>> Ensure that required kernel 
options for iSCSI support are set..."
                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
@@ -255,6 +254,17 @@ config_kernel() {
                        y|m) ;; # Do nothing
                        *) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting}
                esac
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y"
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INET" "y"
+
+               cfg_CONFIG_SCSI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_SCSI")
+               case "${cfg_CONFIG_SCSI}" in
+                       y|m) ;; # Do nothing
+                       *) cfg_CONFIG_SCSI=${newcfg_setting}
+               esac
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" 
"${cfg_CONFIG_SCSI}"
+               kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_SCSI_LOWLEVEL" "y"
+
                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}"
                kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" 
"CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"