Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Build and install new in-kernel iscsi initiator kernel modul...



details:   https://anonhg.NetBSD.org/src/rev/aecec3c70813
branches:  trunk
changeset: 771234:aecec3c70813
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Nov 15 16:50:43 2011 +0000

description:
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.

diffstat:

 distrib/sets/lists/base/mi    |   5 ++++-
 distrib/sets/lists/comp/mi    |   6 +++++-
 distrib/sets/lists/man/mi     |   8 +++++++-
 distrib/sets/lists/modules/mi |   4 +++-
 sbin/Makefile                 |   6 +++++-
 sys/conf/files                |   7 ++++++-
 sys/dev/Makefile              |   6 +++++-
 sys/modules/Makefile          |   6 +++++-
 sys/modules/iscsi/Makefile    |  11 +++++++++++
 9 files changed, 51 insertions(+), 8 deletions(-)

diffs (189 lines):

diff -r 46e20dcce173 -r aecec3c70813 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Tue Nov 15 14:13:17 2011 +0000
+++ b/distrib/sets/lists/base/mi        Tue Nov 15 16:50:43 2011 +0000
@@ -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
diff -r 46e20dcce173 -r aecec3c70813 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Nov 15 14:13:17 2011 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Nov 15 16:50:43 2011 +0000
@@ -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
diff -r 46e20dcce173 -r aecec3c70813 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Nov 15 14:13:17 2011 +0000
+++ b/distrib/sets/lists/man/mi Tue Nov 15 16:50:43 2011 +0000
@@ -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
diff -r 46e20dcce173 -r aecec3c70813 distrib/sets/lists/modules/mi
--- a/distrib/sets/lists/modules/mi     Tue Nov 15 14:13:17 2011 +0000
+++ b/distrib/sets/lists/modules/mi     Tue Nov 15 16:50:43 2011 +0000
@@ -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
diff -r 46e20dcce173 -r aecec3c70813 sbin/Makefile
--- a/sbin/Makefile     Tue Nov 15 14:13:17 2011 +0000
+++ b/sbin/Makefile     Tue Nov 15 16:50:43 2011 +0000
@@ -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+= ping6 rtsol
 .endif
 
+.if (${MKISCSI} != "no")
+SUBDIR+= iscsictl iscsid
+.endif
+
 # IPsec
 SUBDIR+= setkey
 
diff -r 46e20dcce173 -r aecec3c70813 sys/conf/files
--- a/sys/conf/files    Tue Nov 15 14:13:17 2011 +0000
+++ b/sys/conf/files    Tue Nov 15 16:50:43 2011 +0000
@@ -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 @@
 # NOR subsytem
 #
 include "dev/nor/files.nor"
+
+#
+# iscsi
+#
+include "dev/iscsi/files.iscsi"
diff -r 46e20dcce173 -r aecec3c70813 sys/dev/Makefile
--- a/sys/dev/Makefile  Tue Nov 15 14:13:17 2011 +0000
+++ b/sys/dev/Makefile  Tue Nov 15 16:50:43 2011 +0000
@@ -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
diff -r 46e20dcce173 -r aecec3c70813 sys/modules/Makefile
--- a/sys/modules/Makefile      Tue Nov 15 14:13:17 2011 +0000
+++ b/sys/modules/Makefile      Tue Nov 15 16:50:43 2011 +0000
@@ -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+=       emdtv
 .endif
 
+.if (${MKISCSI} != "no")
+SUBDIR+=       iscsi
+.endif
+
 .include <bsd.subdir.mk>
diff -r 46e20dcce173 -r aecec3c70813 sys/modules/iscsi/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/iscsi/Makefile        Tue Nov 15 16:50:43 2011 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index