From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SJtIU-00067Q-L0 for garchives@archives.gentoo.org; Mon, 16 Apr 2012 21:17:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF4EDE0788; Mon, 16 Apr 2012 21:17:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 988E4E0788 for ; Mon, 16 Apr 2012 21:17:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA2EA1B4007 for ; Mon, 16 Apr 2012 21:17:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 98762E5403 for ; Mon, 16 Apr 2012 21:17:09 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1334611004.a12e1688cf4bdb97bcce6f428e285631c6329aab.alexxy@gentoo> Subject: [gentoo-commits] dev/alexxy:master commit in: dev-python/rtslib/, sys-block/rtsadmin/, sys-block/lio-utils/files/, ... X-VCS-Repository: dev/alexxy X-VCS-Files: dev-python/configshell/configshell-9999.ebuild dev-python/configshell/metadata.xml dev-python/rtslib/metadata.xml dev-python/rtslib/rtslib-9999.ebuild sys-block/lio-utils/files/snmp-makefile.patch sys-block/lio-utils/files/target.initd sys-block/lio-utils/files/tools-makefile.patch sys-block/lio-utils/lio-utils-9999.ebuild sys-block/lio-utils/metadata.xml sys-block/rtsadmin/metadata.xml sys-block/rtsadmin/rtsadmin-9999.ebuild sys-block/targetcli/metadata.xml sys-block/targetcli/targetcli-9999.ebuild X-VCS-Directories: dev-python/rtslib/ sys-block/rtsadmin/ sys-block/lio-utils/files/ dev-python/configshell/ sys-block/targetcli/ sys-block/lio-utils/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: a12e1688cf4bdb97bcce6f428e285631c6329aab X-VCS-Branch: master Date: Mon, 16 Apr 2012 21:17:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ea008fea-2124-48d0-a82c-4102d982d753 X-Archives-Hash: f5611c10af2604eafda9a58035daf4c9 commit: a12e1688cf4bdb97bcce6f428e285631c6329aab Author: Alexey Shvetsov gentoo org> AuthorDate: Mon Apr 16 21:16:44 2012 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Mon Apr 16 21:16:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/alexxy.git;a=3D= commit;h=3Da12e1688 Moved to tree Signed-off-by: Alexey Shvetsov gentoo.org> --- dev-python/configshell/configshell-9999.ebuild | 27 ----- dev-python/configshell/metadata.xml | 10 -- dev-python/rtslib/metadata.xml | 10 -- dev-python/rtslib/rtslib-9999.ebuild | 35 ------ sys-block/lio-utils/files/snmp-makefile.patch | 22 ---- sys-block/lio-utils/files/target.initd | 137 ------------------= ------ sys-block/lio-utils/files/tools-makefile.patch | 8 -- sys-block/lio-utils/lio-utils-9999.ebuild | 99 ----------------- sys-block/lio-utils/metadata.xml | 8 -- sys-block/rtsadmin/metadata.xml | 10 -- sys-block/rtsadmin/rtsadmin-9999.ebuild | 36 ------ sys-block/targetcli/metadata.xml | 10 -- sys-block/targetcli/targetcli-9999.ebuild | 30 ----- 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=3D3 - -EGIT_REPO_URI=3D"git://linux-iscsi.org/${PN}.git" -PYTHON_DEPEND=3D"2" -RESTRICT_PYTHON_ABIS=3D"3.*" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit eutils distutils git-2 python - -DESCRIPTION=3D"ConfigShell Community Edition for target_core_mod/ConfigF= S" -HOMEPAGE=3D"http://linux-iscsi.org/" -SRC_URI=3D"" - -LICENSE=3D"AGPL-3" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - dev-python/epydoc - dev-python/simpleparse - " -RDEPEND=3D"${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 @@ - - - - python - cluster - - alexxy@gentoo.org - Alexey Shvetsov - - 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 @@ - - - - python - cluster - - alexxy@gentoo.org - Alexey Shvetsov - - diff --git a/dev-python/rtslib/rtslib-9999.ebuild b/dev-python/rtslib/rts= lib-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=3D3 - -EGIT_REPO_URI=3D"git://linux-iscsi.org/${PN}.git" -PYTHON_DEPEND=3D"2" -RESTRICT_PYTHON_ABIS=3D"3.*" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit eutils distutils git-2 python - -DESCRIPTION=3D"RTSLib Community Edition for target_core_mod/ConfigFS" -HOMEPAGE=3D"http://linux-iscsi.org/" -SRC_URI=3D"" - -LICENSE=3D"AGPL-3" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - dev-python/configobj - dev-python/ipaddr - dev-python/netifaces - " -RDEPEND=3D"${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/li= o-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 -=20 - CC =3D gcc --CFLAGS =3D -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup= -shared -fPIC --CFLAGS +=3D -I../include -Wall -Werror -+INCLUDES =3D -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgrou= p -+INCLUDES +=3D -I../include - #CFLAGS +=3D$(AUTO_CFLAGS) -=20 - LD =3D gcc -shared -@@ -29,7 +29,7 @@ - all: $(TARG) -=20 - %.o: %.c *.h=20 -- $(CC) $(CFLAGS) -o $@ -c $< -+ $(CC) -fPIC $(INCLUDES) $(CFLAGS) -o $@ -c $< -=20 - $(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=3D"Linux-iSCSI.org target" - -depend() { - after modules - use net -} - -MODNAME=3D"target_core_mod" - -TCM_CFS_DIR=3D"/sys/kernel/config/target/core" -LIO_CFS_DIR=3D"/sys/kernel/config/target/iscsi" -TCM_NODE=3D"/usr/sbin/tcm_node" -LIO_NODE=3D"/usr/sbin/lio_node" -TCM_FABRIC=3D"/usr/sbin/tcm_fabric" -CONFIGFS_SCRIPT_DIR=3D"/etc/target" -TCM_CONFIGFS_SCRIPT=3D"/etc/target/tcm_start.sh" -LIO_CONFIGFS_SCRIPT=3D"/etc/target/lio_start.sh" -TCM_CORE_MODULE=3D"target_core_mod" -TCM_CORE_IO_MODULES=3D"target_core_iblock target_core_file target_core_p= scsi" -FABRICS_MODULES=3D"tcm_fc tcm_loop ib_srpt" -LIO_MODULE=3D"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 config= ure your target!" - return 1 - elif [ ! -f ${LIO_CONFIGFS_SCRIPT} ]; then - eerror "${LIO_CONFIGFS_SCRIPT} does not exist. run targetcli to config= ure 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} =3D=3D ${TCM_CONFIGFS_SCRIPT} ]; then - continue - fi - # iscsi-target fabric module is handled in lio_target_start - if [ ${cfgscript} =3D=3D ${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_mo= d" - 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/l= io-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)=20 -=20 - 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-ut= ils/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=3D3 - -EGIT_REPO_URI=3D"git://linux-iscsi.org/lio-utils.git" -PYTHON_DEPEND=3D"2" -RESTRICT_PYTHON_ABIS=3D"3.*" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit eutils distutils git-2 python linux-info - -DESCRIPTION=3D"Tools for controlling target_core_mod/ConfigFS" -HOMEPAGE=3D"http://linux-iscsi.org/" -SRC_URI=3D"" - -LICENSE=3D"GPL-3" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"snmp" - -DEPEND=3D"snmp? ( net-analyzer/net-snmp )" -RDEPEND=3D"${DEPEND}" - -CONFIG_CHECK=3D"~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=3D"${ED}" install || die "emake install failed" - cd .. - - symlink_to_sbin(){ - local ver=3D$(python_get_version) sitedir=3D"$(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=3D"${ED}" install || die "emake install snmp failed" - cd .. - fi - - emake DESTDIR=3D"${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/metad= ata.xml deleted file mode 100644 index ed40431..0000000 --- a/sys-block/lio-utils/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -cluster - - Tools for controlling target_core_mod/ConfigFS - - diff --git a/sys-block/rtsadmin/metadata.xml b/sys-block/rtsadmin/metadat= a.xml deleted file mode 100644 index 59fc80b..0000000 --- a/sys-block/rtsadmin/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - python - cluster - - alexxy@gentoo.org - Alexey Shvetsov - - 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=3D3 - -EGIT_REPO_URI=3D"git://linux-iscsi.org/${PN}.git" -PYTHON_DEPEND=3D"2" -RESTRICT_PYTHON_ABIS=3D"3.*" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit eutils distutils git-2 python linux-info - -DESCRIPTION=3D"RTSAdmin Community Edition for target_core_mod/ConfigFS" -HOMEPAGE=3D"http://linux-iscsi.org/" -SRC_URI=3D"" - -LICENSE=3D"AGPL-3" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - dev-python/configshell - dev-python/rtslib - sys-block/lio-utils - " -RDEPEND=3D"${DEPEND}" - -CONFIG_CHECK=3D"~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/metad= ata.xml deleted file mode 100644 index 59fc80b..0000000 --- a/sys-block/targetcli/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - python - cluster - - alexxy@gentoo.org - Alexey Shvetsov - - diff --git a/sys-block/targetcli/targetcli-9999.ebuild b/sys-block/target= cli/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=3D3 - -EGIT_REPO_URI=3D"git://linux-iscsi.org/${PN}.git" -PYTHON_DEPEND=3D"2" -RESTRICT_PYTHON_ABIS=3D"3.*" -SUPPORT_PYTHON_ABIS=3D"1" - -inherit eutils distutils git-2 python linux-info - -DESCRIPTION=3D"The targetcli administration shell" -HOMEPAGE=3D"http://linux-iscsi.org/" -SRC_URI=3D"" - -LICENSE=3D"AGPL-3" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - dev-python/configshell - dev-python/rtslib - sys-block/lio-utils - " -RDEPEND=3D"${DEPEND}" - -CONFIG_CHECK=3D"~TARGET_CORE"