public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-block/open-iscsi: ChangeLog open-iscsi-2.0.872.ebuild
@ 2011-06-07 14:32 Sebastian Pipping (sping)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2011-06-07 14:32 UTC (permalink / raw
  To: gentoo-commits

sping       11/06/07 14:32:38

  Modified:             ChangeLog
  Added:                open-iscsi-2.0.872.ebuild
  Log:
  sys-block/open-iscsi: Bump to 2.0.872 (bug #340425)
  
  (Portage version: 2.1.10/cvs/Linux x86_64)

Revision  Changes    Path
1.32                 sys-block/open-iscsi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	24 Apr 2011 21:04:38 -0000	1.31
+++ ChangeLog	7 Jun 2011 14:32:38 -0000	1.32
@@ -1,6 +1,16 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.31 2011/04/24 21:04:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.32 2011/06/07 14:32:38 sping Exp $
+
+*open-iscsi-2.0.872 (07 Jun 2011)
+
+  07 Jun 2011; Sebastian Pipping <sping@gentoo.org> +open-iscsi-2.0.872.ebuild,
+  +files/open-iscsi-2.0.872-conf.d,
+  +files/open-iscsi-2.0.872-dont-call-configure.patch,
+  +files/open-iscsi-2.0.872-glibc212.patch, +files/open-iscsi-2.0.872-init.d,
+  +files/open-iscsi-2.0.872-ldflags.patch,
+  +files/open-iscsi-2.0.872-makefile-cleanup.patch:
+  Bump to 2.0.872 (bug #340425)
 
   24 Apr 2011; Ulrich Mueller <ulm@gentoo.org> open-iscsi-2.0.870.3-r1.ebuild:
   Replace dependency on virtual/modutils, bug 358891.



1.1                  sys-block/open-iscsi/open-iscsi-2.0.872.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild?rev=1.1&content-type=text/plain

Index: open-iscsi-2.0.872.ebuild
===================================================================
# 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.872.ebuild,v 1.1 2011/06/07 14:32:38 sping 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
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-block/open-iscsi: ChangeLog open-iscsi-2.0.872.ebuild
@ 2012-02-09  8:29 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2012-02-09  8:29 UTC (permalink / raw
  To: gentoo-commits

robbat2     12/02/09 08:29:45

  Modified:             ChangeLog open-iscsi-2.0.872.ebuild
  Log:
  Bug #383437: Fix iSNS SLP linking in the main binaries.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 sys-block/open-iscsi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -p -w -b -B -u -u -r1.38 -r1.39
--- ChangeLog	1 Feb 2012 14:21:56 -0000	1.38
+++ ChangeLog	9 Feb 2012 08:29:45 -0000	1.39
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.38 2012/02/01 14:21:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.39 2012/02/09 08:29:45 robbat2 Exp $
+
+  09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> open-iscsi-2.0.872.ebuild,
+  +files/open-iscsi-2.0.872-isns-slp.patch:
+  Bug #383437: Fix iSNS SLP linking in the main binaries.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> open-iscsi-2.0.871.3.ebuild:
   Marking open-iscsi-2.0.871.3 ppc for bug 370679



1.4                  sys-block/open-iscsi/open-iscsi-2.0.872.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild?r1=1.3&r2=1.4

Index: open-iscsi-2.0.872.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- open-iscsi-2.0.872.ebuild	5 Nov 2011 23:03:00 -0000	1.3
+++ open-iscsi-2.0.872.ebuild	9 Feb 2012 08:29:45 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.872.ebuild,v 1.3 2011/11/05 23:03:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.4 2012/02/09 08:29:45 robbat2 Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic
@@ -45,6 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-glibc212.patch
 	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-isns-slp.patch
 }
 
 src_configure() {
@@ -56,8 +57,10 @@ src_compile() {
 	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
 
 	einfo "Building userspace"
+	local SLP_LIBS
+	use slp && SLP_LIBS="-lslp"
 	cd "${S}" && \
-	KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
+	KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" user \
 		|| die "emake failed"
 }
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-09  8:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-09  8:29 [gentoo-commits] gentoo-x86 commit in sys-block/open-iscsi: ChangeLog open-iscsi-2.0.872.ebuild Robin H. Johnson (robbat2)
  -- strict thread matches above, loose matches on Subject: below --
2011-06-07 14:32 Sebastian Pipping (sping)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox