iscsi-target: updated to 1.4.19

updated to 1.4.19
added patch for 2.6.31 (from iscsi-target svn)
added patch for 2.6.32 (from
http://sourceforge.net/mailarchive/message.php?msg_name=1260776327.3623.335.camel%40blackadder)

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

3 files changed, 173 insertions, 0 deletions

diff --git a/recipes/iscsi-target/files/2.6.31.patch b/recipes/iscsi-target/files/2.6.31.patch
new file mode 100644
index 0000000000..74c91f5d4c
--- /dev/null
+++ b/recipes/iscsi-target/files/2.6.31.patch
@@ -0,0 +1,16 @@
+Index: iscsitarget-1.4.19/patches/compat-2.6.31.patch
+===================================================================
+--- /dev/null
++++ iscsitarget-1.4.19/patches/compat-2.6.31.patch
+@@ -0,0 +1,11 @@
++--- sync/kernel/file-io.c       2009-12-10 17:43:36.000000000 -0500
+++++ trunk/kernel/file-io.c      2008-12-04 17:35:21.000000000 -0500
++@@ -88,7 +88,7 @@
++                count = lu->blk_cnt << lu->blk_shift;
++        }
++ 
++-       res = filemap_write_and_wait_range(mapping, ppos, ppos + count - 1);
+++       res = sync_page_range(inode, mapping, ppos, count);
++        if (res) {
++                eprintk("I/O error: syncing pages failed: %d\n", res);
++                return -EIO;
diff --git a/recipes/iscsi-target/files/2.6.32.patch b/recipes/iscsi-target/files/2.6.32.patch
new file mode 100644
index 0000000000..bda0d20470
--- /dev/null
+++ b/recipes/iscsi-target/files/2.6.32.patch
@@ -0,0 +1,107 @@
+Index: x/kernel/file-io.c
+===================================================================
+--- x/kernel/file-io.c	(revision 276)
++++ x/kernel/file-io.c	(working copy)
+@@ -88,7 +88,7 @@
+ 		count = lu->blk_cnt << lu->blk_shift;
+ 	}
+ 
+-	res = sync_page_range(inode, mapping, ppos, count);
++	res = filemap_write_and_wait_range(mapping, ppos, ppos + count - 1);
+ 	if (res) {
+ 		eprintk("I/O error: syncing pages failed: %d\n", res);
+ 		return -EIO;
+Index: x/dkms.conf
+===================================================================
+--- x/dkms.conf	(revision 276)
++++ x/dkms.conf	(working copy)
+@@ -20,33 +20,36 @@
+ # Patches newest - oldest, distro spec at bottom
+ #
+ 
+-PATCH[0]="compat-2.6.29.patch"
+-PATCH_MATCH[0]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)"
++PATCH[0]="compat-2.6.31.patch"
++PATCH_MATCH[0]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)"
+ 
+-PATCH[1]="compat-2.6.28.patch"
+-PATCH_MATCH[1]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)"
++PATCH[1]="compat-2.6.29.patch"
++PATCH_MATCH[1]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29)"
+ 
+-PATCH[2]="compat-2.6.25-2.6.27.patch"
+-PATCH_MATCH[2]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)"
++PATCH[2]="compat-2.6.28.patch"
++PATCH_MATCH[2]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28)"
+ 
+-PATCH[3]="compat-2.6.24.patch"
+-PATCH_MATCH[3]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)"
++PATCH[3]="compat-2.6.25-2.6.27.patch"
++PATCH_MATCH[3]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24|25|26|27)"
+ 
+-PATCH[4]="compat-2.6.23.patch"
+-PATCH_MATCH[4]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)"
++PATCH[4]="compat-2.6.24.patch"
++PATCH_MATCH[4]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23|24)"
+ 
+-PATCH[5]="compat-2.6.22.patch"
+-PATCH_MATCH[5]="2\.6\.(9|14|15|16|17|18|19|20|21|22)"
++PATCH[5]="compat-2.6.23.patch"
++PATCH_MATCH[5]="2\.6\.(9|14|15|16|17|18|19|20|21|22|23)"
+ 
+-PATCH[6]="compat-2.6.19-2.6.21.patch"
+-PATCH_MATCH[6]="2\.6\.(9|14|15|16|17|18|19|20|21)"
++PATCH[6]="compat-2.6.22.patch"
++PATCH_MATCH[6]="2\.6\.(9|14|15|16|17|18|19|20|21|22)"
+ 
+-PATCH[7]="compat-2.6.14-2.6.18.patch"
+-PATCH_MATCH[7]="2\.6\.(9|14|15|16|17|18)"
++PATCH[7]="compat-2.6.19-2.6.21.patch"
++PATCH_MATCH[7]="2\.6\.(9|14|15|16|17|18|19|20|21)"
+ 
+-PATCH[8]="compat-sles10sp2.patch"
+-PATCH_MATCH[8]="2\.6\.16\.60-.*"
++PATCH[8]="compat-2.6.14-2.6.18.patch"
++PATCH_MATCH[8]="2\.6\.(9|14|15|16|17|18)"
+ 
+-PATCH[9]="compat-rhel4.patch"
+-PATCH_MATCH[9]="2\.6\.9-.*\.(el|plus\.c4)"
++PATCH[9]="compat-sles10sp2.patch"
++PATCH_MATCH[9]="2\.6\.16\.60-.*"
+ 
++PATCH[10]="compat-rhel4.patch"
++PATCH_MATCH[10]="2\.6\.9-.*\.(el|plus\.c4)"
++
+Index: x/patches/compat-2.6.31.patch
+===================================================================
+--- x/patches/compat-2.6.31.patch	(revision 0)
++++ x/patches/compat-2.6.31.patch	(revision 0)
+@@ -0,0 +1,11 @@
++--- sync/kernel/file-io.c	2009-12-10 17:43:36.000000000 -0500
+++++ trunk/kernel/file-io.c	2008-12-04 17:35:21.000000000 -0500
++@@ -88,7 +88,7 @@
++ 		count = lu->blk_cnt << lu->blk_shift;
++ 	}
++ 
++-	res = filemap_write_and_wait_range(mapping, ppos, ppos + count - 1);
+++	res = sync_page_range(inode, mapping, ppos, count);
++ 	if (res) {
++ 		eprintk("I/O error: syncing pages failed: %d\n", res);
++ 		return -EIO;
+Index: x/Makefile
+===================================================================
+--- x/Makefile	(revision 276)
++++ x/Makefile	(working copy)
+@@ -51,6 +51,11 @@
+ # base first the earlier patch sets will not need to be modified.
+ #
+ 
++# Compatibility patch for kernels <= 2.6.31
++ifeq ($(call kver_le,2,6,31),1)
++	PATCHES := $(PATCHES) compat-2.6.31.patch
++endif
++
+ # Compatibility patch for kernels <= 2.6.29
+ ifeq ($(call kver_le,2,6,29),1)
+ 	PATCHES := $(PATCHES) compat-2.6.29.patch
+
diff --git a/recipes/iscsi-target/iscsi-target_1.4.19.bb b/recipes/iscsi-target/iscsi-target_1.4.19.bb
new file mode 100644
index 0000000000..ce23e2ff91
--- /dev/null
+++ b/recipes/iscsi-target/iscsi-target_1.4.19.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz;name=iscsitarget1419targz \
+
+           file://libs.patch;patch=1 \
+           file://2.6.31.patch;patch=1 \
+           file://2.6.32.patch;patch=1 \
+           file://ietd.conf \
+           file://init"
+SRC_URI[iscsitarget1419targz.md5sum] = "9beca214c28949cce1716b49fec57de4"
+SRC_URI[iscsitarget1419targz.sha256sum] = "a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a"
+S = "${WORKDIR}/iscsitarget-${PV}"
+
+
+DEPENDS = "openssl"
+RRECOMMENDS = "kernel-module-crc32c kernel-module-libcrc32c"
+
+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}/
+}