Page MenuHomeFreeBSD
Files F173400063

D10099.id26551.diff
No OneTemporary
Actions

D10099.id26551.diff
View Options

Index: sys/conf/files
===================================================================
--- sys/conf/files
+++ sys/conf/files
@@ -102,7 +102,7 @@
cam/ctl/ctl_frontend.c optional ctl
cam/ctl/ctl_frontend_cam_sim.c optional ctl
cam/ctl/ctl_frontend_ioctl.c optional ctl
-cam/ctl/ctl_frontend_iscsi.c optional ctl
+cam/ctl/ctl_frontend_iscsi.c optional ctl ctl_iscsi
cam/ctl/ctl_ha.c optional ctl
cam/ctl/ctl_scsi_all.c optional ctl
cam/ctl/ctl_tpc.c optional ctl
@@ -1780,10 +1780,10 @@
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "ipw_monitor.fw"
-dev/iscsi/icl.c optional iscsi | ctl
-dev/iscsi/icl_conn_if.m optional iscsi | ctl
-dev/iscsi/icl_soft.c optional iscsi | ctl
-dev/iscsi/icl_soft_proxy.c optional iscsi | ctl
+dev/iscsi/icl.c optional iscsi
+dev/iscsi/icl_conn_if.m optional ctl_iscsi | iscsi
+dev/iscsi/icl_soft.c optional iscsi
+dev/iscsi/icl_soft_proxy.c optional iscsi
dev/iscsi/iscsi.c optional iscsi scbus
dev/iscsi_initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi_initiator/iscsi_subr.c optional iscsi_initiator scbus
Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile
+++ sys/modules/Makefile
@@ -477,6 +477,7 @@
.endif
.if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
+SUBDIR+= ctl_iscsi
SUBDIR+= iscsi
SUBDIR+= iscsi_initiator
.endif
Index: sys/modules/ctl/Makefile
===================================================================
--- sys/modules/ctl/Makefile
+++ sys/modules/ctl/Makefile
@@ -12,7 +12,6 @@
SRCS+= ctl_frontend.c
SRCS+= ctl_frontend_cam_sim.c
SRCS+= ctl_frontend_ioctl.c
-SRCS+= ctl_frontend_iscsi.c
SRCS+= ctl_ha.c
SRCS+= ctl_scsi_all.c
SRCS+= ctl_tpc.c
@@ -23,11 +22,10 @@
SRCS+= bus_if.h
SRCS+= device_if.h
SRCS+= vnode_if.h
-SRCS+= icl_conn_if.h
SRCS+= opt_cam.h
#CFLAGS+=-DICL_KERNEL_PROXY
-MFILES= kern/bus_if.m kern/device_if.m dev/iscsi/icl_conn_if.m
+MFILES= kern/bus_if.m kern/device_if.m
.include <bsd.kmod.mk>
Index: sys/modules/ctl_iscsi/Makefile
===================================================================
--- sys/modules/ctl_iscsi/Makefile
+++ sys/modules/ctl_iscsi/Makefile
@@ -2,32 +2,11 @@
.PATH: ${SRCTOP}/sys/cam/ctl
-KMOD= ctl
-
-SRCS= ctl.c
-SRCS+= ctl_backend.c
-SRCS+= ctl_backend_block.c
-SRCS+= ctl_backend_ramdisk.c
-SRCS+= ctl_cmd_table.c
-SRCS+= ctl_frontend.c
-SRCS+= ctl_frontend_cam_sim.c
-SRCS+= ctl_frontend_ioctl.c
-SRCS+= ctl_frontend_iscsi.c
-SRCS+= ctl_ha.c
-SRCS+= ctl_scsi_all.c
-SRCS+= ctl_tpc.c
-SRCS+= ctl_tpc_local.c
-SRCS+= ctl_error.c
-SRCS+= ctl_util.c
-SRCS+= scsi_ctl.c
-SRCS+= bus_if.h
-SRCS+= device_if.h
-SRCS+= vnode_if.h
-SRCS+= icl_conn_if.h
-SRCS+= opt_cam.h
+KMOD= ctl_iscsi
#CFLAGS+=-DICL_KERNEL_PROXY
-MFILES= kern/bus_if.m kern/device_if.m dev/iscsi/icl_conn_if.m
+MFILES= dev/iscsi/icl_conn_if.m
+SRCS= ctl_frontend_iscsi.c icl_conn_if.h
.include <bsd.kmod.mk>

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 26, 5:30 PM (2 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39680120
Default Alt Text
D10099.id26551.diff (2 KB)

Event Timeline