From 9732e4fd927cb8824f26ba8414aec2eb16e3089d Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 22 Aug 2013 14:02:34 +0000
Subject: Move the old iSCSI initiator source to a more appropriate place
 (sys/dev/iscsi_initiator/ instead of sys/dev/iscsi/initiator/), to make room
 for the new one.  This is also more logical location (kernel module being
 named iscsi_initiator.ko, for example).  There is no ongoing work on this I
 know of, so it shouldn't make life harder for anyone.

There are no functional changes, apart from "svn mv" and adjusting paths.
---
 sys/modules/Makefile                 |  2 +-
 sys/modules/iscsi/initiator/Makefile | 14 --------------
 sys/modules/iscsi_initiator/Makefile | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 sys/modules/iscsi/initiator/Makefile
 create mode 100644 sys/modules/iscsi_initiator/Makefile

(limited to 'sys/modules')

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index bd263e9a9174..b95c77b0e1b1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -159,7 +159,7 @@ SUBDIR=	\
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
-	iscsi \
+	iscsi_initiator \
 	isp \
 	${_ispfw} \
 	${_iwi} \
diff --git a/sys/modules/iscsi/initiator/Makefile b/sys/modules/iscsi/initiator/Makefile
deleted file mode 100644
index 3295c7b6f517..000000000000
--- a/sys/modules/iscsi/initiator/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../dev/iscsi/initiator
-KMOD=iscsi_initiator
-
-SRCS=  iscsi.h iscsivar.h
-SRCS+= iscsi.c isc_cam.c isc_soc.c isc_sm.c isc_subr.c iscsi_subr.c
-SRCS+= opt_cam.h opt_iscsi_initiator.h
-SRCS+= bus_if.h device_if.h
-
-# Debugging
-# CFLAGS+= -DISCSI_INITIATOR_DEBUG=9
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iscsi_initiator/Makefile b/sys/modules/iscsi_initiator/Makefile
new file mode 100644
index 000000000000..0ae7aa4b9738
--- /dev/null
+++ b/sys/modules/iscsi_initiator/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/iscsi_initiator
+KMOD=iscsi_initiator
+
+SRCS=  iscsi.h iscsivar.h
+SRCS+= iscsi.c isc_cam.c isc_soc.c isc_sm.c isc_subr.c iscsi_subr.c
+SRCS+= opt_cam.h opt_iscsi_initiator.h
+SRCS+= bus_if.h device_if.h
+
+# Debugging
+# CFLAGS+= -DISCSI_INITIATOR_DEBUG=9
+
+.include <bsd.kmod.mk>
-- 
cgit v1.3