Module Name: src
Committed By: agc
Date: Thu Jun 25 13:59:02 UTC 2009
Modified Files:
src/external/bsd: Makefile
src/external/lib: Makefile
src/lib: Makefile
src/usr.sbin: Makefile
Removed Files:
src/dist/iscsi/doc: COMPATIBILITY FAQ HOWTO-iSCSI-encrypt.txt
HOWTO-iSCSI-target.txt PERFORMANCE README README_OSD license
src/dist/iscsi/include: compat.h conffile.h config.h config.h.in defs.h
device.h driver.h initiator.h iscsi-md5.h iscsi.h iscsiutil.h osd.h
osd_ops.h parameters.h scsi_cmd_codes.h so.h storage.h target.h
tests.h
src/dist/iscsi/src: Makefile.in TODO conffile.c configure configure.ac
disk.c driver.c initiator.c install-sh iscsi-harness.8
iscsi-harness.c iscsi-target.8 iscsi-target.c iscsi.c md5c.c
md5hl.c netmask.c osd-target.c osd.c osd_ops.c osdfs.c parameters.c
snprintf.c so.c start_osd stop_osd storage.c strlcpy.c strtoll.c
target.c targets.5 tests.c usocktest.c utest.c util.c uuid.c
src/dist/iscsi/src/etc: auths passwd targets
src/dist/iscsi/src/etc/rc.d: iscsi_target
Log Message:
Switch over to building iscsi library, target and initiator from the
external framework.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/dist/iscsi/doc/COMPATIBILITY \
src/dist/iscsi/doc/FAQ
cvs rdiff -u -r1.1 -r0 src/dist/iscsi/doc/HOWTO-iSCSI-encrypt.txt \
src/dist/iscsi/doc/HOWTO-iSCSI-target.txt
cvs rdiff -u -r1.1.1.1 -r0 src/dist/iscsi/doc/PERFORMANCE \
src/dist/iscsi/doc/README_OSD src/dist/iscsi/doc/license
cvs rdiff -u -r1.2 -r0 src/dist/iscsi/doc/README
cvs rdiff -u -r1.10 -r0 src/dist/iscsi/include/compat.h
cvs rdiff -u -r1.4 -r0 src/dist/iscsi/include/conffile.h \
src/dist/iscsi/include/defs.h src/dist/iscsi/include/iscsi.h
cvs rdiff -u -r1.25 -r0 src/dist/iscsi/include/config.h
cvs rdiff -u -r1.11 -r0 src/dist/iscsi/include/config.h.in
cvs rdiff -u -r1.1.1.1 -r0 src/dist/iscsi/include/device.h \
src/dist/iscsi/include/osd_ops.h src/dist/iscsi/include/so.h
cvs rdiff -u -r1.2 -r0 src/dist/iscsi/include/driver.h \
src/dist/iscsi/include/tests.h
cvs rdiff -u -r1.8 -r0 src/dist/iscsi/include/initiator.h
cvs rdiff -u -r1.1 -r0 src/dist/iscsi/include/iscsi-md5.h \
src/dist/iscsi/include/iscsiutil.h
cvs rdiff -u -r1.3 -r0 src/dist/iscsi/include/osd.h
cvs rdiff -u -r1.5 -r0 src/dist/iscsi/include/parameters.h
cvs rdiff -u -r1.16 -r0 src/dist/iscsi/include/scsi_cmd_codes.h
cvs rdiff -u -r1.6 -r0 src/dist/iscsi/include/storage.h
cvs rdiff -u -r1.9 -r0 src/dist/iscsi/include/target.h
cvs rdiff -u -r1.14 -r0 src/dist/iscsi/src/Makefile.in
cvs rdiff -u -r1.10 -r0 src/dist/iscsi/src/TODO
cvs rdiff -u -r1.7 -r0 src/dist/iscsi/src/conffile.c \
src/dist/iscsi/src/iscsi-target.8 src/dist/iscsi/src/osd-target.c \
src/dist/iscsi/src/targets.5
cvs rdiff -u -r1.29 -r0 src/dist/iscsi/src/configure \
src/dist/iscsi/src/configure.ac
cvs rdiff -u -r1.40 -r0 src/dist/iscsi/src/disk.c
cvs rdiff -u -r1.4 -r0 src/dist/iscsi/src/driver.c src/dist/iscsi/src/utest.c \
src/dist/iscsi/src/uuid.c
cvs rdiff -u -r1.19 -r0 src/dist/iscsi/src/initiator.c \
src/dist/iscsi/src/util.c
cvs rdiff -u -r1.1.1.1 -r0 src/dist/iscsi/src/install-sh \
src/dist/iscsi/src/start_osd src/dist/iscsi/src/stop_osd
cvs rdiff -u -r1.5 -r0 src/dist/iscsi/src/iscsi-harness.8 \
src/dist/iscsi/src/osd_ops.c
cvs rdiff -u -r1.11 -r0 src/dist/iscsi/src/iscsi-harness.c \
src/dist/iscsi/src/netmask.c
cvs rdiff -u -r1.13 -r0 src/dist/iscsi/src/iscsi-target.c \
src/dist/iscsi/src/storage.c
cvs rdiff -u -r1.9 -r0 src/dist/iscsi/src/iscsi.c
cvs rdiff -u -r1.1 -r0 src/dist/iscsi/src/md5c.c src/dist/iscsi/src/md5hl.c
cvs rdiff -u -r1.6 -r0 src/dist/iscsi/src/osd.c
cvs rdiff -u -r1.3 -r0 src/dist/iscsi/src/osdfs.c src/dist/iscsi/src/so.c \
src/dist/iscsi/src/strlcpy.c src/dist/iscsi/src/strtoll.c \
src/dist/iscsi/src/usocktest.c
cvs rdiff -u -r1.12 -r0 src/dist/iscsi/src/parameters.c \
src/dist/iscsi/src/tests.c
cvs rdiff -u -r1.2 -r0 src/dist/iscsi/src/snprintf.c
cvs rdiff -u -r1.25 -r0 src/dist/iscsi/src/target.c
cvs rdiff -u -r1.1.1.1 -r0 src/dist/iscsi/src/etc/auths \
src/dist/iscsi/src/etc/passwd
cvs rdiff -u -r1.2 -r0 src/dist/iscsi/src/etc/targets
cvs rdiff -u -r1.1.1.1 -r0 src/dist/iscsi/src/etc/rc.d/iscsi_target
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/lib/Makefile
cvs rdiff -u -r1.139 -r1.140 src/lib/Makefile
cvs rdiff -u -r1.240 -r1.241 src/usr.sbin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.11 src/external/bsd/Makefile:1.12
--- src/external/bsd/Makefile:1.11 Fri May 8 17:45:49 2009
+++ src/external/bsd/Makefile Thu Jun 25 13:59:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/05/08 17:45:49 christos Exp $
+# $NetBSD: Makefile,v 1.12 2009/06/25 13:59:02 agc Exp $
.include <bsd.own.mk>
@@ -6,6 +6,9 @@
.if (${MKATF} != "no")
SUBDIR+= atf
.endif
+.if (${MKISCSI} != "no")
+SUBDIR+= iscsi
+.endif
.if (${MKLDAP} != "no")
SUBDIR+= openldap
.endif
Index: src/external/lib/Makefile
diff -u src/external/lib/Makefile:1.10 src/external/lib/Makefile:1.11
--- src/external/lib/Makefile:1.10 Fri May 8 17:47:44 2009
+++ src/external/lib/Makefile Thu Jun 25 13:59:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/08 17:47:44 christos Exp $
+# $NetBSD: Makefile,v 1.11 2009/06/25 13:59:02 agc Exp $
#
# This Makefile exists to provide a single point to build
@@ -20,6 +20,10 @@
.endif
.endif
+.if (${MKISCSI} != "no")
+SUBDIR+= ../bsd/iscsi/lib # depends on libpthread
+.endif
+
SUBDIR+= ../bsd/fetch/lib
SUBDIR+= ../bsd/libarchive/lib
SUBDIR+= ../bsd/am-utils/lib
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.139 src/lib/Makefile:1.140
--- src/lib/Makefile:1.139 Tue Jun 9 05:20:15 2009
+++ src/lib/Makefile Thu Jun 25 13:58:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2009/06/09 05:20:15 mrg Exp $
+# $NetBSD: Makefile,v 1.140 2009/06/25 13:58:59 agc Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -65,10 +65,6 @@
SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
-.if (${MKISCSI} != "no")
-SUBDIR+= libiscsi # depends on libpthread
-.endif
-
.if (${MKCRYPTO} != "no")
SUBDIR+= libssl # depends on libcrypto
.endif
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.240 src/usr.sbin/Makefile:1.241
--- src/usr.sbin/Makefile:1.240 Sun Apr 12 17:13:06 2009
+++ src/usr.sbin/Makefile Thu Jun 25 13:59:00 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.240 2009/04/12 17:13:06 christos Exp $
+# $NetBSD: Makefile,v 1.241 2009/06/25 13:59:00 agc Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -24,10 +24,6 @@
usbdevs user videomode vipw veriexecgen vnconfig wiconfig wlanctl wpa \
wsconscfg wsfontload wsmoused wsmuxctl zdump zic
-.if (${MKISCSI} != "no")
-SUBDIR+= iscsi
-.endif
-
.if (${MKKERBEROS} != "no")
SUBDIR+= hprop kadmin kdc kstash ktutil iprop-log kdigest kimpersonate kcm
.endif
