Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Mon, 02 Jan 2017 22:41:45
Message-Id: 1483396667.7b26070d4c57e59a4df26b29175be2d46518e919.robbat2@gentoo
1 commit: 7b26070d4c57e59a4df26b29175be2d46518e919
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 22:37:47 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 22:37:47 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7b26070d
7
8 gen_configkernel: ensure ISCSI sysfs params present.
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 gen_configkernel.sh | 6 ++++++
13 1 file changed, 6 insertions(+)
14
15 diff --git a/gen_configkernel.sh b/gen_configkernel.sh
16 index 8d3534b..9c37649 100755
17 --- a/gen_configkernel.sh
18 +++ b/gen_configkernel.sh
19 @@ -167,6 +167,11 @@ config_kernel() {
20 # CONFIG_ISCSI_TCP
21 if isTrue ${CMD_ISCSI}
22 then
23 + cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS")
24 + case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in
25 + y|m) ;; # Do nothing
26 + *) cfg_CONFIG_ISCSI_BOOT_SYSFS='m'
27 + esac
28 cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP")
29 case "$cfg_CONFIG_ISCSI_TCP" in
30 y|m) ;; # Do nothing
31 @@ -177,6 +182,7 @@ config_kernel() {
32 y|m) ;; # Do nothing
33 *) cfg_CONFIG_SCSI_ISCSI_ATTRS='m'
34 esac
35 + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}"
36 kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}"
37 kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}"
38 fi