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 1QXFyB-0006Dp-T3 for garchives@archives.gentoo.org; Thu, 16 Jun 2011 17:03:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C32AA1C0A5; Thu, 16 Jun 2011 17:02:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 705831C0A5 for ; Thu, 16 Jun 2011 17:02:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 974881B4026 for ; Thu, 16 Jun 2011 17:02:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EA2778003C for ; Thu, 16 Jun 2011 17:02:52 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <29f1e476b0cbbac59c7a76892bd8f050208a90f7.sping@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: sys-block/open-iscsi/files/, sys-block/open-iscsi/ X-VCS-Repository: proj/betagarden X-VCS-Files: sys-block/open-iscsi/files/initiatorname.iscsi sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.patch sys-block/open-iscsi/files/open-iscsi-2.0.872-glibc212.patch sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d sys-block/open-iscsi/files/open-iscsi-2.0.872-ldflags.patch sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-cleanup.patch sys-block/open-iscsi/open-iscsi-2.0.872.ebuild X-VCS-Directories: sys-block/open-iscsi/files/ sys-block/open-iscsi/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 29f1e476b0cbbac59c7a76892bd8f050208a90f7 Date: Thu, 16 Jun 2011 17:02:52 +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: X-Archives-Hash: 68a0dcfcf171df8e68b1784856b5025f commit: 29f1e476b0cbbac59c7a76892bd8f050208a90f7 Author: Sebastian Pipping pipping org> AuthorDate: Thu Jun 16 17:01:14 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu Jun 16 17:01:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3D29f1e476 sys-block/open-iscsi: Remove, equivalent in gentoo-x86 --- sys-block/open-iscsi/files/initiatorname.iscsi | 31 ----- .../open-iscsi/files/open-iscsi-2.0.872-conf.d | 18 --- .../open-iscsi-2.0.872-dont-call-configure.patch | 11 -- .../files/open-iscsi-2.0.872-glibc212.patch | 10 -- .../open-iscsi/files/open-iscsi-2.0.872-init.d | 131 --------------= ------ .../files/open-iscsi-2.0.872-ldflags.patch | 11 -- .../open-iscsi-2.0.872-makefile-cleanup.patch | 20 --- sys-block/open-iscsi/open-iscsi-2.0.872.ebuild | 97 --------------= - 8 files changed, 0 insertions(+), 329 deletions(-) diff --git a/sys-block/open-iscsi/files/initiatorname.iscsi b/sys-block/o= pen-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 l= ater -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/initiatorn= ame.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=3Diqn.2005-09.tld.domain.hostname:openiscsi-initiator -#InitiatorAlias=3Dfoobar - -# 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=3Diqn.2001-03.uk.co.foobar.linux:openiscsi-29b48ad602d5f= 83dd9cd9aa3ef741216 - -# 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=3Diqn.2001-03.local.foobar.linux:openiscsi-29b48ad602d5f= 83dd9cd9aa3ef741216 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-conf.d b/sys-b= lock/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=3D/etc/iscsi/iscsid.conf - -# you need to specify an initiatorname in the file -INITIATORNAME_FILE=3D/etc/iscsi/initiatorname.iscsi - -# options to pass to iscsid -OPTS=3D"-i ${INITIATORNAME_FILE}" - -# Start automatic targets when iscsid is started -AUTOSTARTTARGETS=3D"yes" - -# if set to "strict", iscsid will stop, if connecting the -# autostart targets failed -# AUTOSTART=3D"strict" - diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-conf= igure.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-con= figure.patch deleted file mode 100644 index 185f1ac..0000000 --- a/sys-block/open-iscsi/files/open-iscsi-2.0.872-dont-call-configure.p= atch +++ /dev/null @@ -1,11 +0,0 @@ ---- open-iscsi-2.0-872.orig/Makefile -+++ open-iscsi-2.0-872/Makefile -@@ -27,7 +27,7 @@ IFACEFILES =3D etc/iface.example - all: user kernel -=20 - 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 - #include - #include -+#include -=20 - #include "iscsid.h" - #include "mgmt_ipc.h" diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d b/sys-b= lock/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 l= ater -# $Header: $ - -opts=3D"${opts} starttargets stoptargets restarttargets" - -depend() { - after modules - use net -} - -PIDFILE=3D${PIDFILE:-/var/run/${SVCNAME}.pid} -BINARY=3D"/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=3Diqn\= ." ${INITIATORNAME_FILE})" ]; then - ewarn "${INITIATORNAME_FILE} should contain a string with your initiat= ior name." - IQN=3Diqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=3D".";}{x=3DN= F; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openisc= si - IQN=3D${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md= 5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g') - ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" - echo "InitiatorName=3D${IQN}" >> "${INITIATORNAME_FILE}" - eend $? - fi -} - -do_modules() { - msg=3D"$1" - shift - modules=3D"${1}" - shift - modopts=3D"$@" - for m in ${modules} - do - if [ -n "$(modprobe -l | grep ${m})" ] - then - ebegin "${msg} ${m}" - modprobe ${modopts} ${m} - ret=3D$? - 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=3D$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - ebegin "Loading iSCSI modules" - do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' - ret=3D$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS} - ret=3D$? - if [ $ret -ne 0 ]; then - eend $? - return $? - fi - - # Start automatic targets when iscsid is started - if [ "${AUTOSTARTTARGETS}" =3D "yes" ]; then - starttargets - ret=3D$? - if [ "${AUTOSTART}" =3D "strict" ] && [ $ret -ne 0 ]; then - stop - return $ret - fi - fi - return 0 -} -=09 -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 lib= iscsi' '-r' - eend $? -} - -starttargets() { - ebegin "Setting up iSCSI targets" - /usr/sbin/iscsiadm -m node --loginall=3Dautomatic - ret=3D$? - eend $ret - return $ret -} - -stoptargets() { - ebegin "Disconnecting iSCSI targets" - sync - /usr/sbin/iscsiadm -m node --logoutall=3Dall - ret=3D$? - 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) -=20 - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ -=20 - clean: - rm -f *.o $(PROGRAMS) .depend diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-makefile-clean= up.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.patc= h +++ /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 @@ -=20 - 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 -lcryp= to -=20 - 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 -lcryp= to -=20 - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SR= CS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) -static $(LDFLAGS) $^ -o $@ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) -=20 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/o= pen-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.8= 71.3.ebuild,v 1.3 2010/08/24 13:48:01 ssuominen Exp $ - -EAPI=3D2 -inherit versionator linux-info eutils flag-o-matic - -DESCRIPTION=3D"Open-iSCSI is a high performance, transport independent, = multi-platform implementation of RFC3720" -HOMEPAGE=3D"http://www.open-iscsi.org/" -MY_PV=3D"${PN}-$(replace_version_separator 2 "-" $MY_PV)" -SRC_URI=3D"mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/$= {MY_PV}.tar.gz" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~arm ~mips ~ppc ~x86" -IUSE=3D"debug slp" -DEPEND=3D"slp? ( net-libs/openslp )" -RDEPEND=3D"${DEPEND} - sys-apps/util-linux" - -S=3D"${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 iS= CSI - # support loaded as module. Kernel builtion options don't work. See thi= s for - # more information: - # http://groups.google.com/group/open-iscsi/browse_thread/thread/cc1049= 8655b40507/fd6a4ba0c8e91966 - # If there's a new release, check whether this is still valid! - CONFIG_CHECK_MODULES=3D"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=3D"-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=3D"${KV_DIR}" CFLAGS=3D"" emake OPTFLAGS=3D"${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=3D'/etc/iscsi/initiatorname.iscsi' - if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then - cp -f "${ROOT}${in}.example" "${ROOT}${in}" - fi -}