summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2012-04-17 01:16:44 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2012-04-17 01:16:44 +0400
commita12e1688cf4bdb97bcce6f428e285631c6329aab (patch)
tree605830c048cf6937d45b44f01de4b977ebe2e168
parentAlready have versions in tree (diff)
downloadalexxy-a12e1688cf4bdb97bcce6f428e285631c6329aab.tar.gz
alexxy-a12e1688cf4bdb97bcce6f428e285631c6329aab.tar.bz2
alexxy-a12e1688cf4bdb97bcce6f428e285631c6329aab.zip
Moved to tree
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
-rw-r--r--dev-python/configshell/configshell-9999.ebuild27
-rw-r--r--dev-python/configshell/metadata.xml10
-rw-r--r--dev-python/rtslib/metadata.xml10
-rw-r--r--dev-python/rtslib/rtslib-9999.ebuild35
-rw-r--r--sys-block/lio-utils/files/snmp-makefile.patch22
-rw-r--r--sys-block/lio-utils/files/target.initd137
-rw-r--r--sys-block/lio-utils/files/tools-makefile.patch8
-rw-r--r--sys-block/lio-utils/lio-utils-9999.ebuild99
-rw-r--r--sys-block/lio-utils/metadata.xml8
-rw-r--r--sys-block/rtsadmin/metadata.xml10
-rw-r--r--sys-block/rtsadmin/rtsadmin-9999.ebuild36
-rw-r--r--sys-block/targetcli/metadata.xml10
-rw-r--r--sys-block/targetcli/targetcli-9999.ebuild30
13 files changed, 0 insertions, 442 deletions
diff --git a/dev-python/configshell/configshell-9999.ebuild b/dev-python/configshell/configshell-9999.ebuild
deleted file mode 100644
index 2657749..0000000
--- a/dev-python/configshell/configshell-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils git-2 python
-
-DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/"
-SRC_URI=""
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- dev-python/epydoc
- dev-python/simpleparse
- "
-RDEPEND="${DEPEND}"
diff --git a/dev-python/configshell/metadata.xml b/dev-python/configshell/metadata.xml
deleted file mode 100644
index 59fc80b..0000000
--- a/dev-python/configshell/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
- <maintainer>
- <email>alexxy@gentoo.org</email>
- <name>Alexey Shvetsov</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-python/rtslib/metadata.xml b/dev-python/rtslib/metadata.xml
deleted file mode 100644
index 59fc80b..0000000
--- a/dev-python/rtslib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
- <maintainer>
- <email>alexxy@gentoo.org</email>
- <name>Alexey Shvetsov</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-python/rtslib/rtslib-9999.ebuild b/dev-python/rtslib/rtslib-9999.ebuild
deleted file mode 100644
index b4d7949..0000000
--- a/dev-python/rtslib/rtslib-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils git-2 python
-
-DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/"
-SRC_URI=""
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- dev-python/configobj
- dev-python/ipaddr
- dev-python/netifaces
- "
-RDEPEND="${DEPEND}"
-
-src_install() {
- distutils_src_install
- keepdir /var/target/fabric
- insinto /var/target/fabric
- doins specs/*.spec
-}
diff --git a/sys-block/lio-utils/files/snmp-makefile.patch b/sys-block/lio-utils/files/snmp-makefile.patch
deleted file mode 100644
index f9301ae..0000000
--- a/sys-block/lio-utils/files/snmp-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mib-modules/Makefile.old 2011-06-21 00:26:30.000000000 +0400
-+++ mib-modules/Makefile 2011-06-21 00:29:28.000000000 +0400
-@@ -18,8 +18,8 @@
- iscsiAuthData.o
-
- CC = gcc
--CFLAGS = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
--CFLAGS += -I../include -Wall -Werror
-+INCLUDES = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup
-+INCLUDES += -I../include
- #CFLAGS +=$(AUTO_CFLAGS)
-
- LD = gcc -shared
-@@ -29,7 +29,7 @@
- all: $(TARG)
-
- %.o: %.c *.h
-- $(CC) $(CFLAGS) -o $@ -c $<
-+ $(CC) -fPIC $(INCLUDES) $(CFLAGS) -o $@ -c $<
-
- $(TARG): $(OBJS)
- $(LD) -o $@ $(OBJS)
diff --git a/sys-block/lio-utils/files/target.initd b/sys-block/lio-utils/files/target.initd
deleted file mode 100644
index 1cf6afa..0000000
--- a/sys-block/lio-utils/files/target.initd
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-description="Linux-iSCSI.org target"
-
-depend() {
- after modules
- use net
-}
-
-MODNAME="target_core_mod"
-
-TCM_CFS_DIR="/sys/kernel/config/target/core"
-LIO_CFS_DIR="/sys/kernel/config/target/iscsi"
-TCM_NODE="/usr/sbin/tcm_node"
-LIO_NODE="/usr/sbin/lio_node"
-TCM_FABRIC="/usr/sbin/tcm_fabric"
-CONFIGFS_SCRIPT_DIR="/etc/target"
-TCM_CONFIGFS_SCRIPT="/etc/target/tcm_start.sh"
-LIO_CONFIGFS_SCRIPT="/etc/target/lio_start.sh"
-TCM_CORE_MODULE="target_core_mod"
-TCM_CORE_IO_MODULES="target_core_iblock target_core_file target_core_pscsi"
-FABRICS_MODULES="tcm_fc tcm_loop ib_srpt"
-LIO_MODULE="iscsi_target_mod"
-
-checkconfig() {
- if ! modinfo ${TCM_CORE_MODULE} > /dev/null 2>&1 ; then
- eerror "Target Core modules not found!"
- return 1
- elif ! modinfo ${LIO_MODULE} > /dev/null 2>&1 ; then
- eerror "Linux iSCSI modules not found!"
- return 1
- elif [ ! -f ${TCM_CONFIGFS_SCRIPT} ]; then
- eerror "${TCM_CONFIGFS_SCRIPT} does not exist. run targetcli to configure your target!"
- return 1
- elif [ ! -f ${LIO_CONFIGFS_SCRIPT} ]; then
- eerror "${LIO_CONFIGFS_SCRIPT} does not exist. run targetcli to configure your target!"
- return 1
- fi
-}
-
-fabrics_start() {
- ebegin "Starting Targets: "
- for module in ${FABRICS_MODULES}; do
- if modinfo $module > /dev/null 2>&1 ; then
- ebegin "Loading ${module}"
- modprobe ${module}
- eend $?
- fi
- done
- for cfgscript in ${CONFIGFS_SCRIPT_DIR}/*.sh; do
- if [ ! -f ${cfgscript} ]; then
- continue
- fi
- # target core is handled in tcm_start
- if [ ${cfgscript} == ${TCM_CONFIGFS_SCRIPT} ]; then
- continue
- fi
- # iscsi-target fabric module is handled in lio_target_start
- if [ ${cfgscript} == ${LIO_CONFIGFS_SCRIPT} ]; then
- continue
- fi
- ebegin "Calling ConfigFS script $cfgscript: "
- sh ${cfgscript} > /dev/null 2>&1
- eend $?
- done
- eend $?
-}
-
-lio_target_start() {
- ebegin "Loading iSCSI target modules: ${LIO_MODULE}"
- modprobe ${LIO_MODULE}
- eend $?
- ebegin "Configuring iSCSI target iscsi_target_mod"
- sh ${LIO_CONFIGFS_SCRIPT} > /dev/null 2>&1
- eend $?
-}
-
-tcm_start() {
- ebegin "Loading Target Core modules : ${TCM_CORE_MODULE}"
- modprobe ${TCM_CORE_MODULE}
- eend $?
- ebegin "Loading Target Core backend modules: "
- for module in ${TCM_CORE_IO_MODULES} ; do
- ebegin "${module}"
- modprobe ${module}
- eend $?
- done
- eend $?
- ebegin "Calling ConfigFS script $TCM_CONFIGFS_SCRIPT for target_core_mod"
- sh ${TCM_CONFIGFS_SCRIPT} > /dev/null 2>&1
- eend $?
-}
-
-lio_target_stop() {
- ebegin "Unload Linux-iSCSI.org Fabric module"
- ${LIO_NODE} --unload
- eend $?
-}
-
-fabrics_stop() {
- ebegin "Unloading misc fabric modules: "
- ${TCM_FABRIC} --unloadall
- eend $?
-}
-
-tcm_stop() {
- ebegin "Unloading Target Core modules: "
- $TCM_NODE --unload
- eend $?
-}
-
-start() {
- checkconfig
- tcm_start
- lio_target_start
- fabrics_start
-}
-
-stop() {
- lio_target_stop
- fabrics_stop
- tcm_stop
-}
-
-status() {
- if [[ -d ${TCM_CFS_DIR} && -d ${LIO_CFS_DIR} ]]; then
- einfo "Target core mode status"
- ${TCM_NODE} --listhbas
- einfo "Linux iSCSI status"
- ${LIO_NODE} --listendpoints
- else
- einfo "Target not started (yet)"
- fi
-}
diff --git a/sys-block/lio-utils/files/tools-makefile.patch b/sys-block/lio-utils/files/tools-makefile.patch
deleted file mode 100644
index d9ee040..0000000
--- a/sys-block/lio-utils/files/tools-makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- tools/Makefile 2011-06-20 23:25:07.000000000 +0400
-+++ tools/Makefile 2011-06-21 00:06:26.000000000 +0400
-@@ -12,4 +12,5 @@
- rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME)
-
- install:
-+ mkdir -p $(DESTDIR)/usr/sbin
- install -m 0755 $(ISCSI_NAME) $(DESTDIR)/usr/sbin/iscsi-name
diff --git a/sys-block/lio-utils/lio-utils-9999.ebuild b/sys-block/lio-utils/lio-utils-9999.ebuild
deleted file mode 100644
index e4c7215..0000000
--- a/sys-block/lio-utils/lio-utils-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://linux-iscsi.org/lio-utils.git"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils git-2 python linux-info
-
-DESCRIPTION="Tools for controlling target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="snmp"
-
-DEPEND="snmp? ( net-analyzer/net-snmp )"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~TARGET_CORE"
-
-src_prepare(){
- local module
-
- for module in tcm-py lio-py; do
- cd ${module}
- distutils_src_prepare
- cd ..
- done
- epatch "${FILESDIR}"/tools-makefile.patch
- epatch "${FILESDIR}"/snmp-makefile.patch
-}
-
-src_compile(){
- local module
-
- for module in tcm-py lio-py; do
- cd ${module}
- distutils_src_compile
- cd ..
- done
- cd tools/
- emake || die "emake failed"
- cd ..
- if use snmp; then
- cd mib-modules/
- emake || die "emake snmp failed"
- cd ..
- fi
-}
-
-src_install(){
- local module
-
- for module in tcm-py lio-py; do
- cd ${module}
- distutils_src_install
- cd ..
- done
- cd tools/
- emake DESTDIR="${ED}" install || die "emake install failed"
- cd ..
-
- symlink_to_sbin(){
- local ver=$(python_get_version) sitedir="$(python_get_sitedir)"
- ln -s "${sitedir}"/lio_dump.py \
- "${ED}"/usr/sbin/lio_dump-${ver}
- python_convert_shebangs "${ver}" "${D}${sitedir}"/lio_dump.py
- ln -s "${sitedir}"/lio_node.py \
- "${ED}"/usr/sbin/lio_node-${ver}
- python_convert_shebangs "${ver}" "${D}${sitedir}"/lio_node.py
- ln -s "${sitedir}"/tcm_dump.py \
- "${ED}"/usr/sbin/tcm_dump-${ver}
- python_convert_shebangs "${ver}" "${D}${sitedir}"/tcm_dump.py
- ln -s "${sitedir}"/tcm_node.py \
- "${ED}"/usr/sbin/tcm_node-${ver}
- python_convert_shebangs "${ver}" "${D}${sitedir}"/tcm_node.py
- ln -s "${sitedir}"/tcm_fabric.py \
- "${ED}"/usr/sbin/tcm_fabric-${ver}
- python_convert_shebangs "${ver}" "${D}${sitedir}"/tcm_fabric.py
- }
- python_execute_function --action-message "Making symlinks to /usr/sbin" symlink_to_sbin
- python_generate_wrapper_scripts "${ED}"/usr/sbin/{lio_dump,lio_node,tcm_node,tcm_dump,tcm_fabric}
-
- if use snmp; then
- cd mib-modules/
- emake DESTDIR="${ED}" install || die "emake install snmp failed"
- cd ..
- fi
-
- emake DESTDIR="${ED}" conf_install || die "emake conf_install failed"
- newinitd "${FILESDIR}/target.initd" target
-}
diff --git a/sys-block/lio-utils/metadata.xml b/sys-block/lio-utils/metadata.xml
deleted file mode 100644
index ed40431..0000000
--- a/sys-block/lio-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cluster</herd>
-<longdescription>
- Tools for controlling target_core_mod/ConfigFS
-</longdescription>
-</pkgmetadata>
diff --git a/sys-block/rtsadmin/metadata.xml b/sys-block/rtsadmin/metadata.xml
deleted file mode 100644
index 59fc80b..0000000
--- a/sys-block/rtsadmin/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
- <maintainer>
- <email>alexxy@gentoo.org</email>
- <name>Alexey Shvetsov</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-block/rtsadmin/rtsadmin-9999.ebuild b/sys-block/rtsadmin/rtsadmin-9999.ebuild
deleted file mode 100644
index 34d2b6a..0000000
--- a/sys-block/rtsadmin/rtsadmin-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils git-2 python linux-info
-
-DESCRIPTION="RTSAdmin Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/"
-SRC_URI=""
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- dev-python/configshell
- dev-python/rtslib
- sys-block/lio-utils
- "
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~TARGET_CORE"
-
-src_install() {
- distutils_src_install
- keepdir /var/target/
- keepdir /var/target/fabric
-}
diff --git a/sys-block/targetcli/metadata.xml b/sys-block/targetcli/metadata.xml
deleted file mode 100644
index 59fc80b..0000000
--- a/sys-block/targetcli/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>python</herd>
- <herd>cluster</herd>
- <maintainer>
- <email>alexxy@gentoo.org</email>
- <name>Alexey Shvetsov</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-block/targetcli/targetcli-9999.ebuild b/sys-block/targetcli/targetcli-9999.ebuild
deleted file mode 100644
index 2e6ee30..0000000
--- a/sys-block/targetcli/targetcli-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils git-2 python linux-info
-
-DESCRIPTION="The targetcli administration shell"
-HOMEPAGE="http://linux-iscsi.org/"
-SRC_URI=""
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- dev-python/configshell
- dev-python/rtslib
- sys-block/lio-utils
- "
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~TARGET_CORE"