iscsi-target: moved to 1.4.20.2

also renamed the files dir to the more appropriate iscsi-target
added a DEFAULT_PREFERENCE = "-1" for beagleboard as
angstrom and minimal use a modified 2.6.32 kernel which breaks this recipe

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

9 files changed, 82 insertions, 47 deletions

diff --git a/recipes/iscsi-target/files/2.6.29.patch b/recipes/iscsi-target/iscsi-target/2.6.29.patch
index 24c1afbdd1..24c1afbdd1 100644
--- a/recipes/iscsi-target/files/2.6.29.patch
+++ b/recipes/iscsi-target/iscsi-target/2.6.29.patch
diff --git a/recipes/iscsi-target/files/2.6.31.patch b/recipes/iscsi-target/iscsi-target/2.6.31.patch
index 74c91f5d4c..74c91f5d4c 100644
--- a/recipes/iscsi-target/files/2.6.31.patch
+++ b/recipes/iscsi-target/iscsi-target/2.6.31.patch
diff --git a/recipes/iscsi-target/files/2.6.32.patch b/recipes/iscsi-target/iscsi-target/2.6.32.patch
index bda0d20470..bda0d20470 100644
--- a/recipes/iscsi-target/files/2.6.32.patch
+++ b/recipes/iscsi-target/iscsi-target/2.6.32.patch
diff --git a/recipes/iscsi-target/iscsi-target/Makefile.patch b/recipes/iscsi-target/iscsi-target/Makefile.patch
new file mode 100644
index 0000000000..3340b07240
--- /dev/null
+++ b/recipes/iscsi-target/iscsi-target/Makefile.patch
@@ -0,0 +1,26 @@
+Index: iscsitarget-1.4.20.2/Makefile
+===================================================================
+--- iscsitarget-1.4.20.2.orig/Makefile
++++ iscsitarget-1.4.20.2/Makefile
+@@ -26,11 +26,9 @@ else
+   endif
+ endif
+ 
+-KVER := $(shell $(CC) $(CFLAGS) -E -dM $(VERSION_FILE) | \
++KVER2 := $(shell $(CC) $(CFLAGS) -E -dM $(VERSION_FILE) | \
+ 	grep UTS_RELEASE | awk '{ print $$3 }' | sed 's/\"//g')
+ 
+-KMOD := /lib/modules/$(KVER)/extra
+-
+ KMAJ := $(shell echo $(KVER) | \
+ 	sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/')
+ KMIN := $(shell echo $(KVER) | \
+@@ -185,6 +183,8 @@ integ_check:
+ $(PATCHES): .patched.$(KVER)
+ 
+ .patched.$(KVER):
++	echo "KVER: " ${KVER}
++	echo "KREV: " ${KREV}
+ 	@set -e; \
+ 	if [ ! -e .patched.* ]; then \
+ 		for p in $(PATCHES); do \
diff --git a/recipes/iscsi-target/files/ietd.conf b/recipes/iscsi-target/iscsi-target/ietd.conf
index 4ddfe9dc9e..4ddfe9dc9e 100644
--- a/recipes/iscsi-target/files/ietd.conf
+++ b/recipes/iscsi-target/iscsi-target/ietd.conf
diff --git a/recipes/iscsi-target/files/init b/recipes/iscsi-target/iscsi-target/init
index d000adfe3c..d000adfe3c 100644
--- a/recipes/iscsi-target/files/init
+++ b/recipes/iscsi-target/iscsi-target/init
diff --git a/recipes/iscsi-target/files/libs.patch b/recipes/iscsi-target/iscsi-target/libs.patch
index 5108027cc4..5108027cc4 100644
--- a/recipes/iscsi-target/files/libs.patch
+++ b/recipes/iscsi-target/iscsi-target/libs.patch
diff --git a/recipes/iscsi-target/iscsi-target_1.4.20.1.bb b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb
deleted file mode 100644
index bcf86f99f0..0000000000
--- a/recipes/iscsi-target/iscsi-target_1.4.20.1.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-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://ietd.conf \
-           file://init"
-
-SRC_URI[md5sum] = "6e5e641b832d420e030d5efb59eca7ce"
-SRC_URI[sha256sum] = "994186389911d41a0d2a65b7001ff060f778e2c77f80bd98e03776b215e0732c"
-S = "${WORKDIR}/iscsitarget-${PV}"
-
-
-DEPENDS = "openssl"
-RRECOMMENDS_${PN} = "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}/
-}
diff --git a/recipes/iscsi-target/iscsi-target_1.4.20.2.bb b/recipes/iscsi-target/iscsi-target_1.4.20.2.bb
new file mode 100644
index 0000000000..db85aba929
--- /dev/null
+++ b/recipes/iscsi-target/iscsi-target_1.4.20.2.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
+HOMEPAGE = "http://iscsitarget.sourceforge.net/"
+LICENSE = "GPL"
+DEPENDS = "openssl"
+RRECOMMENDS_${PN} = "kernel-module-crc32c kernel-module-libcrc32c"
+PR = "r0"
+
+# this recipe has a DEFAULT_PREFERENCE -1 for beagleboard 
+# actually this probably is only needed for angstrom and minimal
+# angstrom and minimal at the moment of writing use a kernel for beagleboard
+# that advertises as 2.6.32 but has patches for 2.6.33 which cause
+# this recipe to fail. It is not really possible to fix it in this
+# recipe without breaking the recipes for other 2.6.32 kernels.
+# Actually a patch for the offending kernel to make it more 2.6.32 compliant
+# would be trivially simple and absolutely harmless, but the maintainer
+# of that recipe was not willing to even consider a patch.
+DEFAULT_PREFERENCE_beagleboard = "-1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
+           file://ietd.conf \
+           file://init \
+           file://Makefile.patch \
+           "
+SRC_URI[md5sum] = "2f23c0bfe124d79f5c20e34ef2aaff82"
+SRC_URI[sha256sum] = "0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388"
+
+S = "${WORKDIR}/iscsitarget-${PV}"
+
+inherit module
+
+do_configure() {
+}
+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}/
+}
+
+FILES_${PN} += " ${base_sbindir}"
+CFLAGS = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+LDFLAGS = "-L${STAGING_LIBDIR}"
+