From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1079630-garchives=archives.gentoo.org@lists.gentoo.org>
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 B1DA9138334
for <garchives@archives.gentoo.org>; Tue, 26 Mar 2019 08:07:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 45AEFE0896;
Tue, 26 Mar 2019 08:07:18 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 166CCE0893
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Mar 2019 08:07:18 +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 C754B335CFB
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Mar 2019 08:07:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E5C5C584
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Mar 2019 08:07:13 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1553584326.75c080f5bb346bf61d39614dac249fc4c8a1e38c.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: 75c080f5bb346bf61d39614dac249fc4c8a1e38c
X-VCS-Branch: master
Date: Tue, 26 Mar 2019 08:07:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 93b142e1-d88f-45c5-ac31-e94aaac64c6c
X-Archives-Hash: a7335a4eaf60419ed242c1c586bfa10a
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}"