Shared routines used by both netbsd-iscsi-initiator and netbsd-iscsi-target.

Part of updating both packages to the code used in netbsd-current and then
used as a basis for further development.
This commit is contained in:
sborrill 2010-06-04 16:14:44 +00:00
parent a9dcce12a6
commit 9f0a7ffa72
8 changed files with 102 additions and 0 deletions

View file

@ -0,0 +1,5 @@
iSCSI is an IETF standard (RFC 3720) for remote access to block-level
storage. It can be thought of as similar to NFS, except that an NFS
server exports files.
This is the NetBSD libiscsi library use by both the target and initiator.

View file

@ -0,0 +1,14 @@
# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-lib/}
CATEGORIES= devel
COMMENT= NetBSD's iSCSI library (per iSCSI RFC 3720)
BUILD_DIRS+= ${WRKSRC}/src/lib
.include "Makefile.common"
post-install:
${INSTALL_DATA} ${WRKSRC}/include/iscsi.h ${DESTDIR}${PREFIX}/include
.include "../../mk/bsd.pkg.mk"

View file

@ -0,0 +1,17 @@
# $NetBSD: Makefile.common,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
# Included by:
# net/netbsd-iscsi-target/Makefile
# net/netbsd-iscsi-initiator/Makefile
DISTNAME= netbsd-iscsi-20100416
MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= agc@NetBSD.org
HOMEPAGE= http://www.alistaircrooks.co.uk/software.html
LICENSE= modified-bsd
GNU_CONFIGURE= yes
AUTO_MKDIRS= yes
PKG_DESTDIR_SUPPORT= user-destdir

View file

@ -0,0 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
include/iscsi.h
lib/libiscsi.la
man/man3/libiscsi.3

View file

@ -0,0 +1,13 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
BUILDLINK_TREE+= netbsd-iscsi-lib
.if !defined(NETBSD_ISCSI_LIB_BUILDLINK3_MK)
NETBSD_ISCSI_LIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20100416
BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20100416
BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?= ../../devel/netbsd-iscsi-lib
.endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK
BUILDLINK_TREE+= -netbsd-iscsi-lib

View file

@ -0,0 +1,7 @@
$NetBSD: distinfo,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
SHA1 (netbsd-iscsi-20100416.tar.gz) = ab8a94f26520f8a1ff7484efa80aa3c0ecfe1c40
RMD160 (netbsd-iscsi-20100416.tar.gz) = 1bac1a7fdcc8d1df7dd3c32b8fb940933057ba61
Size (netbsd-iscsi-20100416.tar.gz) = 539715 bytes
SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e

View file

@ -0,0 +1,22 @@
$NetBSD: patch-ab,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $
--- src/target/Makefile.in.orig 2010-04-16 20:16:12.000000000 +0100
+++ src/target/Makefile.in 2010-04-16 20:16:32.000000000 +0100
@@ -51,7 +51,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_iscsi_target_OBJECTS = iscsi_target-iscsi-target.$(OBJEXT)
iscsi_target_OBJECTS = $(am_iscsi_target_OBJECTS)
-iscsi_target_DEPENDENCIES = ../lib/libiscsi.la
+iscsi_target_DEPENDENCIES =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -210,7 +210,7 @@
AM_CFLAGS = $(WARNCFLAGS) -pthread
iscsi_target_SOURCES = iscsi-target.c
iscsi_target_CPPFLAGS = -I$(top_srcdir)/include
-iscsi_target_LDADD = ../lib/libiscsi.la -lpthread
+iscsi_target_LDADD = -liscsi -lpthread
man8_MANS = iscsi-target.8
man5_MANS = targets.5
dist_man_MANS = iscsi-target.8 targets.5

View file

@ -0,0 +1,20 @@
--- src/initiator/Makefile.in.orig 2010-04-16 20:26:17.000000000 +0100
+++ src/initiator/Makefile.in 2010-04-16 20:28:51.000000000 +0100
@@ -53,7 +53,7 @@
iscsi_initiator-libkmod.$(OBJEXT) \
iscsi_initiator-virtdir.$(OBJEXT)
iscsi_initiator_OBJECTS = $(am_iscsi_initiator_OBJECTS)
-iscsi_initiator_DEPENDENCIES = ../lib/libiscsi.la
+iscsi_initiator_DEPENDENCIES =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp
am__depfiles_maybe = depfiles
@@ -211,7 +211,7 @@
AM_CFLAGS = $(WARNCFLAGS)
iscsi_initiator_SOURCES = iscsi-initiator.c libkmod.c virtdir.c
iscsi_initiator_CPPFLAGS = -I$(top_srcdir)/include
-iscsi_initiator_LDADD = ../lib/libiscsi.la -lrefuse
+iscsi_initiator_LDADD = -liscsi -lrefuse
man8_MANS = iscsi-initiator.8
dist_man_MANS = iscsi-initiator.8
all: all-am