[stgt] [PATCH] always enable ISCSI

[FUJITA Tomonori]

On Mon, 6 Sep 2010 16:25:34 +0900
FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp> wrote:

> I think that 99.999 % people use tgt for iSCSI. So let's enable it by
> default.
> 
> Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
> ---
>  Makefile     |    2 +-
>  usr/Makefile |    3 ---
>  2 files changed, 1 insertions(+), 4 deletions(-)

I've merged the following:

=
From: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Subject: [PATCH] always enable ISCSI

The majority of the users use tgt for iSCSI, I think. Let's enable
iSCSI feature by default.

Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
---
 Makefile         |    2 +-
 doc/README.iscsi |    2 +-
 usr/Makefile     |    3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 143896c..25f2855 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ PREFIX ?= /usr
 export VERSION PREFIX
 
 # Export the feature switches so sub-make knows about them
-export ISCSI ISCSI_RDMA IBMVIO FCOE FCP
+export ISCSI_RDMA IBMVIO FCOE FCP
 
 .PHONY: all
 all: programs doc conf scripts
diff --git a/doc/README.iscsi b/doc/README.iscsi
index 7cb2df5..4ff3028 100644
--- a/doc/README.iscsi
+++ b/doc/README.iscsi
@@ -9,7 +9,7 @@ The iSCSI target driver works with the 2.6.X kernels.
 
 First, you need to compile the source code:
 
-host:~/tgt/usr$ make ISCSI=1
+host:~/tgt/usr$ make
 
 Try the following commands:
 
diff --git a/usr/Makefile b/usr/Makefile
index 262300d..322ecfb 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -10,8 +10,6 @@ TGTD_OBJS += $(addprefix ibmvio/, ibmvio.o)
 TGTD_OBJS += bs_mmap.o tgtif.o
 endif
 
-ifneq ($(ISCSI),)
-CFLAGS += -DISCSI
 TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
 		iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
 		isns.o)
@@ -22,7 +20,6 @@ CFLAGS += -DISCSI_RDMA
 TGTD_OBJS += iscsi/iscsi_rdma.o
 LIBS += -libverbs -lrdmacm
 endif
-endif
 
 ifneq ($(FCP),)
 CFLAGS += -DFCP -DUSE_KERNEL
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html