Module Name: src
Committed By: riz
Date: Tue Nov 15 16:50:46 UTC 2011
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/modules: mi
src/sbin: Makefile
src/sys/conf: files
src/sys/dev: Makefile
src/sys/modules: Makefile
Added Files:
src/sys/modules/iscsi: Makefile
Log Message:
Build and install new in-kernel iscsi initiator kernel module and associated
binaries (iscsid, iscsictl) if MKISCSI != no. Initiator can also be built
into a kernel by adding 'pseudo-device iscsi' in kernel configuration.
To generate a diff of this commit:
cvs rdiff -u -r1.970 -r1.971 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1709 -r1.1710 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1354 -r1.1355 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.121 -r1.122 src/sbin/Makefile
cvs rdiff -u -r1.1030 -r1.1031 src/sys/conf/files
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/Makefile
cvs rdiff -u -r1.97 -r1.98 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/iscsi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.970 src/distrib/sets/lists/base/mi:1.971
--- src/distrib/sets/lists/base/mi:1.970 Sat Nov 5 22:55:20 2011
+++ src/distrib/sets/lists/base/mi Tue Nov 15 16:50:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.970 2011/11/05 22:55:20 christos Exp $
+# $NetBSD: mi,v 1.971 2011/11/15 16:50:43 riz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -255,6 +255,8 @@
./sbin/init base-sysutil-root
./sbin/ipf base-ipf-root ipfilter
./sbin/ipppctl base-netutil-root
+./sbin/iscsictl base-iscsi-bin iscsi
+./sbin/iscsid base-iscsi-bin iscsi
./sbin/ispppcontrol base-obsolete obsolete
./sbin/lmcctl base-obsolete obsolete
./sbin/lvm base-lvm-root lvm
@@ -783,6 +785,7 @@
./usr/include/dev/ir base-c-usr
./usr/include/dev/isa base-c-usr
./usr/include/dev/isapnp base-obsolete obsolete
+./usr/include/dev/iscsi base-c-usr iscsi
./usr/include/dev/microcode base-obsolete obsolete
./usr/include/dev/microcode/aic7xxx base-obsolete obsolete
./usr/include/dev/microcode/isp base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1709 src/distrib/sets/lists/comp/mi:1.1710
--- src/distrib/sets/lists/comp/mi:1.1709 Tue Nov 15 00:50:55 2011
+++ src/distrib/sets/lists/comp/mi Tue Nov 15 16:50:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1709 2011/11/15 00:50:55 jym Exp $
+# $NetBSD: mi,v 1.1710 2011/11/15 16:50:44 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -461,6 +461,10 @@
./usr/include/dev/isapnp/if_levar.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpreg.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpvar.h comp-obsolete obsolete
+./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_perf.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_test.h comp-c-include iscsi
./usr/include/dev/keylock.h comp-c-include
./usr/include/dev/kttcpio.h comp-c-include
./usr/include/dev/lockstat.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1354 src/distrib/sets/lists/man/mi:1.1355
--- src/distrib/sets/lists/man/mi:1.1354 Sun Nov 13 12:35:40 2011
+++ src/distrib/sets/lists/man/mi Tue Nov 15 16:50:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1354 2011/11/13 12:35:40 mbalmer Exp $
+# $NetBSD: mi,v 1.1355 2011/11/15 16:50:45 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2390,6 +2390,8 @@
./usr/share/man/cat8/irdaattach.0 man-sysutil-catman .cat
./usr/share/man/cat8/iscsi-initiator.0 man-iscsi-catman iscsi,.cat
./usr/share/man/cat8/iscsi-target.0 man-iscsi-catman iscsi,.cat
+./usr/share/man/cat8/iscsictl.0 man-iscsi-catman iscsi,.cat
+./usr/share/man/cat8/iscsid.0 man-iscsi-catman iscsi,.cat
./usr/share/man/cat8/isdnd.0 man-isdn-catman .cat
./usr/share/man/cat8/isdnmonitor.0 man-isdn-catman .cat
./usr/share/man/cat8/isdntel.0 man-isdn-catman .cat
@@ -5044,6 +5046,8 @@
./usr/share/man/html8/irdaattach.html man-sysutil-htmlman html
./usr/share/man/html8/iscsi-initiator.html man-iscsi-htmlman iscsi,html
./usr/share/man/html8/iscsi-target.html man-iscsi-htmlman iscsi,html
+./usr/share/man/html8/iscsictl.html man-iscsi-htmlman iscsi,html
+./usr/share/man/html8/iscsid.html man-iscsi-htmlman iscsi,html
./usr/share/man/html8/isdnd.html man-isdn-htmlman html
./usr/share/man/html8/isdnmonitor.html man-isdn-htmlman html
./usr/share/man/html8/isdntel.html man-isdn-htmlman html
@@ -7847,6 +7851,8 @@
./usr/share/man/man8/irdaattach.8 man-sysutil-man .man
./usr/share/man/man8/iscsi-initiator.8 man-iscsi-man iscsi,.man
./usr/share/man/man8/iscsi-target.8 man-iscsi-man iscsi,.man
+./usr/share/man/man8/iscsictl.8 man-iscsi-man iscsi,.man
+./usr/share/man/man8/iscsid.8 man-iscsi-man iscsi,.man
./usr/share/man/man8/isdnd.8 man-isdn-man .man
./usr/share/man/man8/isdnmonitor.8 man-isdn-man .man
./usr/share/man/man8/isdntel.8 man-isdn-man .man
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.36 src/distrib/sets/lists/modules/mi:1.37
--- src/distrib/sets/lists/modules/mi:1.36 Sun Nov 6 13:27:25 2011
+++ src/distrib/sets/lists/modules/mi Tue Nov 15 16:50:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.36 2011/11/06 13:27:25 tron Exp $
+# $NetBSD: mi,v 1.37 2011/11/15 16:50:46 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -75,6 +75,8 @@
./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules kmod
./@MODULEDIR@/iic base-kernel-modules kmod
./@MODULEDIR@/iic/iic.kmod base-kernel-modules kmod
+./@MODULEDIR@/iscsi base-kernel-modules kmod,iscsi
+./@MODULEDIR@/iscsi/iscsi.kmod base-kernel-modules kmod,iscsi
./@MODULEDIR@/kernfs base-kernel-modules kmod
./@MODULEDIR@/kernfs/kernfs.kmod base-kernel-modules kmod
./@MODULEDIR@/ksem base-kernel-modules kmod
Index: src/sbin/Makefile
diff -u src/sbin/Makefile:1.121 src/sbin/Makefile:1.122
--- src/sbin/Makefile:1.121 Mon Aug 29 11:38:48 2011
+++ src/sbin/Makefile Tue Nov 15 16:50:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2011/08/29 11:38:48 mrg Exp $
+# $NetBSD: Makefile,v 1.122 2011/11/15 16:50:43 riz Exp $
# @(#)Makefile 8.5 (Berkeley) 3/31/94
# Not ported: XNSrouted enpload scsiformat startslip
@@ -58,6 +58,10 @@ SUBDIR+= cgdconfig
SUBDIR+= ping6 rtsol
.endif
+.if (${MKISCSI} != "no")
+SUBDIR+= iscsictl iscsid
+.endif
+
# IPsec
SUBDIR+= setkey
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1030 src/sys/conf/files:1.1031
--- src/sys/conf/files:1.1030 Wed Nov 2 09:47:57 2011
+++ src/sys/conf/files Tue Nov 15 16:50:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1030 2011/11/02 09:47:57 martin Exp $
+# $NetBSD: files,v 1.1031 2011/11/15 16:50:43 riz Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1744,3 +1744,8 @@ include "dev/nand/files.nand"
# NOR subsytem
#
include "dev/nor/files.nor"
+
+#
+# iscsi
+#
+include "dev/iscsi/files.iscsi"
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.32 src/sys/dev/Makefile:1.33
--- src/sys/dev/Makefile:1.32 Sun Oct 2 16:39:47 2011
+++ src/sys/dev/Makefile Tue Nov 15 16:50:43 2011
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.32 2011/10/02 16:39:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.33 2011/11/15 16:50:43 riz Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv hpc i2c i2o ic ieee1394 ir isa \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
sun tc usb vme wscons
+.if MKISCSI != "no"
+SUBDIR+= iscsi
+.endif
+
INCSDIR= /usr/include/dev
# Only install includes which are used by userland
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.97 src/sys/modules/Makefile:1.98
--- src/sys/modules/Makefile:1.97 Sun Nov 6 13:26:54 2011
+++ src/sys/modules/Makefile Tue Nov 15 16:50:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2011/11/06 13:26:54 tron Exp $
+# $NetBSD: Makefile,v 1.98 2011/11/15 16:50:46 riz Exp $
.include <bsd.own.mk>
@@ -250,4 +250,8 @@ SUBDIR+= cxdtv
SUBDIR+= emdtv
.endif
+.if (${MKISCSI} != "no")
+SUBDIR+= iscsi
+.endif
+
.include <bsd.subdir.mk>
Added files:
Index: src/sys/modules/iscsi/Makefile
diff -u /dev/null src/sys/modules/iscsi/Makefile:1.1
--- /dev/null Tue Nov 15 16:50:47 2011
+++ src/sys/modules/iscsi/Makefile Tue Nov 15 16:50:46 2011
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2011/11/15 16:50:46 riz Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/iscsi
+
+KMOD= iscsi
+SRCS= base64.c iscsi_ioctl.c iscsi_main.c iscsi_profile.c iscsi_rcv.c
+SRCS+= iscsi_send.c iscsi_test.c iscsi_text.c iscsi_utils.c
+
+.include <bsd.kmodule.mk>
