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 20C71139085 for ; Mon, 2 Jan 2017 22:41:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63307E0CEC; Mon, 2 Jan 2017 22:41:43 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A4F7E0CF0 for ; Mon, 2 Jan 2017 22:41:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06016341027 for ; Mon, 2 Jan 2017 22:41:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65917261C for ; Mon, 2 Jan 2017 22:41:40 +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: <1483396667.7b26070d4c57e59a4df26b29175be2d46518e919.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: 7b26070d4c57e59a4df26b29175be2d46518e919 X-VCS-Branch: master Date: Mon, 2 Jan 2017 22:41:40 +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: 1c26214b-9fd1-4b16-8ca1-bb148e9df360 X-Archives-Hash: bce17ad095399422db572e9293bad8d3 commit: 7b26070d4c57e59a4df26b29175be2d46518e919 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Jan 2 22:37:47 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jan 2 22:37:47 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7b26070d gen_configkernel: ensure ISCSI sysfs params present. Signed-off-by: Robin H. Johnson gentoo.org> gen_configkernel.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 8d3534b..9c37649 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -167,6 +167,11 @@ config_kernel() { # CONFIG_ISCSI_TCP if isTrue ${CMD_ISCSI} then + 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' + esac cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP") case "$cfg_CONFIG_ISCSI_TCP" in y|m) ;; # Do nothing @@ -177,6 +182,7 @@ config_kernel() { y|m) ;; # Do nothing *) cfg_CONFIG_SCSI_ISCSI_ATTRS='m' 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}" kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS" "${cfg_CONFIG_SCSI_ISCSI_ATTRS}" fi