summaryrefslogtreecommitdiff
path: root/packages/iscsi-target
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/iscsi-target
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/iscsi-target')
-rw-r--r--packages/iscsi-target/files/2.6.29.patch72
-rw-r--r--packages/iscsi-target/files/ietd.conf17
-rw-r--r--packages/iscsi-target/files/init36
-rw-r--r--packages/iscsi-target/files/libs.patch11
-rw-r--r--packages/iscsi-target/iscsi-target_0.4.17.bb45
-rw-r--r--packages/iscsi-target/iscsi-target_svn.bb48
6 files changed, 0 insertions, 229 deletions
diff --git a/packages/iscsi-target/files/2.6.29.patch b/packages/iscsi-target/files/2.6.29.patch
deleted file mode 100644
index 24c1afbdd1..0000000000
--- a/packages/iscsi-target/files/2.6.29.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: iscsitarget-0.4.17/kernel/block-io.c
-===================================================================
---- iscsitarget-0.4.17/kernel/block-io.c (revision 198)
-+++ iscsitarget-0.4.17/kernel/block-io.c (working copy)
-@@ -13,6 +13,7 @@
- #include <linux/blkdev.h>
- #include <linux/parser.h>
- #include <linux/buffer_head.h>
-+#include <linux/version.h>
-
- #include "iscsi.h"
- #include "iscsi_dbg.h"
-@@ -154,14 +155,22 @@
- {
- struct blockio_data *bio_data = volume->private;
- struct block_device *bdev;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
- int flags = LUReadonly(volume) ? MS_RDONLY : 0;
-+#else
-+ fmode_t flags = LUReadonly(volume) ? FMODE_READ : (FMODE_READ | FMODE_WRITE);
-+#endif
- int err = 0;
-
- bio_data->path = kstrdup(path, GFP_KERNEL);
- if (!bio_data->path)
- return -ENOMEM;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
- bdev = open_bdev_excl(path, flags, THIS_MODULE);
-+#else
-+ bdev = open_bdev_exclusive(path, flags, THIS_MODULE);
-+#endif
- if (IS_ERR(bdev)) {
- err = PTR_ERR(bdev);
- eprintk("Can't open device %s, error %d\n", path, err);
-@@ -324,8 +333,17 @@
- {
- struct blockio_data *bio_data = volume->private;
-
-- if (bio_data->bdev)
-+ if (bio_data->bdev) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
- close_bdev_excl(bio_data->bdev);
-+#else
-+ if (LUReadonly(volume)) {
-+ close_bdev_exclusive(bio_data->bdev, FMODE_READ);
-+ } else {
-+ close_bdev_exclusive(bio_data->bdev, FMODE_READ|FMODE_WRITE);
-+ }
-+#endif
-+ }
- kfree(bio_data->path);
-
- kfree(volume->private);
-Index: iscsitarget-0.4.17/kernel/conn.c
-===================================================================
---- iscsitarget-0.4.17/kernel/conn.c (revision 198)
-+++ iscsitarget-0.4.17/kernel/conn.c (working copy)
-@@ -46,9 +46,13 @@
- "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
- break;
- case AF_INET6:
-+#ifdef NIP6
- snprintf(buf, sizeof(buf),
- "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
- NIP6(inet6_sk(sk)->daddr));
-+#else
-+ snprintf(buf, sizeof(buf), "[%p6]", &inet6_sk(sk)->daddr);
-+#endif
- break;
- default:
- break;
diff --git a/packages/iscsi-target/files/ietd.conf b/packages/iscsi-target/files/ietd.conf
deleted file mode 100644
index 4ddfe9dc9e..0000000000
--- a/packages/iscsi-target/files/ietd.conf
+++ /dev/null
@@ -1,17 +0,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/files/init b/packages/iscsi-target/files/init
deleted file mode 100644
index d000adfe3c..0000000000
--- a/packages/iscsi-target/files/init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/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
deleted file mode 100644
index 5108027cc4..0000000000
--- a/packages/iscsi-target/files/libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.17.bb b/packages/iscsi-target/iscsi-target_0.4.17.bb
deleted file mode 100644
index 07cbee90df..0000000000
--- a/packages/iscsi-target/iscsi-target_0.4.17.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
-HOMEPAGE = "http://iscsitarget.sourceforge.net/"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \
- file://libs.patch;patch=1 \
- file://2.6.29.patch;patch=1 \
- file://ietd.conf \
- file://init"
-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}/
-}
diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb
deleted file mode 100644
index 774674002e..0000000000
--- a/packages/iscsi-target/iscsi-target_svn.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux"
-HOMEPAGE = "http://iscsitarget.sourceforge.net/"
-LICENSE = "GPL"
-PR = "r13"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \
- file://libs.patch;patch=1 \
- file://init \
- file://ietd.conf \
- "
-
-DEPENDS = " openssl"
-RRECOMMENDS = "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}/
-}