public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 16:41 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     70cccd04ce59de9737af9d6d25629b28c952b0b4
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:40:03 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:40:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=70cccd04

[sys-cluster/slurm] Initial import

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/metadata.xml       |   11 ++++++++
 sys-cluster/slurm/slurm-2.2.7.ebuild |   45 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
new file mode 100644
index 0000000..c28e41a
--- /dev/null
+++ b/sys-cluster/slurm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cluster</herd>
+	<maintainer>
+		<email>alexxy@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='munge'>Enable authentication via munge.</flag>
+	</use>
+</pkgmetadata>

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
new file mode 100644
index 0000000..f5f29ee
--- /dev/null
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils pam
+
+DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="munge mysql pam postgres ssl static"
+
+DEPEND="
+	mysql? ( dev-db/mysql )
+	munge? ( sys-auth/munge )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( dev-libs/openssl )
+	>=sys-apps/hwloc-1.1.1-r1"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup slurm
+	enewuser slurm -1 -1 /var/spool/slurm slurm
+}
+
+pkg_config() {
+	local myconf=(
+			--sysconfdir="${EPREFIX}/etc/${PN}"
+			--with-hwloc="${ED}/usr"
+			)
+	use pam && myconf+=( --with_pam_dir=$(getpam_mod_dir) )
+	use mysql && myconf+=( --with-mysql_config="${EPREFIX}/usr/bin/mysql_config" )
+	use postgres && myconf+=( --with-pg_config="${EPREFIX}/usr/bin/pg_config" )
+	econf "${myconf[@]}" \
+		$(use_enable pam) \
+		$(use_with ssl) \
+		$(use_with munge) \
+		$(use_enable static)
+}



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 16:56 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f064ec8f044b31cbbc2ab2896585d85038be2e00
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:56:06 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:56:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f064ec8f

Fix typo =D

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index f5f29ee..3410e23 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -29,7 +29,7 @@ pkg_setup() {
 	enewuser slurm -1 -1 /var/spool/slurm slurm
 }
 
