| 1 |
commit: 75c080f5bb346bf61d39614dac249fc4c8a1e38c |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 26 03:48:04 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 26 07:12:06 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=75c080f5 |
| 7 |
|
| 8 |
config_kernel(): rewrite --iscsi handling |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gen_configkernel.sh | 14 ++++++++++++-- |
| 13 |
1 file changed, 12 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gen_configkernel.sh b/gen_configkernel.sh |
| 16 |
index 2bf0cc7..16662f6 100755 |
| 17 |
--- a/gen_configkernel.sh |
| 18 |
+++ b/gen_configkernel.sh |
| 19 |
@@ -236,10 +236,9 @@ config_kernel() { |
| 20 |
fi |
| 21 |
|
| 22 |
# Make sure iSCSI modules are enabled in the kernel, if --iscsi |
| 23 |
- # CONFIG_SCSI_ISCSI_ATTRS |
| 24 |
- # CONFIG_ISCSI_TCP |
| 25 |
if isTrue "${CMD_ISCSI}" |
| 26 |
then |
| 27 |
+ print_info 1 "$(getIndent 1)>> Ensure that required kernel options for iSCSI support are set..." |
| 28 |
cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS") |
| 29 |
case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in |
| 30 |
y|m) ;; # Do nothing |
| 31 |
@@ -255,6 +254,17 @@ config_kernel() { |
| 32 |
y|m) ;; # Do nothing |
| 33 |
*) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting} |
| 34 |
esac |
| 35 |
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET" "y" |
| 36 |
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INET" "y" |
| 37 |
+ |
| 38 |
+ cfg_CONFIG_SCSI=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI") |
| 39 |
+ case "${cfg_CONFIG_SCSI}" in |
| 40 |
+ y|m) ;; # Do nothing |
| 41 |
+ *) cfg_CONFIG_SCSI=${newcfg_setting} |
| 42 |
+ esac |
| 43 |
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI" "${cfg_CONFIG_SCSI}" |
| 44 |
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_LOWLEVEL" "y" |
| 45 |
+ |
| 46 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}" |
| 47 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}" |
| 48 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}" |
Archives