summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/open-iscsi/ChangeLog10
-rw-r--r--sys-block/open-iscsi/files/iscsid-2.0.868_rc1.conf.d11
-rw-r--r--sys-block/open-iscsi/files/iscsid-2.0.868_rc1.init.d66
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.868_rc1.ebuild101
4 files changed, 187 insertions, 1 deletions
diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 1d019311eac1..4defd086ce4f 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-block/open-iscsi
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.15 2008/01/14 02:09:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.16 2008/03/25 02:33:03 kingtaco Exp $
+
+*open-iscsi-2.0.868_rc1 (25 Mar 2008)
+
+ 25 Mar 2008; Mike Doty <kingtaco@gentoo.org>
+ +files/iscsid-2.0.868_rc1.conf.d, +files/iscsid-2.0.868_rc1.init.d,
+ +open-iscsi-2.0.868_rc1.ebuild:
+ adding open-iscsi-2.0.868_rc1.ebuild and related files thanks to Craig
+ <craig -at- haquarter.de> Bug 196096
14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
Add herd per email.
diff --git a/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.conf.d b/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.conf.d
new file mode 100644
index 000000000000..37dbbe14d04d
--- /dev/null
+++ b/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.conf.d
@@ -0,0 +1,11 @@
+# /etc/conf.d/iscsid
+
+# config file to use
+CONFIG_FILE=/etc/iscsi/iscsid.conf
+
+# you need to specify an initiatorname in the file
+INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
+
+# options to pass to iscsid
+OPTS="-i ${INITIATORNAME_FILE}"
+
diff --git a/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.init.d b/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.init.d
new file mode 100644
index 000000000000..2b70d6494b4b
--- /dev/null
+++ b/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.init.d
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.868_rc1.init.d,v 1.1 2008/03/25 02:33:04 kingtaco Exp $
+
+depend() {
+ after modules
+ use net
+}
+
+checkconfig() {
+ if [ ! -f $CONFIG_FILE ]; then
+ eerror "Config file $CONFIG_FILE does not exist!"
+ return 1
+ fi
+ if ! grep "^InitiatorName=iqn." ${INITIATORNAME_FILE} &>/dev/null; then
+ ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
+ IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
+ IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
+ ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
+ echo "InitiatorName=${IQN}" >> ${INITIATORNAME_FILE}
+ eend $?
+ fi
+}
+
+do_modules() {
+ msg="$1"
+ shift
+ modules="$1"
+ shift
+ opts="$@"
+ for m in ${modules}; do
+ ebegin "${msg} - ${m}"
+ modprobe ${opts} $m
+ ret=$?
+ eend $ret
+ [ $ret -ne 0 ] && return $ret
+ done
+ return 0
+}
+
+start() {
+ checkconfig
+ do_modules 'Loading iSCSI modules' 'scsi_transport_iscsi iscsi_tcp'
+ ret=$?
+ [ $ret -ne 0 ] && return 1
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS}
+ ret=$?
+ eend $ret
+ return $ret
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
+ eend $?
+
+ # ugly, but pid file is not removed by iscsid
+ rm -f $PID_FILE
+
+ do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi' '-r'
+ ret=$?
+ return $ret
+}
+
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.868_rc1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.868_rc1.ebuild
new file mode 100644
index 000000000000..2850f8d879b6
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.868_rc1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.868_rc1.ebuild,v 1.1 2008/03/25 02:33:03 kingtaco Exp $
+
+inherit versionator linux-mod eutils flag-o-matic
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/"
+MY_PV="$(replace_all_version_separators '-')"
+MY_PV="${PN}-$(replace_version_separator 1 "." $MY_PV)"
+SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~mips"
+IUSE="modules utils debug"
+DEPEND="virtual/libc
+ virtual/linux-sources"
+RDEPEND="${DEPEND}
+ virtual/modutils
+ sys-apps/util-linux"
+
+S="${WORKDIR}/${MY_PV}"
+
+MODULE_NAMES_ARG="kernel/drivers/scsi:${S}/kernel"
+MODULE_NAMES="iscsi_tcp(${MODULE_NAMES_ARG}) scsi_transport_iscsi(${MODULE_NAMES_ARG}) libiscsi(${MODULE_NAMES_ARG})"
+BUILD_TARGETS="all"
+CONFIG_CHECK="CRYPTO_CRC32C"
+ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
+
+src_unpack() {
+ unpack ${A}
+ export EPATCH_OPTS="-d${S}"
+ if [ $KV_PATCH -lt 15 ]; then
+ die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+ fi
+}
+
+src_compile() {
+ use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
+
+ if use modules; then
+ einfo "Building kernel modules"
+ export KSRC="${KERNEL_DIR}"
+ linux-mod_src_compile || die "failed to build modules"
+ fi
+
+ einfo "Building fwparam_ibft"
+ cd "${S}"/utils/fwparam_ibft && \
+ CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
+ || die "emake failed"
+
+ einfo "Building userspace"
+ cd "${S}"/usr && \
+ CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
+ || die "emake failed"
+
+ if use utils; then
+ einfo "Building utils"
+ cd "${S}"/utils && \
+ CFLAGS="" emake OPTFLAGS="${CFLAGS}" \
+ || die "emake failed"
+ fi
+}
+
+src_install() {
+ if use modules; then
+ einfo "Installing kernel modules"
+ export KSRC="${KERNEL_DIR}"
+ linux-mod_src_install
+ fi
+
+ einfo "Installing userspace"
+ dosbin usr/iscsid usr/iscsiadm usr/iscsistart
+
+ if use utils; then
+ einfo "Installing utilities"
+ dosbin utils/iscsi-iname utils/iscsi_discovery
+ fi
+
+ einfo "Installing docs"
+ doman doc/*[1-8]
+ dodoc README THANKS
+ docinto test
+ dodoc test/*
+
+ einfo "Installing configuration"
+ insinto /etc/iscsi
+ doins etc/iscsid.conf
+ doins "${FILESDIR}"/initiatorname.iscsi
+ insinto /etc/conf.d
+ newins "${FILESDIR}"/iscsid-${PV}.conf.d iscsid
+ newinitd "${FILESDIR}"/iscsid-${PV}.init.d iscsid
+
+ keepdir /var/db/iscsi
+ fperms 700 /var/db/iscsi
+ fperms 600 /etc/iscsi/iscsid.conf
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+}