From: Shan Hai <shan.hai@oracle.com>
Date: Fri, 2 Jun 2017 01:28:08 +0000 (+0800)
Subject: uek-rpm/config: build tcmu kernel module by default
X-Git-Tag: v4.1.12-104.0.20170618_1145~122
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ace38f215e212deb13709d240672f51662dcbafb;p=users%2Fjedix%2Flinux-maple.git

uek-rpm/config: build tcmu kernel module by default

Orabug: 26269847

Since the tcmu feature support for the iscsi target is added by below
bug fixes build the tcmu kernel module by modifying default kernel
configuration files.

The fixes which add tcmu feature to the iscsi target:
Orabug: 25983319/25983379/25791789
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Shan Hai <shan.hai@oracle.com>
---

diff --git a/uek-rpm/ol6-nano/config-x86_64 b/uek-rpm/ol6-nano/config-x86_64
index efde07c169a9..d3c7522d2d86 100644
--- a/uek-rpm/ol6-nano/config-x86_64
+++ b/uek-rpm/ol6-nano/config-x86_64
@@ -2001,7 +2001,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
diff --git a/uek-rpm/ol6-nano/config-x86_64-debug b/uek-rpm/ol6-nano/config-x86_64-debug
index be2767e8a182..a184c5044348 100644
--- a/uek-rpm/ol6-nano/config-x86_64-debug
+++ b/uek-rpm/ol6-nano/config-x86_64-debug
@@ -2087,7 +2087,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 79aea501cd3a..82ce3c613c44 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -2147,7 +2147,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index 95266ea6c1e8..7d489e6184e2 100644
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -2134,7 +2134,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64
index 8788aed73249..bca927a0ac77 100644
--- a/uek-rpm/ol7/config-x86_64
+++ b/uek-rpm/ol7/config-x86_64
@@ -2160,7 +2160,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index ec37a582b1f5..2a4fa7a6fed8 100644
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -2147,7 +2147,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
-# CONFIG_TCM_USER2 is not set
+CONFIG_TCM_USER2=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m