-pkg_config() {
+src_configure() {
 	local myconf=(
 			--sysconfdir="${EPREFIX}/etc/${PN}"
 			--with-hwloc="${ED}/usr"



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 16:58 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 16:58 UTC (permalink / raw
  To: gentoo-commits

commit:     16bb87f761ab869d52180635c317ed52ca382985
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:58:03 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:58:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=16bb87f7

Another typo with pam

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 3410e23..82eac14 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 			--sysconfdir="${EPREFIX}/etc/${PN}"
 			--with-hwloc="${ED}/usr"
 			)
-	use pam && myconf+=( --with_pam_dir=$(getpam_mod_dir) )
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql && myconf+=( --with-mysql_config="${EPREFIX}/usr/bin/mysql_config" )
 	use postgres && myconf+=( --with-pg_config="${EPREFIX}/usr/bin/pg_config" )
 	econf "${myconf[@]}" \



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 16:59 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     f8d8e99f8a7ff1c76a55549983faf7905a6898b9
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 16:59:11 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:59:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f8d8e99f

Another typo with hwloc

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 82eac14..fa56230 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -32,7 +32,7 @@ pkg_setup() {
 src_configure() {
 	local myconf=(
 			--sysconfdir="${EPREFIX}/etc/${PN}"
-			--with-hwloc="${ED}/usr"
+			--with-hwloc="${EPREFIX}/usr"
 			)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql && myconf+=( --with-mysql_config="${EPREFIX}/usr/bin/mysql_config" )



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:07 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     60d91ca7f93f571884db03593866736b512e4905
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:07:04 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:07:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=60d91ca7

Enable pam module

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index fa56230..f92ad5b 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -21,7 +21,8 @@ DEPEND="
 	pam? ( virtual/pam )
 	postgres? ( dev-db/postgresql-base )
 	ssl? ( dev-libs/openssl )
-	>=sys-apps/hwloc-1.1.1-r1"
+	>=sys-apps/hwloc-1.1.1-r1
+	>=sys-process/numactl-2.0.6"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -43,3 +44,13 @@ src_configure() {
 		$(use_with munge) \
 		$(use_enable static)
 }
+
+src_compile() {
+	emake
+	use pam && emake -C contrib/pam
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use pam && emake DESTDIR="${D}" -C contrib/pam install
+}



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:15 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3859cf5bea0a575f980bbba70c359a381d8ad7cb
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:15:02 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:15:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3859cf5b

use eapi4 feature

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index fd5952b..ffb4b6c 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -46,11 +46,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die
+	default
 	use pam && emake -C contribs/pam || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:22 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c32ec1160103295d8c6578dcb113cbbe68eaa99e
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:22:02 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:22:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c32ec116

More cleaning

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index ffb4b6c..7a49d78 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="munge mysql pam postgres ssl static"
+IUSE="munge mysql pam postgres ssl static-libs"
 
 DEPEND="
 	mysql? ( dev-db/mysql )
@@ -42,7 +42,7 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_with ssl) \
 		$(use_with munge) \
-		$(use_enable static)
+		$(use_enable static-libs static)
 }
 
 src_compile() {
@@ -53,4 +53,5 @@ src_compile() {
 src_install() {
 	default
 	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:31 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     a3e918638adeb4dcf1eb534855365dff7c89b965
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:30:42 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:30:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a3e91863

Enable pbs compatibility

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/metadata.xml       |    1 +
 sys-cluster/slurm/slurm-2.2.7.ebuild |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index c28e41a..22e2cb5 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name='munge'>Enable authentication via munge.</flag>
+		<flag name='pbs-compat'>Enable pbs wrappers (qsub,qdel,qstat, etc..)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 7a49d78..2fc906d 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -13,12 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="munge mysql pam postgres ssl static-libs"
+IUSE="munge mysql pam +pbs-compat postgres ssl static-libs"
 
 DEPEND="
 	mysql? ( dev-db/mysql )
 	munge? ( sys-auth/munge )
 	pam? ( virtual/pam )
+	pbs-compat? ( !sys-cluster/torque )
 	postgres? ( dev-db/postgresql-base )
 	ssl? ( dev-libs/openssl )
 	>=sys-apps/hwloc-1.1.1-r1
@@ -53,5 +54,6 @@ src_compile() {
 src_install() {
 	default
 	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
+	use pbs-compat && emake DESTDIR="${D}" -C contribs/torque install || die
 	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:37 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a95e51d5dcf97727457adefcb3a07135db795647
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:37:35 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:37:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a95e51d5

Fix collisions with mpi implentations

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 2fc906d..0295ab4 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -56,4 +56,6 @@ src_install() {
 	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
 	use pbs-compat && emake DESTDIR="${D}" -C contribs/torque install || die
 	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# we dont need it
+	rm "${ED}/usr/bin/mpiexec" || die
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 19:58 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 19:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ecde88e46ae556c22591fb75b195a7703904f8db
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 19:58:26 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 19:58:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ecde88e4

Also install sample config files

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 0295ab4..21a3aeb 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -58,4 +58,15 @@ src_install() {
 	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
 	# we dont need it
 	rm "${ED}/usr/bin/mpiexec" || die
+	# install sample configs
+	keepdir /etc/slurm
+	keepdir /var/log/slurm
+	keepdir /var/spool/slurm
+	insinto /etc/slurm
+	doins etc/cgroup.conf.example
+	doins etc/cgroup.release_agent
+	doins etc/federation.conf.example
+	doins etc/slurm.conf.example
+	doins etc/slurmdbd.conf.example
+	doins etc/slurm.epilog.clean
 }



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 20:27 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     0345b7745b75bb80608bd5dc7e8694affca8a75a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 20:26:51 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 20:26:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0345b774

Fix cgroup location

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 21a3aeb..4bc31bd 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -31,6 +31,16 @@ pkg_setup() {
 	enewuser slurm -1 -1 /var/spool/slurm slurm
 }
 
+src_prepare() {
+	# gentoo uses /sys/fs/cgroup instead of /dev/cgroup
+	sed -e 's:/dev/cgroup:/sys/fs/cgroup:g' \
+		-i "${S}/doc/man/man5/cgroup.conf.5" \
+		-i "${S}/etc/cgroup.conf.example" \
+		-i "${S}/etc/cgroup.release_agent" \
+		-i "${S}/src/plugins/proctrack/cgroup/xcgroup.h" \
+		|| die
+}
+
 src_configure() {
 	local myconf=(
 			--sysconfdir="${EPREFIX}/etc/${PN}"



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 21:57 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     bf475dc8210fd58a86b52f8ccabfa2e36c9dbef2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 21:56:26 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 21:56:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bf475dc8

Fix order

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 3b3fcf8..0c6e9a5 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -74,10 +74,11 @@ src_install() {
 	keepdir /var/spool/slurm
 	insinto /etc/slurm
 	doins etc/cgroup.conf.example
-	doexe etc/cgroup.release_agent
 	doins etc/federation.conf.example
 	doins etc/slurm.conf.example
 	doins etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	doexe etc/cgroup.release_agent
 	doexe etc/slurm.epilog.clean
 	# install init.d files
 	newinitd "${FILESDIR}/slurmd.initd" slurmd



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 22:15 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     971fc0a9fa01cf9054578aab4488104c8221c42a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 22:14:53 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 22:14:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=971fc0a9

Fix typo

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index ff9e1f2..f504d29 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
 	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
 	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurmd
+	newconfd "${FILESDIR}/slurm.confd" slurm
 }
 
 pkg_preinst() {



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 22:40 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     29d4d65e31d7e6a4d845c3472dbae1e82ba061a4
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 22:40:32 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 22:40:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=29d4d65e

Enable maui support

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/metadata.xml       |    3 ++-
 sys-cluster/slurm/slurm-2.2.7.ebuild |   10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index 22e2cb5..56f2fa2 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -6,7 +6,8 @@
 		<email>alexxy@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='munge'>Enable authentication via munge.</flag>
+		<flag name='maui'>Enable maui scheduler support</flag>
+		<flag name='munge'>Enable authentication via munge</flag>
 		<flag name='pbs-compat'>Enable pbs wrappers (qsub,qdel,qstat, etc..)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index f504d29..00aa0b4 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -12,8 +12,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="munge mysql pam +pbs-compat postgres ssl static-libs"
+KEYWORDS="~amd64 ~x86"
+IUSE="maui +munge mysql pam +pbs-compat postgres ssl static-libs"
 
 DEPEND="
 	mysql? ( dev-db/mysql )
@@ -22,9 +22,9 @@ DEPEND="
 	pbs-compat? ( !sys-cluster/torque )
 	postgres? ( dev-db/postgresql-base )
 	ssl? ( dev-libs/openssl )
-	>=sys-apps/hwloc-1.1.1-r1
-	>=sys-process/numactl-2.0.6"
-RDEPEND="${DEPEND}"
+	>=sys-apps/hwloc-1.1.1-r1"
+RDEPEND="${DEPEND}
+	maui? ( sys-cluster/maui[slurm] )"
 
 pkg_setup() {
 	enewgroup slurm



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

* [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/
@ 2011-07-03 23:14 Alexey Shvetsov
  0 siblings, 0 replies; 15+ messages in thread
From: Alexey Shvetsov @ 2011-07-03 23:14 UTC (permalink / raw
  To: gentoo-commits

commit:     05d85650c918a3e2b093f135c47c4830244ff62a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 23:13:47 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 23:13:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=05d85650

Update gentoo defconfig

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/slurm/slurm-2.2.7.ebuild |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 6478bfc..8142585 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -39,6 +39,17 @@ src_prepare() {
 		-i "${S}/etc/cgroup.release_agent" \
 		-i "${S}/src/plugins/proctrack/cgroup/xcgroup.h" \
 		|| die
+	# also we running slurm daemons under slurm user
+	sed -e '#SlurmdUser=root:SlurmdUser=slurm:g' \
+		-i "${S}/etc/slurm.conf.example"
+	# and pids should go to /var/run/slurm
+	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
+		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
+		-i "${S}/etc/slurm.conf.example"
+	# also state dirs are in /var/spool/slurm
+	sed -e 's:StateSaveLocation=/tmp:StateSaveLocation=/var/spool/slurm:g' \
+		-e 's:SlurmdSpoolDir=/tmp/slurmd:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
+		-i "${S}/etc/slurm.conf.example"
 }
 
 src_configure() {



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

end of thread, other threads:[~2011-07-03 23:14 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 19:07 [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/ Alexey Shvetsov
  -- strict thread matches above, loose matches on Subject: below --
2011-07-03 23:14 Alexey Shvetsov
2011-07-03 22:40 Alexey Shvetsov
2011-07-03 22:15 Alexey Shvetsov
2011-07-03 21:57 Alexey Shvetsov
2011-07-03 20:27 Alexey Shvetsov
2011-07-03 19:58 Alexey Shvetsov
2011-07-03 19:37 Alexey Shvetsov
2011-07-03 19:31 Alexey Shvetsov
2011-07-03 19:22 Alexey Shvetsov
2011-07-03 19:15 Alexey Shvetsov
2011-07-03 16:59 Alexey Shvetsov
2011-07-03 16:58 Alexey Shvetsov
2011-07-03 16:56 Alexey Shvetsov
2011-07-03 16:41 Alexey Shvetsov

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