From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1079629-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 56634138334
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 2A48BE0891;
Tue, 26 Mar 2019 08:07:18 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 055C6E0891
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Mar 2019 08:07:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 B84CD335C77
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 AB31C580
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.5b1e15a3b503253b26a931fa7907d175cb3e08fd.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: 5b1e15a3b503253b26a931fa7907d175cb3e08fd
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: 9b4ee238-e55b-4e98-84f6-b70ffe19f504
X-Archives-Hash: 55cd00e8fee364778a3152aab73198dc
commit: 5b1e15a3b503253b26a931fa7907d175cb3e08fd
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 03:41:58 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=5b1e15a3
config_kernel(): rewrite --lvm handling
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_configkernel.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 27704cf..719f055 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -184,9 +184,10 @@ config_kernel() {
*) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting}
esac
- # Make sure lvm modules are on if --lvm
+ # Make sure lvm modules are enabled in the kernel, if --lvm
if isTrue "${CMD_LVM}"
then
+ print_info 1 "$(getIndent 1)>> Ensure that required kernel options for LVM support are set..."
cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT")
case "$cfg_CONFIG_DM_SNAPSHOT" in
y|m) ;; # Do nothing
@@ -197,9 +198,12 @@ config_kernel() {
y|m) ;; # Do nothing
*) cfg_CONFIG_DM_MIRROR=${newcfg_setting}
esac
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLOCK" "y"
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MD" "y"
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}"
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}"
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR" "${cfg_CONFIG_DM_MIRROR}"
+ kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_FILE_LOCKING" "y"
fi
# Multipath