From 60070362753e9721c0a7b1fdd90bcebd3c1a5103 Mon Sep 17 00:00:00 2001
From: Tim 'timtim' Ellis <tim.ellis@foonas.org>
Date: Sat, 17 Jan 2009 23:12:02 +0000
Subject: iscsi-target: Move from 0.4.16 to 0.4.17 - move to an including an
 example config for safety.

---
 packages/iscsi-target/files/ietd.conf        | 34 ++++++++++-----------
 packages/iscsi-target/iscsi-target_0.4.16.bb | 43 ---------------------------
 packages/iscsi-target/iscsi-target_0.4.17.bb | 44 ++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 60 deletions(-)
 delete mode 100644 packages/iscsi-target/iscsi-target_0.4.16.bb
 create mode 100644 packages/iscsi-target/iscsi-target_0.4.17.bb

(limited to 'packages')

diff --git a/packages/iscsi-target/files/ietd.conf b/packages/iscsi-target/files/ietd.conf
index 0a100ac664..4ddfe9dc9e 100644
--- a/packages/iscsi-target/files/ietd.conf
+++ b/packages/iscsi-target/files/ietd.conf
@@ -1,17 +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
+#Target iqn.2007-01.org.foonas:iSCSI.sda.target1
+#        Lun 0 Path=/dev/sdb1,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/iscsi-target_0.4.16.bb b/packages/iscsi-target/iscsi-target_0.4.16.bb
deleted file mode 100644
index 0e50bfe22b..0000000000
--- a/packages/iscsi-target/iscsi-target_0.4.16.bb
+++ /dev/null
@@ -1,43 +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://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_0.4.17.bb b/packages/iscsi-target/iscsi-target_0.4.17.bb
new file mode 100644
index 0000000000..8acb945a71
--- /dev/null
+++ b/packages/iscsi-target/iscsi-target_0.4.17.bb
@@ -0,0 +1,44 @@
+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 \
+           file://libs.patch;patch=1 \
+           file://ietd.conf \
+           file://init"
+S = "${WORKDIR}/iscsitarget-${PV}"
+
+DEPENDS = "openssl"
+RDEPENDS = "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}/
+}
-- 
cgit v1.2.3