summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2011-06-16 19:01:14 +0200
committerSebastian Pipping <sebastian@pipping.org>2011-06-16 19:01:14 +0200
commit29f1e476b0cbbac59c7a76892bd8f050208a90f7 (patch)
tree06372c8be31dcb339b1884101d21ddf0432fe37e /sys-block
parentInitial import (diff)
downloadbetagarden-29f1e476b0cbbac59c7a76892bd8f050208a90f7.tar.gz
betagarden-29f1e476b0cbbac59c7a76892bd8f050208a90f7.tar.bz2
betagarden-29f1e476b0cbbac59c7a76892bd8f050208a90f7.zip
sys-block/open-iscsi: Remove, equivalent in gentoo-x86
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/open-iscsi/Manifest9
-rw-r--r--sys-block/open-iscsi/files/initiatorname.iscsi31
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d18
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch11
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch10
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d131
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch11
-rw-r--r--sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch20
-rw-r--r--sys-block/open-iscsi/open-iscsi-2.0.872.ebuild97
9 files changed, 0 insertions, 338 deletions
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
deleted file mode 100644
index cc5a137..0000000
--- a/sys-block/open-iscsi/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX initiatorname.iscsi 1282 RMD160 6af81c25d2704e2c6bb98ff5155de91cdbd17ff7 SHA1 2d2b0a50652772e0e3a16f3a90ef5977639b97ee SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3
-AUX open-iscsi-2.0.872-conf.d 422 RMD160 b42412fd6782537a736420d656caf3b1f4369930 SHA1 315f0b30efdb2672f15fbc81406524f2959a9acc SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114
-AUX open-iscsi-2.0.872-dont-call-configure.patch 296 RMD160 c6f4a4c1b9d7906282b2e97feab36d4758be26bf SHA1 d70e262b79d6d887f4dff4b6d8fcb77f5bc87e8b SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241
-AUX open-iscsi-2.0.872-glibc212.patch 266 RMD160 604ad6250d64180d8eb668ef4e80e4835297ff5d SHA1 41eefceeaca246cc05e210eaa57c3fdc18254182 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca
-AUX open-iscsi-2.0.872-init.d 2858 RMD160 d325a9341e322a17ce5c04763e79df6becd1c50a SHA1 f6c212cb54589bb202a6fb2cbffb1cded0d13532 SHA256 53523baa65326af7c8fad536bfd8cfe414c53e45a0b753bce0e4a07bea8dc5f0
-AUX open-iscsi-2.0.872-ldflags.patch 309 RMD160 d947a35dcaed347d63395e9e8c58370fcfaed33d SHA1 8d258286c2d0187a366e62a0097e2eadfacdc29d SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941
-AUX open-iscsi-2.0.872-makefile-cleanup.patch 839 RMD160 3b80ae2baa0cac7cc45240d6fc81b9f7c7286f26 SHA1 5f746bedb32dfd79b58501b0945a78be11df9d81 SHA256 c0e92ba2211dd74e89dcc0c5793e02ad8ad06b41a07a0687007bba6415546dfd
-DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
-EBUILD open-iscsi-2.0.872.ebuild 2897 RMD160 a259d343d66ed46b97d103c8dc6d06d4707d0130 SHA1 055e07360e310b20b83d50fff638843368fb0c0e SHA256 41d9349c011f3c7c6ac1d3e51d560dcfba495b09ccd216771818d56e06c8114c
diff --git a/sys-block/open-iscsi/files/initiatorname.iscsi b/sys-block/open-iscsi/files/initiatorname.iscsi
deleted file mode 100644
index b2a0e02..0000000
--- a/sys-block/open-iscsi/files/initiatorname.iscsi
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/initiatorname.iscsi,v 1.2 2006/03/08 09:19:25 robbat2 Exp $
-#
-# This file must contain a InitiatorName entry!
-# white space is significent here!
-#InitiatorName=iqn.2005-09.tld.domain.hostname:openiscsi-initiator
-#InitiatorAlias=foobar
-
-# Sample documentation follows:
-
-# The InitiatorName should take the following format
-# iqn.${YEAR}-${MONTH}-${DOMAIN_REVERSED}.${HOSTNAME}:${UNIQUE_STRING}
-# Where YEAR and MONTH are the dates that your domain was registered.
-# You can use WHOIS to find when your domain was registered.
-# If you don't have a real domain in the outside world, invent one, but use
-# .local for your top-level.
-
-# Example case #1:
-# This assumes you own foobar.co.uk.
-# Domain name: foobar.co.uk.
-# Registration date: March 2001
-# Hostname: linux
-# InitiatorName=iqn.2001-03.uk.co.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216
-
-# Example case #2:
-# This assumes you don't have a domain of your own.
-# Domain name: foobar.local
-# Registration date: March 2001
-# Hostname: linux
-# InitiatorName=iqn.2001-03.local.foobar.linux:openiscsi-29b48ad602d5f83dd9cd9aa3ef741216
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d
deleted file mode 100644
index 02e584f..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d
+++ /dev/null
@@ -1,18 +0,0 @@
-# /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}"
-
-# Start automatic targets when iscsid is started
-AUTOSTARTTARGETS="yes"
-
-# if set to "strict", iscsid will stop, if connecting the
-# autostart targets failed
-# AUTOSTART="strict"
-
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch
deleted file mode 100644
index 185f1ac..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- open-iscsi-2.0-872.orig/Makefile
-+++ open-iscsi-2.0-872/Makefile
-@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example
- all: user kernel
-
- user: ;
-- cd utils/open-isns; ./configure; $(MAKE)
-+ cd utils/open-isns; $(MAKE)
- $(MAKE) -C utils/sysdeps
- $(MAKE) -C utils/fwparam_ibft
- $(MAKE) -C usr
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch
deleted file mode 100644
index 6171703..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr/iscsid.c 2010-10-10 23:06:37.000000000 +0200
-+++ usr/iscsid.c 2010-10-10 23:07:55.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <sys/utsname.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
-
- #include "iscsid.h"
- #include "mgmt_ipc.h"
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d
deleted file mode 100644
index 844ecdf..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: $
-
-opts="${opts} starttargets stoptargets restarttargets"
-
-depend() {
- after modules
- use net
-}
-
-PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
-BINARY="/usr/sbin/iscsid"
-
-checkconfig() {
- if [ ! -e /etc/conf.d/${SVCNAME} ]; then
- eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
- return 1
- fi
- if [ ! -e "${CONFIG_FILE}" ]; then
- eerror "Config file ${CONFIG_FILE} does not exist!"
- return 1
- fi
- if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; 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
- modopts="$@"
- for m in ${modules}
- do
- if [ -n "$(modprobe -l | grep ${m})" ]
- then
- ebegin "${msg} ${m}"
- modprobe ${modopts} ${m}
- ret=$?
- eend ${ret}
- if [ ${ret} -ne 0 ]; then
- return ${ret}
- fi
- else
- ebegin "${msg} ${m}: not found"
- return 1
- fi
- done
- return 0
-}
-
-start() {
- ebegin "Checking open-iSCSI configuration"
- checkconfig
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
- ebegin "Loading iSCSI modules"
- do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
- ret=$?
- if [ $ret -ne 0 ]; then
- eend 1
- return 1
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS}
- ret=$?
- if [ $ret -ne 0 ]; then
- eend $?
- return $?
- fi
-
- # Start automatic targets when iscsid is started
- if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
- starttargets
- ret=$?
- if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then
- stop
- return $ret
- fi
- fi
- return 0
-}
-
-stop() {
- stoptargets
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE}
- eend $?
-
- do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
- eend $?
-}
-
-starttargets() {
- ebegin "Setting up iSCSI targets"
- /usr/sbin/iscsiadm -m node --loginall=automatic
- ret=$?
- eend $ret
- return $ret
-}
-
-stoptargets() {
- ebegin "Disconnecting iSCSI targets"
- sync
- /usr/sbin/iscsiadm -m node --logoutall=all
- ret=$?
- eend $ret
- return $ret
-}
-
-restarttargets() {
- stoptargets
- starttargets
-}
-
-status() {
- ebegin "Showing current active iSCSI sessions"
- /usr/sbin/iscsiadm -m session
-}
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch
deleted file mode 100644
index fc02cbc..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/Makefile 2011-05-31 01:30:27.302609540 +0200
-+++ utils/Makefile 2011-05-31 01:32:50.229602790 +0200
-@@ -6,7 +6,7 @@
- all: $(PROGRAMS)
-
- iscsi-iname: md5.o iscsi-iname.o
-- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
-
- clean:
- rm -f *.o $(PROGRAMS) .depend
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch
deleted file mode 100644
index b3e93f4..0000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr/Makefile 2010-10-10 22:48:04.000000000 +0200
-+++ usr/Makefile.ori 2010-10-10 22:48:34.000000000 +0200
-@@ -53,14 +53,14 @@
-
- iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- iscsid.o session_mgmt.o discoveryd.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
-- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto
-
- iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
- iscsistart.o statics.o
-- $(CC) $(CFLAGS) -static $^ -o $@
-+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@
- clean:
- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
-
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
deleted file mode 100644
index 95ca214..0000000
--- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 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.871.3.ebuild,v 1.3 2010/08/24 13:48:01 ssuominen Exp $
-
-EAPI=2
-inherit versionator linux-info 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="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
-SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${MY_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="debug slp"
-DEPEND="slp? ( net-libs/openslp )"
-RDEPEND="${DEPEND}
- sys-apps/util-linux"
-
-S="${WORKDIR}/${MY_PV}"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if [ $KV_PATCH -lt 15 ]; then
- die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
- fi
-
- # Needs to be done, as iscsid currently only starts, when having the iSCSI
- # support loaded as module. Kernel builtion options don't work. See this for
- # more information:
- # http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
- # If there's a new release, check whether this is still valid!
- CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
- if linux_config_exists; then
- for module in ${CONFIG_CHECK_MODULES}; do
- linux_chkconfig_module ${module} || die "${module} needs to be built as module (builtin doesn't work)"
- done
- fi
-}
-
-src_prepare() {
- export EPATCH_OPTS="-d${S}"
- epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
- epatch "${FILESDIR}"/${P}-glibc212.patch
- epatch "${FILESDIR}"/${P}-dont-call-configure.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_configure() {
- cd utils/open-isns || die
- econf $(use_with slp)
-}
-
-src_compile() {
- use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
- einfo "Building userspace"
- cd "${S}" && \
- KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
- || die "emake failed"
-}
-
-src_install() {
- einfo "Installing userspace"
- dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
-
- einfo "Installing utilities"
- dosbin utils/iscsi-iname utils/iscsi_discovery || die
-
- einfo "Installing docs"
- doman doc/*[1-8] || die
- dodoc README THANKS || die
- docinto test || die
- dodoc test/* || die
-
- einfo "Installing configuration"
- insinto /etc/iscsi
- doins etc/iscsid.conf || die
- newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
- insinto /etc/iscsi/ifaces
- doins etc/iface.example || die
-
- newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
- newinitd "${FILESDIR}"/${P}-init.d iscsid || die
-
- keepdir /var/db/iscsi
- fperms 700 /var/db/iscsi || die
- fperms 600 /etc/iscsi/iscsid.conf || die
-}
-
-pkg_postinst() {
- in='/etc/iscsi/initiatorname.iscsi'
- if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
- cp -f "${ROOT}${in}.example" "${ROOT}${in}"
- fi
-}