merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'

     and '88a5ee5dca39386c6bd95c87a62d1b9c74cd7b32'

7 files changed, 153 insertions, 0 deletions

diff --git a/packages/iscsi-target/.mtn2git_empty b/packages/iscsi-target/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/iscsi-target/.mtn2git_empty
diff --git a/packages/iscsi-target/files/.mtn2git_empty b/packages/iscsi-target/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/iscsi-target/files/.mtn2git_empty
diff --git a/packages/iscsi-target/files/ietd.conf b/packages/iscsi-target/files/ietd.conf
new file mode 100644
index 0000000000..0a100ac664
--- /dev/null
+++ b/packages/iscsi-target/files/ietd.conf
@@ -0,0 +1,17 @@
+Target iqn.2007-01.org.foonas:iSCSI.sda.target1
+        Lun 0 Path=/dev/sda,Type=blockio
+        MaxConnections 1
+        HeaderDigest None
+        DataDigest None
+        InitialR2T Yes
+        ImmediateData No
+        MaxRecvDataSegmentLength 8192
+        MaxXmitDataSegmentLength 8192
+        MaxBurstLength 262144
+        FirstBurstLength 65536
+        DefaultTime2Wait 2
+        DefaultTime2Retain 20
+        MaxOutstandingR2T 8
+        DataPDUInOrder Yes
+        DataSequenceInOrder Yes
+        ErrorRecoveryLevel 0
diff --git a/packages/iscsi-target/files/init b/packages/iscsi-target/files/init
new file mode 100644
index 0000000000..d000adfe3c
--- /dev/null
+++ b/packages/iscsi-target/files/init
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Start the iSCSI Enterprise Target.
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+start_server()
+{
+	modprobe -q crc32c
+	modprobe iscsi_trgt
+	start-stop-daemon --start --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd
+}
+	
+stop_server()
+{
+	ietadm --op delete
+	start-stop-daemon --stop --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd
+	sleep 1
+	modprobe -r iscsi_trgt
+}
+
+case "$1" in
+	start)
+		start_server
+		;;
+	stop)
+		stop_server
+		;;
+	*)
+		echo "Usage: {start|stop}" >&2
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/packages/iscsi-target/files/libs.patch b/packages/iscsi-target/files/libs.patch
new file mode 100644
index 0000000000..5108027cc4
--- /dev/null
+++ b/packages/iscsi-target/files/libs.patch
@@ -0,0 +1,11 @@
+diff -urN iscsitarget-0.4.15/usr/Makefile iscsitarget-0.4.15.new/usr/Makefile
+--- iscsitarget-0.4.15/usr/Makefile	2006-07-03 14:09:30.000000000 +0000
++++ iscsitarget-0.4.15.new/usr/Makefile	2007-07-29 23:16:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
+ PROGRAMS = ietd ietadm
+-LIBS = -lcrypto
++LIBS = -lcrypto $(LDFLAGS)
+ 
+ all: $(PROGRAMS)
+ 
diff --git a/packages/iscsi-target/iscsi-target_0.4.16.bb b/packages/iscsi-target/iscsi-target_0.4.16.bb
new file mode 100644
index 0000000000..0e50bfe22b
--- /dev/null
+++ b/packages/iscsi-target/iscsi-target_0.4.16.bb
@@ -0,0 +1,43 @@
+
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
+	   file://libs.patch;patch=1 \
+	   file://init \
+		"
+
+DEPENDS = " openssl"
+S = "${WORKDIR}/iscsitarget-${PV}"
+
+inherit module
+
+do_configure() {
+}
+
+CFLAGS  = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+LDFLAGS = "-L${STAGING_LIBDIR}"
+FILES_${PN} += " ${base_sbindir}"
+
+do_compile() {
+	oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'
+}
+
+do_install() {
+	# Module
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi
+	install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko
+
+	# Userspace utilities
+	install -d ${D}${base_sbindir}
+        install -m 0755 usr/ietd ${D}${base_sbindir}/ietd
+        install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm
+
+	# Config files, init scripts
+	mkdir -p ${D}${sysconfdir}/init.d
+	install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target
+	install -m 0644 etc/initiators.allow ${D}${sysconfdir}/
+	install -m 0644 etc/initiators.deny ${D}${sysconfdir}/
+}
diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb
new file mode 100644
index 0000000000..6671934c48
--- /dev/null
+++ b/packages/iscsi-target/iscsi-target_svn.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+PR = "r12"
+
+SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \
+	   file://libs.patch;patch=1 \
+	   file://init \
+	   file://ietd.conf \
+		"
+
+DEPENDS = " openssl"
+RDEPENDS = "kernel-module-crc32c kernel-module-libcrc32c"
+
+S = "${WORKDIR}/trunk"
+
+inherit module
+
+do_configure() {
+}
+
+CFLAGS  = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+LDFLAGS = "-L${STAGING_LIBDIR}"
+FILES_${PN} += " ${base_sbindir}"
+
+do_compile() {
+	oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'
+}
+
+do_install() {
+	# Module
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi
+	install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko
+
+	# Userspace utilities
+	install -d ${D}${base_sbindir}
+        install -m 0755 usr/ietd ${D}${base_sbindir}/ietd
+        install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm
+
+	# Config files, init scripts
+	mkdir -p ${D}${sysconfdir}/init.d
+	install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target
+	install -m 0644 ${WORKDIR}/ietd.conf ${D}${sysconfdir}/
+	install -m 0644 etc/initiators.allow ${D}${sysconfdir}/
+	install -m 0644 etc/initiators.deny ${D}${sysconfdir}/
+}