[gentoo-commits] repo/gentoo:master commit in: sys-block/lio-utils/, profiles/, sys-block/lio-utils/files/

[gentoo-commits] repo/gentoo:master commit in: sys-block/lio-utils/, profiles/, sys-block/lio-utils/files/

[Michał Górny]

commit:     0ad71ddba2d6828dd3ea41609642b5d4c6ede2a2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 19:26:42 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 07:33:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad71ddb

sys-block/lio-utils: Remove last-rited pkg, #565824

 profiles/package.mask                          |   1 -
 sys-block/lio-utils/files/snmp-makefile.patch  |  22 ----
 sys-block/lio-utils/files/target.initd         | 136 -------------------------
 sys-block/lio-utils/files/tools-makefile.patch |   8 --
 sys-block/lio-utils/lio-utils-9999.ebuild      | 103 -------------------
 sys-block/lio-utils/metadata.xml               |  11 --
 6 files changed, 281 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 27e3415b625..2a0a4038ff1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -271,7 +271,6 @@ dev-libs/engine_pkcs11
 # One of the last packages to block distutils.eclass removal, #599838
 # and #599840. Furthermore, lio-utils is broken, #565824. Removal
 # in 30 days.
-sys-block/lio-utils
 sys-block/rtsadmin
 
 # Thomas Deutschmann <whissi@gentoo.org> (17 Feb 2017)

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 f9301ae7912..00000000000
--- 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 9f5a0d9d6d7..00000000000
--- a/sys-block/lio-utils/files/target.initd
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 d9ee0400d21..00000000000
--- 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 07203c91883..00000000000
--- a/sys-block/lio-utils/lio-utils-9999.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python_pkg_setup
-}
-
-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 e07ed9c9170..00000000000
--- a/sys-block/lio-utils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-<longdescription>
-	Tools for controlling target_core_mod/ConfigFS
-</longdescription>
-</pkgmetadata>