* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2016-08-13 7:29 Benda XU
0 siblings, 0 replies; 12+ messages in thread
From: Benda XU @ 2016-08-13 7:29 UTC (permalink / raw
To: gentoo-commits
commit: 0fa0a7c33eabedbcd6c79622746974b3d919f3b7
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 07:27:45 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 07:29:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa0a7c3
sys-cluster/slurm: Prefix support and QA improvements.
OpenRC drops 'net', it is removed from initd files.
Bug: 590104
Package-Manager: portage-2.3.0
sys-cluster/slurm/files/slurmctld.initd | 4 +--
sys-cluster/slurm/files/slurmd.initd | 4 +--
sys-cluster/slurm/files/slurmdbd.initd | 6 ++--
sys-cluster/slurm/slurm-16.05.2.ebuild | 49 +++++++++++++++++----------------
4 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd
index 840d616..cea032d 100644
--- a/sys-cluster/slurm/files/slurmctld.initd
+++ b/sys-cluster/slurm/files/slurmctld.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ extra_commands="reload"
[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
depend() {
- local _need="net"
+ local _need
[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
[[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
after logger slurmdbd
diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
index 8b13af3..3652943 100644
--- a/sys-cluster/slurm/files/slurmd.initd
+++ b/sys-cluster/slurm/files/slurmd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ extra_commands="reload"
[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
depend() {
- local _need="net"
+ local _need
[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
[[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
after logger
diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd
index c8548b6..054316f 100644
--- a/sys-cluster/slurm/files/slurmdbd.initd
+++ b/sys-cluster/slurm/files/slurmdbd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,9 +8,9 @@ extra_commands="reload"
[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
depend() {
- local _need="net"
+ local _need
[[ ${SLURM_USE_MUNGE} -ne 0 ]] && _need="${_need} munged"
- [[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
+ [[ ${SLURM_USE_YPBIND} -ne 0 ]] && _need="${_need} ypbind"
after logger
need ${_need}
}
diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild
index a804679..8bfaf5f 100644
--- a/sys-cluster/slurm/slurm-16.05.2.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.2.ebuild
@@ -23,7 +23,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT}
DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
HOMEPAGE="http://www.schedmd.com"
@@ -76,13 +76,13 @@ src_prepare() {
fi
eapply_user
# 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' \
+ sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
+ -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for /var/run/slurmctld.pid"
# also state dirs are in /var/spool/slurm
- sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
- -e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
+ sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+ -e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
# and tmp should go to /var/tmp/slurm
@@ -90,6 +90,7 @@ src_prepare() {
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for StateSaveLocation=*./tmp"
+ hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
eautoreconf
}
@@ -130,7 +131,7 @@ src_configure() {
src_compile() {
default
- use pam && emake -C contribs/pam || die
+ use pam && emake -C contribs/pam
if use perl ; then
cd "${LIBSLURM_PERL_S}"
S="${LIBSLURM_PERL_S}" perl-module_src_compile
@@ -139,13 +140,13 @@ src_compile() {
cd "${S}"
fi
if use torque ; then
- emake -C contribs/torque || die
+ emake -C contribs/torque
fi
}
src_install() {
default
- use pam && emake DESTDIR="${D}" -C contribs/pam install || die
+ use pam && emake DESTDIR="${D}" -C contribs/pam install
if use perl; then
cd "${LIBSLURM_PERL_S}"
S="${LIBSLURM_PERL_S}" perl-module_src_install
@@ -154,7 +155,7 @@ src_install() {
cd "${S}"
fi
if use torque; then
- emake DESTDIR="${D}" -C contribs/torque || die
+ emake DESTDIR="${D}" -C contribs/torque
rm -f "${ED}/usr/bin/mpiexec" || die
fi
use static-libs || find "${ED}" -name '*.la' -exec rm {} +
@@ -170,26 +171,26 @@ src_install() {
doexe etc/cgroup.release_common.example
doexe etc/slurm.epilog.clean
# install init.d files
- newinitd "${FILESDIR}/slurmd.initd" slurmd
- newinitd "${FILESDIR}/slurmctld.initd" slurmctld
- newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
# install conf.d files
newconfd "${FILESDIR}/slurm.confd" slurm
# Install logrotate file
insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotate" slurm || die
+ newins "${FILESDIR}/logrotate" slurm
# cgroups support
exeinto /etc/slurm/cgroup
doexe etc/cgroup.release_common.example
- mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
- ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset || die "Can't create symbolic link release_cpuset"
- ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
- ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
+ mv "${ED}"/etc/slurm/cgroup/{cgroup.release_common.example,release_common} || die "Can't move cgroup.release_common.example"
+ ln -s release_common "${ED}"/etc/slurm/cgroup/release_cpuset || die "Can't create symbolic link release_cpuset"
+ ln -s release_common "${ED}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
+ ln -s release_common "${ED}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
}
pkg_preinst() {
if use munge; then
- sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
+ sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die
fi
}
@@ -201,12 +202,12 @@ create_folders_and_fix_permissions() {
pkg_postinst() {
paths=(
- /var/${PN}/checkpoint
- /var/${PN}
- /var/spool/${PN}/slurmd
- /var/spool/${PN}
- /var/run/${PN}
- /var/log/${PN}
+ "${EROOT}"var/${PN}/checkpoint
+ "${EROOT}"var/${PN}
+ "${EROOT}"var/spool/${PN}/slurmd
+ "${EROOT}"var/spool/${PN}
+ "${EROOT}"var/run/${PN}
+ "${EROOT}"var/log/${PN}
/var/tmp/${PN}/${PN}d
/var/tmp/${PN}
)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2017-07-09 18:48 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2017-07-09 18:48 UTC (permalink / raw
To: gentoo-commits
commit: f642dbad4a32533562e287dbbe0a96d5e48b61a0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 16:35:55 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 18:48:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f642dbad
sys-cluster/slurm: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621144
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-cluster/slurm/Manifest | 1 +
.../slurm/files/slurm-16.05.2-disable-sview.patch | 21 --
...iew.patch => slurm-17.02.6-disable-sview.patch} | 79 ++++---
.../slurm/files/slurm-17.02.6-glibc-2.25.patch | 53 +++++
sys-cluster/slurm/slurm-17.02.6.ebuild | 236 +++++++++++++++++++++
5 files changed, 334 insertions(+), 56 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index d98544e4bd3..36d8c909850 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1,2 @@
DIST slurm-16.05.2.tar.bz2 5982329 SHA256 de57ab107c98499f7184c54de8d5ac115a55657aa03d29d69cd0b7e737a42852 SHA512 8b4296481c5ad83da2bde1530937b3da9b6e32b6606ba0b0a3899e0f2f0b4fc42ca8a802d4bf346d0de28852d75839e9359e28c4ce77588cd22a08ddbd34dd21 WHIRLPOOL 925902c9432b24a2c85488d1ba6a867abed0adaaecaa94b648402e48d250d924000741b2be486b34d3b7f6890aeabb9aea6c47e2e8fd9896dda3a3ae416a4a89
+DIST slurm-17.02.6.tar.bz2 6017979 SHA256 f057127870544be5b3476594fc58b3c35727e6db3a18d84c4ea63059c2ebe4ea SHA512 e7e33ae037f8b30ccf467fa19c90786c28a527df80cf1362075634ada7072bffcd172d79d2af9ac9ad2b2206b50c0560584c7b8193bfaa9dfa1b1d2c7216e5f6 WHIRLPOOL 9dec9fae0d6def7fc0c243ceec8a2d3bf3c10ecf230f8ef5df03804ce048481279691572fb9bd83a509f344639d4b73313e7f7615bfa1d17c279010e44a2e63e
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
index 5b861c33301..1e4a5b4fae3 100644
--- a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
@@ -67,24 +67,3 @@ diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
if !REAL_BG_L_P_LOADED
SUBDIRS += srun
-diff -urN slurm-16.05.2.orig/src/Makefile.in slurm-16.05.2/src/Makefile.in
---- slurm-16.05.2.orig/src/Makefile.in 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.in 2016-07-15 20:02:41.373270765 +0300
-@@ -199,7 +199,7 @@
- DIST_SUBDIRS = api bcast common database db_api layouts plugins sacct \
- sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
- sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
-- srun_cr sshare sstat strigger sview srun
-+ srun_cr sshare sstat strigger srun
- am__DIST_COMMON = $(srcdir)/Makefile.in
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
-@@ -487,7 +487,7 @@
- SUBDIRS = api bcast common database db_api layouts plugins sacct \
- sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
- sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
-- srun_cr sshare sstat strigger sview $(am__append_1)
-+ srun_cr sshare sstat strigger $(am__append_1)
- all: all-recursive
-
- .SUFFIXES:
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch
similarity index 53%
copy from sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
copy to sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch
index 5b861c33301..f7e2c5b2673 100644
--- a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch
@@ -1,7 +1,13 @@
-diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
---- slurm-16.05.2.orig/configure.ac 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300
-@@ -261,44 +261,6 @@
+ configure.ac | 39 ---------------------------------------
+ doc/man/man1/Makefile.am | 8 --------
+ src/Makefile.am | 3 +--
+ 3 files changed, 1 insertion(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f177ec..ff4d69b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
@@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
-
-AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
-
- X_AC_DATABASES
-
dnl Cray ALPS/Basil support depends on mySQL
-@@ -503,7 +465,6 @@
+ X_AC_CRAY
+
+@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
src/sshare/Makefile
src/sstat/Makefile
src/strigger/Makefile
@@ -54,37 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
src/plugins/Makefile
src/plugins/accounting_storage/Makefile
src/plugins/accounting_storage/common/Makefile
-diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
---- slurm-16.05.2.orig/src/Makefile.am 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300
-@@ -27,8 +27,7 @@
+diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
+index 246f16d..ba39af2 100644
+--- a/doc/man/man1/Makefile.am
++++ b/doc/man/man1/Makefile.am
+@@ -29,10 +29,6 @@ if WITH_BLCR
+ man1_MANS += srun_cr.1
+ endif
+
+-if BUILD_SVIEW
+-man1_MANS += sview.1
+-endif
+-
+ EXTRA_DIST = $(man1_MANS)
+
+ if HAVE_MAN2HTML
+@@ -65,10 +61,6 @@ if WITH_BLCR
+ html_DATA += srun_cr.html
+ endif
+
+-if BUILD_SVIEW
+-html_DATA += sview.html
+-endif
+-
+ MOSTLYCLEANFILES = ${html_DATA}
+
+ EXTRA_DIST += $(html_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcd5aa7..a8cbf17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,5 +28,4 @@ SUBDIRS = \
srun_cr \
sshare \
sstat \
- strigger \
- sview
+ strigger
-
- if !REAL_BG_L_P_LOADED
- SUBDIRS += srun
-diff -urN slurm-16.05.2.orig/src/Makefile.in slurm-16.05.2/src/Makefile.in
---- slurm-16.05.2.orig/src/Makefile.in 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.in 2016-07-15 20:02:41.373270765 +0300
-@@ -199,7 +199,7 @@
- DIST_SUBDIRS = api bcast common database db_api layouts plugins sacct \
- sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
- sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
-- srun_cr sshare sstat strigger sview srun
-+ srun_cr sshare sstat strigger srun
- am__DIST_COMMON = $(srcdir)/Makefile.in
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- am__relativize = \
-@@ -487,7 +487,7 @@
- SUBDIRS = api bcast common database db_api layouts plugins sacct \
- sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \
- sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \
-- srun_cr sshare sstat strigger sview $(am__append_1)
-+ srun_cr sshare sstat strigger $(am__append_1)
- all: all-recursive
-
- .SUFFIXES:
diff --git a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch
new file mode 100644
index 00000000000..dc48f8475c0
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch
@@ -0,0 +1,53 @@
+commit 056d9ff26b1d2ccac45da3c26a6918f182f8c559
+Author: Justin Lecher <jlec@gentoo.org>
+Date: Sun Jul 9 15:54:20 2017 +0100
+
+ Include sysmacros.h in addition for major() & minor()
+
+ Starting from glibc-2.25 [1] the macros major and minor are only available
+ from sys/sysmacros.h. This patch uses an autoconf macro to detect the
+ location and includes the header accordingly.
+
+ 1)
+ https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+
+ Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+diff --git a/configure.ac b/configure.ac
+index 44699ae095..66d4350d44 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -124,7 +124,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_TIME
+ AC_HEADER_STDC
+-
++AC_HEADER_MAJOR
+
+ dnl Checks for structures.
+ dnl
+diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
+index 6a09b3d52a..63c0a11c9e 100644
+--- a/src/plugins/task/cgroup/task_cgroup_devices.c
++++ b/src/plugins/task/cgroup/task_cgroup_devices.c
+@@ -34,12 +34,20 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ \*****************************************************************************/
+
++#include "config.h"
++
+ #define _GNU_SOURCE
+ #include <glob.h>
+ #include <limits.h>
+ #include <sched.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#ifdef MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif
+
+ #include "slurm/slurm.h"
+ #include "slurm/slurm_errno.h"
diff --git a/sys-cluster/slurm/slurm-17.02.6.ebuild b/sys-cluster/slurm/slurm-17.02.6.ebuild
new file mode 100644
index 00000000000..1d246ec803a
--- /dev/null
+++ b/sys-cluster/slurm/slurm-17.02.6.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/SchedMD/slurm.git"
+ INHERIT_GIT="git-r3"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ inherit versionator
+ if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+ MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
+ else
+ MY_PV=$(replace_version_separator 3 '-') # stable releases
+ fi
+ MY_P="${PN}-${MY_PV}"
+ INHERIT_GIT=""
+ SRC_URI="http://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT}
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="http://www.schedmd.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+
+DEPEND="
+ !sys-cluster/torque
+ !net-analyzer/slurm
+ !net-analyzer/sinfo
+ mysql? ( virtual/mysql )
+ munge? ( sys-auth/munge )
+ pam? ( virtual/pam )
+ ssl? ( dev-libs/openssl:0= )
+ lua? ( dev-lang/lua:0= )
+ !lua? ( !dev-lang/lua )
+ >=sys-apps/hwloc-1.1.1-r1"
+RDEPEND="${DEPEND}
+ dev-libs/libcgroup"
+
+REQUIRED_USE="torque? ( perl )"
+
+LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="primaryuri"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-disable-sview.patch
+ "${FILESDIR}"/${P}-glibc-2.25.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ default
+ fi
+}
+
+pkg_setup() {
+ enewgroup slurm 500
+ enewuser slurm 500 -1 /var/spool/slurm slurm
+}
+
+src_prepare() {
+ default
+
+ # pids should go to /var/run/slurm
+ sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
+ -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
+ -i "${S}/etc/slurm.conf.example" \
+ || die "Can't sed for /var/run/slurmctld.pid"
+ # also state dirs are in /var/spool/slurm
+ sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+ -e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+ -i "${S}/etc/slurm.conf.example" \
+ || die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
+ # and tmp should go to /var/tmp/slurm
+ sed -e 's:/tmp:/var/tmp:g' \
+ -i "${S}/etc/slurm.conf.example" \
+ || die "Can't sed for StateSaveLocation=*./tmp"
+
+ hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --sysconfdir="${EPREFIX}/etc/${PN}"
+ --with-hwloc="${EPREFIX}/usr"
+ --docdir="${EPREFIX}/usr/share/doc/${P}"
+ --htmldir="${EPREFIX}/usr/share/doc/${P}"
+ )
+ use debug || myconf+=( --disable-debug )
+ use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+ use mysql || myconf+=( --without-mysql_config )
+ econf "${myconf[@]}" \
+ $(use_enable pam) \
+ $(use_with ssl) \
+ $(use_with munge) \
+ $(use_enable static-libs static) \
+ $(use_enable multiple-slurmd)
+
+ # --htmldir does not seems to propagate... Documentations are installed
+ # in /usr/share/doc/slurm-2.3.0/html
+ # instead of /usr/share/doc/slurm-2.3.0.2/html
+ sed \
+ -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+ -i doc/html/Makefile || die
+ if use perl ; then
+ # small hack to make it compile
+ mkdir -p "${S}/src/api/.libs" || die
+ mkdir -p "${S}/src/db_api/.libs" || die
+ touch "${S}/src/api/.libs/libslurm.so" || die
+ touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+ cd "${LIBSLURM_PERL_S}" || die
+ S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+ cd "${LIBSLURMDB_PERL_S}" || die
+ S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+ cd "${S}" || die
+ rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+ fi
+}
+
+src_compile() {
+ default
+ use pam && emake -C contribs/pam
+ if use perl ; then
+ cd "${LIBSLURM_PERL_S}" || die
+ S="${LIBSLURM_PERL_S}" perl-module_src_compile
+ cd "${LIBSLURMDB_PERL_S}" || die
+ S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+ cd "${S}" || die
+ fi
+ use torque && emake -C contribs/torque
+}
+
+src_install() {
+ default
+ use pam && emake DESTDIR="${D}" -C contribs/pam install
+ if use perl; then
+ cd "${LIBSLURM_PERL_S}" || die
+ S="${LIBSLURM_PERL_S}" perl-module_src_install
+ cd "${LIBSLURMDB_PERL_S}" || die
+ S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+ cd "${S}" || die
+ fi
+ if use torque; then
+ emake DESTDIR="${D}" -C contribs/torque
+ rm -f "${ED}/usr/bin/mpiexec" || die
+ fi
+ use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+ # install sample configs
+ keepdir /etc/slurm
+ insinto /etc/slurm
+ doins \
+ etc/bluegene.conf.example \
+ etc/cgroup.conf.example \
+ etc/cgroup_allowed_devices_file.conf.example \
+ etc/slurm.conf.example \
+ etc/slurmdbd.conf.example
+ exeinto /etc/slurm
+ doexe \
+ etc/slurm.epilog.clean
+ # install init.d files
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
+ # install conf.d files
+ newconfd "${FILESDIR}/slurm.confd" slurm
+ # Install logrotate file
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" slurm
+}
+
+pkg_preinst() {
+ if use munge; then
+ sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die
+ fi
+}
+
+create_folders_and_fix_permissions() {
+ einfo "Fixing permissions in ${@}"
+ mkdir -p ${@}
+ chown -R ${PN}:${PN} ${@}
+}
+
+pkg_postinst() {
+ paths=(
+ "${EROOT}"var/${PN}/checkpoint
+ "${EROOT}"var/${PN}
+ "${EROOT}"var/spool/${PN}/slurmd
+ "${EROOT}"var/spool/${PN}
+ "${EROOT}"var/run/${PN}
+ "${EROOT}"var/log/${PN}
+ /var/tmp/${PN}/${PN}d
+ /var/tmp/${PN}
+ )
+ for folder_path in ${paths[@]}; do
+ create_folders_and_fix_permissions $folder_path
+ done
+ echo
+
+ elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+ elog "through a (javascript enabled) browser to create a configureation file."
+ elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+ echo
+ elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
+ elog "Your kernel must be compiled with the wanted cgroup feature:"
+ elog " General setup --->"
+ elog " [*] Control Group support --->"
+ elog " [*] Freezer cgroup subsystem"
+ elog " [*] Device controller for cgroups"
+ elog " [*] Cpuset support"
+ elog " [*] Simple CPU accounting cgroup subsystem"
+ elog " [*] Resource counters"
+ elog " [*] Memory Resource Controller for Control Groups"
+ elog " [*] Group CPU scheduler --->"
+ elog " [*] Group scheduling for SCHED_OTHER"
+ elog "Then, set these options in /etc/slurm/slurm.conf:"
+ elog " ProctrackType=proctrack/cgroup"
+ elog " TaskPlugin=task/cgroup"
+ einfo
+ ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+ for folder_path in ${paths[@]}; do
+ ewarn " ${folder_path}"
+ done
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2017-11-12 19:56 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2017-11-12 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 87b4be04dbc8f2e65eacae7b9d1b87d0e50a30b2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 19:38:37 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 19:56:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b4be04
sys-cluster/slurm: Version Bump
drop vulnerable versions CVE-2017-15566
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.13, Repoman-2.3.4
sys-cluster/slurm/Manifest | 4 +-
...ew.patch => slurm-16.05.11-disable-sview.patch} | 0
...macros.patch => slurm-16.05.11-sysmacros.patch} | 0
.../slurm/files/slurm-17.02.6-glibc-2.25.patch | 53 ----------------------
...iew.patch => slurm-17.02.9-disable-sview.patch} | 0
...{slurm-16.05.2.ebuild => slurm-16.05.11.ebuild} | 0
.../{slurm-17.02.6.ebuild => slurm-17.02.9.ebuild} | 1 -
7 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 36d8c909850..d94f5bfc5b0 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-16.05.2.tar.bz2 5982329 SHA256 de57ab107c98499f7184c54de8d5ac115a55657aa03d29d69cd0b7e737a42852 SHA512 8b4296481c5ad83da2bde1530937b3da9b6e32b6606ba0b0a3899e0f2f0b4fc42ca8a802d4bf346d0de28852d75839e9359e28c4ce77588cd22a08ddbd34dd21 WHIRLPOOL 925902c9432b24a2c85488d1ba6a867abed0adaaecaa94b648402e48d250d924000741b2be486b34d3b7f6890aeabb9aea6c47e2e8fd9896dda3a3ae416a4a89
-DIST slurm-17.02.6.tar.bz2 6017979 SHA256 f057127870544be5b3476594fc58b3c35727e6db3a18d84c4ea63059c2ebe4ea SHA512 e7e33ae037f8b30ccf467fa19c90786c28a527df80cf1362075634ada7072bffcd172d79d2af9ac9ad2b2206b50c0560584c7b8193bfaa9dfa1b1d2c7216e5f6 WHIRLPOOL 9dec9fae0d6def7fc0c243ceec8a2d3bf3c10ecf230f8ef5df03804ce048481279691572fb9bd83a509f344639d4b73313e7f7615bfa1d17c279010e44a2e63e
+DIST slurm-16.05.11.tar.bz2 6100281 SHA256 c797390a7de40b8b5bead77a92661de5f158c646e9abe6a93457f311e0aec330 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba WHIRLPOOL 35b6dba438519f82a431bb4ac312afb8e65fe27eb3c72714ef204ee974ab4e7e3259ac1c763e4430f5fce18b4e737198cfe9c47b45de2d6fd7a29db72e020d2f
+DIST slurm-17.02.9.tar.bz2 6053443 SHA256 faf4704505dfc5b6fa199f099d36dbc3d23faf149251f36672631dbbbe3b1b71 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c WHIRLPOOL d3320da3e2ec6e14e58ac759ab0e7f7741068f15c6c6569e36b622250d1617d68a6f17e4a91243994ae2d3ac69161268b1becf4bd31677f618fc93c1423e51fc
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch
rename to sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
diff --git a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch
deleted file mode 100644
index dc48f8475c0..00000000000
--- a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 056d9ff26b1d2ccac45da3c26a6918f182f8c559
-Author: Justin Lecher <jlec@gentoo.org>
-Date: Sun Jul 9 15:54:20 2017 +0100
-
- Include sysmacros.h in addition for major() & minor()
-
- Starting from glibc-2.25 [1] the macros major and minor are only available
- from sys/sysmacros.h. This patch uses an autoconf macro to detect the
- location and includes the header accordingly.
-
- 1)
- https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
-
- Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-diff --git a/configure.ac b/configure.ac
-index 44699ae095..66d4350d44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -124,7 +124,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- AC_HEADER_STDC
--
-+AC_HEADER_MAJOR
-
- dnl Checks for structures.
- dnl
-diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
-index 6a09b3d52a..63c0a11c9e 100644
---- a/src/plugins/task/cgroup/task_cgroup_devices.c
-+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
-@@ -34,12 +34,20 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- \*****************************************************************************/
-
-+#include "config.h"
-+
- #define _GNU_SOURCE
- #include <glob.h>
- #include <limits.h>
- #include <sched.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-
- #include "slurm/slurm.h"
- #include "slurm/slurm_errno.h"
diff --git a/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild
similarity index 100%
rename from sys-cluster/slurm/slurm-16.05.2.ebuild
rename to sys-cluster/slurm/slurm-16.05.11.ebuild
diff --git a/sys-cluster/slurm/slurm-17.02.6.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild
similarity index 99%
rename from sys-cluster/slurm/slurm-17.02.6.ebuild
rename to sys-cluster/slurm/slurm-17.02.9.ebuild
index 72d5cafc994..dc8afb80830 100644
--- a/sys-cluster/slurm/slurm-17.02.6.ebuild
+++ b/sys-cluster/slurm/slurm-17.02.9.ebuild
@@ -54,7 +54,6 @@ RESTRICT="primaryuri"
PATCHES=(
"${FILESDIR}"/${P}-disable-sview.patch
- "${FILESDIR}"/${P}-glibc-2.25.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-03-11 21:27 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2018-03-11 21:27 UTC (permalink / raw
To: gentoo-commits
commit: ccbe4b91900465c3f71b5fb769d369b4bfba408b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 21:26:28 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 21:27:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbe4b91
sys-cluster/slurm: Version Bump
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-cluster/slurm/Manifest | 2 +-
.../slurm/files/slurm-16.05.11-sysmacros.patch | 34 --------
sys-cluster/slurm/files/slurm-17.11.4-buffer.patch | 16 ++++
...iew.patch => slurm-17.11.4-disable-sview.patch} | 58 ++++++++++----
...{slurm-16.05.11.ebuild => slurm-17.11.4.ebuild} | 90 +++++++++++-----------
5 files changed, 105 insertions(+), 95 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 4af38acc588..168ca920923 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-16.05.11.tar.bz2 6100281 BLAKE2B d9e368f22f55c457e2fb6caaca0a496e6de1c0c77af891e62259db88fa7fca68d4df0731f1a6cada046341698e673860eb7d3883ef9dba8589fc01c7882a1735 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba
DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
+DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
deleted file mode 100644
index f9d22f479f8..00000000000
--- a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- configure.ac | 2 +-
- src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 869a989..2936983 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- AC_HEADER_STDC
--
-+AC_HEADER_MAJOR
-
- dnl Checks for structures.
- dnl
-diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
-index 554583c..9be99d8 100644
---- a/src/plugins/task/cgroup/task_cgroup_devices.c
-+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
-@@ -42,6 +42,12 @@
- #include <sched.h>
- #include <glob.h>
- #include <sys/types.h>
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
- #include <sys/stat.h>
- #include <slurm/slurm.h>
- #include <slurm/slurm_errno.h>
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
new file mode 100644
index 00000000000..eec43fb449c
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
@@ -0,0 +1,16 @@
+ src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+index 51f72df226..3a5ffef60d 100644
+--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
++++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap)
+ if (mem_sort && (numa_available() != -1)) {
+ struct stat sb;
+ int buf_len, fd, i, len, rc;
+- char buf[8];
++ char buf[10];
+
+ if (stat(ZONE_SORT_PATH, &sb) == -1) {
+ rc = system(MODPROBE_PATH " zonesort_module");
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
similarity index 62%
rename from sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
index 1e4a5b4fae3..f7e2c5b2673 100644
--- a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
@@ -1,7 +1,13 @@
-diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
---- slurm-16.05.2.orig/configure.ac 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300
-@@ -261,44 +261,6 @@
+ configure.ac | 39 ---------------------------------------
+ doc/man/man1/Makefile.am | 8 --------
+ src/Makefile.am | 3 +--
+ 3 files changed, 1 insertion(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f177ec..ff4d69b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
@@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
-
-AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
-
- X_AC_DATABASES
-
dnl Cray ALPS/Basil support depends on mySQL
-@@ -503,7 +465,6 @@
+ X_AC_CRAY
+
+@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
src/sshare/Makefile
src/sstat/Makefile
src/strigger/Makefile
@@ -54,16 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
src/plugins/Makefile
src/plugins/accounting_storage/Makefile
src/plugins/accounting_storage/common/Makefile
-diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
---- slurm-16.05.2.orig/src/Makefile.am 2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300
-@@ -27,8 +27,7 @@
+diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
+index 246f16d..ba39af2 100644
+--- a/doc/man/man1/Makefile.am
++++ b/doc/man/man1/Makefile.am
+@@ -29,10 +29,6 @@ if WITH_BLCR
+ man1_MANS += srun_cr.1
+ endif
+
+-if BUILD_SVIEW
+-man1_MANS += sview.1
+-endif
+-
+ EXTRA_DIST = $(man1_MANS)
+
+ if HAVE_MAN2HTML
+@@ -65,10 +61,6 @@ if WITH_BLCR
+ html_DATA += srun_cr.html
+ endif
+
+-if BUILD_SVIEW
+-html_DATA += sview.html
+-endif
+-
+ MOSTLYCLEANFILES = ${html_DATA}
+
+ EXTRA_DIST += $(html_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcd5aa7..a8cbf17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,5 +28,4 @@ SUBDIRS = \
srun_cr \
sshare \
sstat \
- strigger \
- sview
+ strigger
-
- if !REAL_BG_L_P_LOADED
- SUBDIRS += srun
diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-17.11.4.ebuild
similarity index 74%
rename from sys-cluster/slurm/slurm-16.05.11.ebuild
rename to sys-cluster/slurm/slurm-17.11.4.ebuild
index 6f935a07577..0b943a40504 100644
--- a/sys-cluster/slurm/slurm-16.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,19 +17,19 @@ else
fi
MY_P="${PN}-${MY_PV}"
INHERIT_GIT=""
- SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
+ SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
DEPEND="
!sys-cluster/torque
@@ -54,7 +54,7 @@ RESTRICT="primaryuri test"
PATCHES=(
"${FILESDIR}"/${P}-disable-sview.patch
- "${FILESDIR}"/${P}-sysmacros.patch
+ "${FILESDIR}"/${P}-buffer.patch
)
src_unpack() {
@@ -71,10 +71,8 @@ pkg_setup() {
}
src_prepare() {
- if [ ${#PATCHES[0]} -ne 0 ]; then
- epatch "${PATCHES[@]}"
- fi
- eapply_user
+ default
+
# pids should go to /var/run/slurm
sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
-e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
@@ -101,6 +99,7 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${P}"
--htmldir="${EPREFIX}/usr/share/doc/${P}"
)
+ use debug || myconf+=( --disable-debug )
use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
use mysql || myconf+=( --without-mysql_config )
econf "${myconf[@]}" \
@@ -113,19 +112,21 @@ src_configure() {
# --htmldir does not seems to propagate... Documentations are installed
# in /usr/share/doc/slurm-2.3.0/html
# instead of /usr/share/doc/slurm-2.3.0.2/html
- sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
+ sed \
+ -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+ -i doc/html/Makefile || die
if use perl ; then
# small hack to make it compile
- mkdir -p "${S}/src/api/.libs"
- mkdir -p "${S}/src/db_api/.libs"
- touch "${S}/src/api/.libs/libslurm.so"
- touch "${S}/src/db_api/.libs/libslurmdb.so"
- cd "${LIBSLURM_PERL_S}"
+ mkdir -p "${S}/src/api/.libs" || die
+ mkdir -p "${S}/src/db_api/.libs" || die
+ touch "${S}/src/api/.libs/libslurm.so" || die
+ touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+ cd "${LIBSLURM_PERL_S}" || die
S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${LIBSLURMDB_PERL_S}"
+ cd "${LIBSLURMDB_PERL_S}" || die
S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${S}"
- rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
+ cd "${S}" || die
+ rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
fi
}
@@ -133,26 +134,24 @@ src_compile() {
default
use pam && emake -C contribs/pam
if use perl ; then
- cd "${LIBSLURM_PERL_S}"
+ cd "${LIBSLURM_PERL_S}" || die
S="${LIBSLURM_PERL_S}" perl-module_src_compile
- cd "${LIBSLURMDB_PERL_S}"
+ cd "${LIBSLURMDB_PERL_S}" || die
S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
- cd "${S}"
- fi
- if use torque ; then
- emake -C contribs/torque
+ cd "${S}" || die
fi
+ use torque && emake -C contribs/torque
}
src_install() {
default
use pam && emake DESTDIR="${D}" -C contribs/pam install
if use perl; then
- cd "${LIBSLURM_PERL_S}"
+ cd "${LIBSLURM_PERL_S}" || die
S="${LIBSLURM_PERL_S}" perl-module_src_install
- cd "${LIBSLURMDB_PERL_S}"
+ cd "${LIBSLURMDB_PERL_S}" || die
S="${LIBSLURMDB_PERL_S}" perl-module_src_install
- cd "${S}"
+ cd "${S}" || die
fi
if use torque; then
emake DESTDIR="${D}" -C contribs/torque
@@ -162,30 +161,29 @@ src_install() {
# install sample configs
keepdir /etc/slurm
insinto /etc/slurm
- doins etc/bluegene.conf.example
- doins etc/cgroup.conf.example
- doins etc/cgroup_allowed_devices_file.conf.example
- doins etc/slurm.conf.example
- doins etc/slurmdbd.conf.example
+ doins \
+ etc/bluegene.conf.example \
+ etc/cgroup.conf.example \
+ etc/cgroup_allowed_devices_file.conf.example \
+ etc/slurm.conf.example \
+ etc/slurmdbd.conf.example
exeinto /etc/slurm
- doexe etc/cgroup.release_common.example
- doexe etc/slurm.epilog.clean
+ doexe \
+ etc/slurm.epilog.clean
# install init.d files
- newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
- newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
- newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
+ newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
# install conf.d files
newconfd "${FILESDIR}/slurm.confd" slurm
# Install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
- # cgroups support
- exeinto /etc/slurm/cgroup
- doexe etc/cgroup.release_common.example
- mv "${ED}"/etc/slurm/cgroup/{cgroup.release_common.example,release_common} || die "Can't move cgroup.release_common.example"
- ln -s release_common "${ED}"/etc/slurm/cgroup/release_cpuset || die "Can't create symbolic link release_cpuset"
- ln -s release_common "${ED}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
- ln -s release_common "${ED}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
+
+ newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
+ bashcomp_alias \
+ sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+ sprio sacct salloc sbatch srun sattach sdiag sstat
}
pkg_preinst() {
@@ -214,12 +212,12 @@ pkg_postinst() {
for folder_path in ${paths[@]}; do
create_folders_and_fix_permissions $folder_path
done
- einfo
+ echo
elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
elog "through a (javascript enabled) browser to create a configureation file."
elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
- einfo
+ echo
elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
elog "Your kernel must be compiled with the wanted cgroup feature:"
elog " General setup --->"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-04-01 20:51 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2018-04-01 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 20:50:01 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 20:51:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c190a28
sys-cluster/slurm: Version Bump
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.27, Repoman-2.3.9
sys-cluster/slurm/Manifest | 4 ++--
...le-sview.patch => slurm-17.02.10-disable-sview.patch} | 0
sys-cluster/slurm/files/slurm-17.11.4-buffer.patch | 16 ----------------
...ble-sview.patch => slurm-17.11.5-disable-sview.patch} | 0
.../{slurm-17.02.9.ebuild => slurm-17.02.10.ebuild} | 3 ++-
.../slurm/{slurm-17.11.4.ebuild => slurm-17.11.5.ebuild} | 14 ++++++++------
6 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 168ca920923..4fb2eb50441 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
-DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962
+DIST slurm-17.02.10.tar.bz2 6056342 BLAKE2B 1e6f3af68371e75a880fc28e4c7931fa61372a52bf9ce7b089c9bc62c5660c57c1e4b74d93c4105e611b9702c3bf64f1b9713d26c21513cb83bc11edc258be40 SHA512 b6fbec81abc36dcb5cd742363c33caeecad6c42ee80fe7a13ddc81703b5f5c28f3ddd88bbfbabe94550257d46b56d2c0e0ded9da6b92617074c57358ba33d449
+DIST slurm-17.11.5.tar.bz2 6248551 BLAKE2B f41754eeee6f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 SHA512 cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
diff --git a/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
deleted file mode 100644
index eec43fb449c..00000000000
--- a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-index 51f72df226..3a5ffef60d 100644
---- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-+++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap)
- if (mem_sort && (numa_available() != -1)) {
- struct stat sb;
- int buf_len, fd, i, len, rc;
-- char buf[8];
-+ char buf[10];
-
- if (stat(ZONE_SORT_PATH, &sb) == -1) {
- rc = system(MODPROBE_PATH " zonesort_module");
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.10.ebuild
similarity index 99%
rename from sys-cluster/slurm/slurm-17.02.9.ebuild
rename to sys-cluster/slurm/slurm-17.02.10.ebuild
index f4c3c841d3f..9387b9d5355 100644
--- a/sys-cluster/slurm/slurm-17.02.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.02.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -35,6 +35,7 @@ DEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
+ !sys-cluster/pmix[pmi]
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
diff --git a/sys-cluster/slurm/slurm-17.11.4.ebuild b/sys-cluster/slurm/slurm-17.11.5.ebuild
similarity index 96%
rename from sys-cluster/slurm/slurm-17.11.4.ebuild
rename to sys-cluster/slurm/slurm-17.11.5.ebuild
index 0b943a40504..dcd9cec0e6d 100644
--- a/sys-cluster/slurm/slurm-17.11.4.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.5.ebuild
@@ -22,25 +22,27 @@ else
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix user ${INHERIT_GIT}
DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X"
DEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
+ sys-cluster/pmix[-pmi]
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
+ X? ( net-libs/libssh2 )
>=sys-apps/hwloc-1.1.1-r1"
RDEPEND="${DEPEND}
dev-libs/libcgroup"
@@ -54,7 +56,6 @@ RESTRICT="primaryuri test"
PATCHES=(
"${FILESDIR}"/${P}-disable-sview.patch
- "${FILESDIR}"/${P}-buffer.patch
)
src_unpack() {
@@ -104,6 +105,7 @@ src_configure() {
use mysql || myconf+=( --without-mysql_config )
econf "${myconf[@]}" \
$(use_enable pam) \
+ $(use_enable X x11) \
$(use_with ssl) \
$(use_with munge) \
$(use_enable static-libs static) \
@@ -180,9 +182,9 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
- newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
- bashcomp_alias \
- sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+ newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+ bashcomp_alias scontrol \
+ sreport sacctmgr squeue scancel sshare sbcast sinfo \
sprio sacct salloc sbatch srun sattach sdiag sstat
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-06-09 20:33 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2018-06-09 20:33 UTC (permalink / raw
To: gentoo-commits
commit: 7f3509acf5cb66578a5a17946cf473198af68550
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 9 14:31:33 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 9 20:33:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3509ac
sys-cluster/slurm: Version Bump to mitigate CVE-2018-10995
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-cluster/slurm/Manifest | 4 ++--
...7.02.10-disable-sview.patch => slurm-17.02.11-disable-sview.patch} | 0
...-17.11.5-disable-sview.patch => slurm-17.11.7-disable-sview.patch} | 0
sys-cluster/slurm/{slurm-17.02.10.ebuild => slurm-17.02.11.ebuild} | 0
sys-cluster/slurm/{slurm-17.11.5.ebuild => slurm-17.11.7.ebuild} | 0
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 4fb2eb50441..ec10fe92e5a 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.02.10.tar.bz2 6056342 BLAKE2B 1e6f3af68371e75a880fc28e4c7931fa61372a52bf9ce7b089c9bc62c5660c57c1e4b74d93c4105e611b9702c3bf64f1b9713d26c21513cb83bc11edc258be40 SHA512 b6fbec81abc36dcb5cd742363c33caeecad6c42ee80fe7a13ddc81703b5f5c28f3ddd88bbfbabe94550257d46b56d2c0e0ded9da6b92617074c57358ba33d449
-DIST slurm-17.11.5.tar.bz2 6248551 BLAKE2B f41754eeee6f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 SHA512 cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
+DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c
+DIST slurm-17.11.7.tar.bz2 6249399 BLAKE2B 1a57996440611e1976ac382c1be845649baf930913ad52c8afeecc32e1037115d9477acc4a9ab936c09b60c50d72e3f0398ea3c4ee9490d5057f98ce5990d52e SHA512 1761bad0b355f7d76021f9c1023cff4c315ec727fab8045f6aca4d096cdba3ec44a52942e007877d40c396d791537eb7e61a8c2f2538bdcb3854e40cee9e73ea
diff --git a/sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.02.10.ebuild b/sys-cluster/slurm/slurm-17.02.11.ebuild
similarity index 100%
rename from sys-cluster/slurm/slurm-17.02.10.ebuild
rename to sys-cluster/slurm/slurm-17.02.11.ebuild
diff --git a/sys-cluster/slurm/slurm-17.11.5.ebuild b/sys-cluster/slurm/slurm-17.11.7.ebuild
similarity index 100%
rename from sys-cluster/slurm/slurm-17.11.5.ebuild
rename to sys-cluster/slurm/slurm-17.11.7.ebuild
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-09-04 13:37 Alexey Shvetsov
0 siblings, 0 replies; 12+ messages in thread
From: Alexey Shvetsov @ 2018-09-04 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 87493661de13b2f850a0b7de0f955d8e9504fe83
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 13:31:38 2018 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 13:31:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87493661
sys-cluster/slurm: enhance ebuild and migrate to eapi6 and eapi7_ver
Include fixes from Timo Rothenpieler
Add systemd support.
Fix building perl modules.
Add some more useflags with useful features.
Kernel-Options did not match a modern kernel, use more generic format.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://bugs.gentoo.org/653876
sys-cluster/slurm/Manifest | 2 +-
sys-cluster/slurm/files/slurm.tmpfiles | 1 +
sys-cluster/slurm/metadata.xml | 6 ++
.../{slurm-17.11.7.ebuild => slurm-17.11.9.ebuild} | 105 +++++++++++++--------
4 files changed, 75 insertions(+), 39 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index ec10fe92e5a..0dcf5c27a7f 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c
-DIST slurm-17.11.7.tar.bz2 6249399 BLAKE2B 1a57996440611e1976ac382c1be845649baf930913ad52c8afeecc32e1037115d9477acc4a9ab936c09b60c50d72e3f0398ea3c4ee9490d5057f98ce5990d52e SHA512 1761bad0b355f7d76021f9c1023cff4c315ec727fab8045f6aca4d096cdba3ec44a52942e007877d40c396d791537eb7e61a8c2f2538bdcb3854e40cee9e73ea
+DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b
diff --git a/sys-cluster/slurm/files/slurm.tmpfiles b/sys-cluster/slurm/files/slurm.tmpfiles
new file mode 100644
index 00000000000..c77457db557
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm.tmpfiles
@@ -0,0 +1 @@
+d /run/slurm 755 slurm slurm -
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index 3ea81217548..433eeb9e04c 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -9,8 +9,14 @@
<name>Gentoo Cluster Project</name>
</maintainer>
<use>
+ <flag name="html">Build html documentation</flag>
+ <flag name="ipmi">Build support for collecting some ipmi stats</flag>
+ <flag name="json">Add support for json-persing via json-c</flag>
<flag name="munge">Enable authentication via munge</flag>
<flag name="multiple-slurmd">Allow multiple slurmd to run</flag>
+ <flag name="netloc">Add support for netloc (amd64 only)</flag>
+ <flag name="numa">Add NUMA awareness</flag>
+ <flag name="ofed">Add Infiniband support via ofed</flag>
<flag name="torque">Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
</use>
</pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-17.11.7.ebuild b/sys-cluster/slurm/slurm-17.11.9.ebuild
similarity index 69%
rename from sys-cluster/slurm/slurm-17.11.7.ebuild
rename to sys-cluster/slurm/slurm-17.11.9.ebuild
index c0310a53cc3..3a1c55f311c 100644
--- a/sys-cluster/slurm/slurm-17.11.7.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.9.ebuild
@@ -8,12 +8,13 @@ if [[ ${PV} == *9999* ]]; then
INHERIT_GIT="git-r3"
SRC_URI=""
KEYWORDS=""
+ MY_P="${P}"
else
- inherit versionator
+ inherit eapi7-ver
if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
+ MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
else
- MY_PV=$(replace_version_separator 3 '-') # stable releases
+ MY_PV=$(ver_rs 3 '-') # stable releases
fi
MY_P="${PN}-${MY_PV}"
INHERIT_GIT=""
@@ -22,16 +23,16 @@ else
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user systemd ${INHERIT_GIT}
DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X"
-DEPEND="
+CDEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
@@ -42,15 +43,26 @@ DEPEND="
ssl? ( dev-libs/openssl:0= )
lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
+ ipmi? ( sys-libs/freeipmi )
+ json? ( dev-libs/json-c:= )
+ amd64? ( netloc? ( sys-apps/netloc ) )
+ hdf5? ( sci-libs/hdf5:= )
+ numa? ( sys-process/numactl )
+ ofed? ( sys-fabric/ofed )
X? ( net-libs/libssh2 )
- >=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
+ >=sys-apps/hwloc-1.1.1-r1
+ sys-libs/ncurses:0=
+ app-arch/lz4:0=
+ sys-libs/readline:0="
+DEPEND="${CDEPEND}
+ html? ( sys-apps/man2html )"
+RDEPEND="${CDEPEND}
dev-libs/libcgroup"
REQUIRED_USE="torque? ( perl )"
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
+LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
RESTRICT="primaryuri test"
@@ -60,7 +72,7 @@ PATCHES=(
src_unpack() {
if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
default
fi
@@ -76,10 +88,13 @@ src_prepare() {
default
# pids should go to /var/run/slurm
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
+ sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+ -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for /var/run/slurmctld.pid"
+ sed -i "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+ -i "${S}/etc/slurmdbd.conf.example" \
+ || die "Can't sed for /var/run/slurmdbd.pid"
# also state dirs are in /var/spool/slurm
sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
@@ -89,26 +104,35 @@ src_prepare() {
sed -e 's:/tmp:/var/tmp:g' \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for StateSaveLocation=*./tmp"
+ # gentooify systemd services
+ sed -e 's:sysconfig/.*:conf.d/slurm:g' \
+ -e 's:var/run/:run/slurm/:g' \
+ -i "${S}/etc"/*.service.in \
+ || die "Can't sed systemd services for sysconfig or var/run/"
hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
eautoreconf
}
src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --docdir="${EPREFIX}/usr/share/doc/${P}"
- --htmldir="${EPREFIX}/usr/share/doc/${P}"
- )
use debug || myconf+=( --disable-debug )
+ local myconf=(
+ --sysconfdir="${EPREFIX}/etc/${PN}"
+ --with-hwloc="${EPREFIX}/usr"
+ --docdir="${EPREFIX}/usr/share/doc/${P}"
+ --htmldir="${EPREFIX}/usr/share/doc/${P}"
+ )
use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
use mysql || myconf+=( --without-mysql_config )
+ use amd64 && myconf+=( $(use_with netloc) )
econf "${myconf[@]}" \
$(use_enable pam) \
$(use_enable X x11) \
$(use_with ssl) \
$(use_with munge) \
+ $(use_with json) \
+ $(use_with hdf5) \
+ $(use_with ofed) \
$(use_enable static-libs static) \
$(use_enable multiple-slurmd)
@@ -173,20 +197,28 @@ src_install() {
exeinto /etc/slurm
doexe \
etc/slurm.epilog.clean
+ keepdir /etc/slurm/layouts.d
+ insinto /etc/slurm/layouts.d
+ newins etc/layouts.d.power.conf.example power.conf.example
+ newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+ newins etc/layouts.d.unit.conf.example unit.conf.example
# install init.d files
- newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
- newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
- newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
# install conf.d files
newconfd "${FILESDIR}/slurm.confd" slurm
- # Install logrotate file
+ # install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
-
+ # install bashcomp
newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
bashcomp_alias scontrol \
sreport sacctmgr squeue scancel sshare sbcast sinfo \
sprio sacct salloc sbatch srun sattach sdiag sstat
+ # install systemd files
+ systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+ systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
}
pkg_preinst() {
@@ -197,8 +229,8 @@ pkg_preinst() {
create_folders_and_fix_permissions() {
einfo "Fixing permissions in ${@}"
- mkdir -p ${@}
- chown -R ${PN}:${PN} ${@}
+ mkdir -p ${@} || die
+ chown -R ${PN}:${PN} ${@} || die
}
pkg_postinst() {
@@ -207,11 +239,12 @@ pkg_postinst() {
"${EROOT}"var/${PN}
"${EROOT}"var/spool/${PN}/slurmd
"${EROOT}"var/spool/${PN}
- "${EROOT}"var/run/${PN}
"${EROOT}"var/log/${PN}
/var/tmp/${PN}/${PN}d
/var/tmp/${PN}
- )
+ /run/${PN}
+ )
+ local folder_path
for folder_path in ${paths[@]}; do
create_folders_and_fix_permissions $folder_path
done
@@ -223,16 +256,12 @@ pkg_postinst() {
echo
elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " General setup --->"
- elog " [*] Control Group support --->"
- elog " [*] Freezer cgroup subsystem"
- elog " [*] Device controller for cgroups"
- elog " [*] Cpuset support"
- elog " [*] Simple CPU accounting cgroup subsystem"
- elog " [*] Resource counters"
- elog " [*] Memory Resource Controller for Control Groups"
- elog " [*] Group CPU scheduler --->"
- elog " [*] Group scheduling for SCHED_OTHER"
+ elog " For the proctrack plugin:"
+ elog " freezer"
+ elog " For the task plugin:"
+ elog " cpuset, memory, devices"
+ elog " For the accounting plugin:"
+ elog " cpuacct, memory, blkio"
elog "Then, set these options in /etc/slurm/slurm.conf:"
elog " ProctrackType=proctrack/cgroup"
elog " TaskPlugin=task/cgroup"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-09-04 13:37 Alexey Shvetsov
0 siblings, 0 replies; 12+ messages in thread
From: Alexey Shvetsov @ 2018-09-04 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 759a83663940a35618f0ffbfae5911e1301f5963
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 13:32:15 2018 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 13:32:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759a8366
sys-cluster/slurm: Drop old version
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sys-cluster/slurm/Manifest | 1 -
.../slurm/files/slurm-17.02.11-disable-sview.patch | 99 ---------
sys-cluster/slurm/slurm-17.02.11.ebuild | 237 ---------------------
3 files changed, 337 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 0dcf5c27a7f..ab80e3b9bdc 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1 @@
-DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c
DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b
diff --git a/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch
deleted file mode 100644
index f7e2c5b2673..00000000000
--- a/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch
+++ /dev/null
@@ -1,99 +0,0 @@
- configure.ac | 39 ---------------------------------------
- doc/man/man1/Makefile.am | 8 --------
- src/Makefile.am | 3 +--
- 3 files changed, 1 insertion(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f177ec..ff4d69b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
-
--#
--# Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
--fi
--
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
-- AC_MSG_WARN([cannot build sview without gtk library]);
--fi
--
--AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
--
- dnl Cray ALPS/Basil support depends on mySQL
- X_AC_CRAY
-
-@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
- src/sshare/Makefile
- src/sstat/Makefile
- src/strigger/Makefile
-- src/sview/Makefile
- src/plugins/Makefile
- src/plugins/accounting_storage/Makefile
- src/plugins/accounting_storage/common/Makefile
-diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
-index 246f16d..ba39af2 100644
---- a/doc/man/man1/Makefile.am
-+++ b/doc/man/man1/Makefile.am
-@@ -29,10 +29,6 @@ if WITH_BLCR
- man1_MANS += srun_cr.1
- endif
-
--if BUILD_SVIEW
--man1_MANS += sview.1
--endif
--
- EXTRA_DIST = $(man1_MANS)
-
- if HAVE_MAN2HTML
-@@ -65,10 +61,6 @@ if WITH_BLCR
- html_DATA += srun_cr.html
- endif
-
--if BUILD_SVIEW
--html_DATA += sview.html
--endif
--
- MOSTLYCLEANFILES = ${html_DATA}
-
- EXTRA_DIST += $(html_DATA)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcd5aa7..a8cbf17 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,5 +28,4 @@ SUBDIRS = \
- srun_cr \
- sshare \
- sstat \
-- strigger \
-- sview
-+ strigger
diff --git a/sys-cluster/slurm/slurm-17.02.11.ebuild b/sys-cluster/slurm/slurm-17.02.11.ebuild
deleted file mode 100644
index b52290725ed..00000000000
--- a/sys-cluster/slurm/slurm-17.02.11.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
- INHERIT_GIT="git-r3"
- SRC_URI=""
- KEYWORDS=""
-else
- inherit versionator
- if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
- else
- MY_PV=$(replace_version_separator 3 '-') # stable releases
- fi
- MY_P="${PN}-${MY_PV}"
- INHERIT_GIT=""
- SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT}
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
-
-DEPEND="
- !sys-cluster/torque
- !net-analyzer/slurm
- !net-analyzer/sinfo
- !sys-cluster/pmix[pmi]
- mysql? ( virtual/mysql )
- munge? ( sys-auth/munge )
- pam? ( virtual/pam )
- ssl? ( dev-libs/openssl:0= )
- lua? ( dev-lang/lua:0= )
- !lua? ( !dev-lang/lua )
- >=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
- dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="primaryuri test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-disable-sview.patch
-)
-
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
- else
- default
- fi
-}
-
-pkg_setup() {
- enewgroup slurm 500
- enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
- tc-ld-disable-gold
- default
-
- # pids should go to /var/run/slurm
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed for /var/run/slurmctld.pid"
- # also state dirs are in /var/spool/slurm
- sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
- -e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
- # and tmp should go to /var/tmp/slurm
- sed -e 's:/tmp:/var/tmp:g' \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed for StateSaveLocation=*./tmp"
-
- hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --docdir="${EPREFIX}/usr/share/doc/${P}"
- --htmldir="${EPREFIX}/usr/share/doc/${P}"
- )
- use debug || myconf+=( --disable-debug )
- use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
- use mysql || myconf+=( --without-mysql_config )
- econf "${myconf[@]}" \
- $(use_enable pam) \
- $(use_with ssl) \
- $(use_with munge) \
- $(use_enable static-libs static) \
- $(use_enable multiple-slurmd)
-
- # --htmldir does not seems to propagate... Documentations are installed
- # in /usr/share/doc/slurm-2.3.0/html
- # instead of /usr/share/doc/slurm-2.3.0.2/html
- sed \
- -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
- -i doc/html/Makefile || die
- if use perl ; then
- # small hack to make it compile
- mkdir -p "${S}/src/api/.libs" || die
- mkdir -p "${S}/src/db_api/.libs" || die
- touch "${S}/src/api/.libs/libslurm.so" || die
- touch "${S}/src/db_api/.libs/libslurmdb.so" || die
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
- cd "${S}" || die
- rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
- fi
-}
-
-src_compile() {
- default
- use pam && emake -C contribs/pam
- if use perl ; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_compile
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
- cd "${S}" || die
- fi
- use torque && emake -C contribs/torque
-}
-
-src_install() {
- default
- use pam && emake DESTDIR="${D}" -C contribs/pam install
- if use perl; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_install
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_install
- cd "${S}" || die
- fi
- if use torque; then
- emake DESTDIR="${D}" -C contribs/torque
- rm -f "${ED}/usr/bin/mpiexec" || die
- fi
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
- # install sample configs
- keepdir /etc/slurm
- insinto /etc/slurm
- doins \
- etc/bluegene.conf.example \
- etc/cgroup.conf.example \
- etc/cgroup_allowed_devices_file.conf.example \
- etc/slurm.conf.example \
- etc/slurmdbd.conf.example
- exeinto /etc/slurm
- doexe \
- etc/slurm.epilog.clean
- # install init.d files
- newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
- newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
- newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
- # install conf.d files
- newconfd "${FILESDIR}/slurm.confd" slurm
- # Install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotate" slurm
-}
-
-pkg_preinst() {
- if use munge; then
- sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die
- fi
-}
-
-create_folders_and_fix_permissions() {
- einfo "Fixing permissions in ${@}"
- mkdir -p ${@}
- chown -R ${PN}:${PN} ${@}
-}
-
-pkg_postinst() {
- paths=(
- "${EROOT}"var/${PN}/checkpoint
- "${EROOT}"var/${PN}
- "${EROOT}"var/spool/${PN}/slurmd
- "${EROOT}"var/spool/${PN}
- "${EROOT}"var/run/${PN}
- "${EROOT}"var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- )
- for folder_path in ${paths[@]}; do
- create_folders_and_fix_permissions $folder_path
- done
- echo
-
- elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
- elog "through a (javascript enabled) browser to create a configureation file."
- elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
- echo
- elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
- elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " General setup --->"
- elog " [*] Control Group support --->"
- elog " [*] Freezer cgroup subsystem"
- elog " [*] Device controller for cgroups"
- elog " [*] Cpuset support"
- elog " [*] Simple CPU accounting cgroup subsystem"
- elog " [*] Resource counters"
- elog " [*] Memory Resource Controller for Control Groups"
- elog " [*] Group CPU scheduler --->"
- elog " [*] Group scheduling for SCHED_OTHER"
- elog "Then, set these options in /etc/slurm/slurm.conf:"
- elog " ProctrackType=proctrack/cgroup"
- elog " TaskPlugin=task/cgroup"
- einfo
- ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
- for folder_path in ${paths[@]}; do
- ewarn " ${folder_path}"
- done
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2018-11-10 11:45 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2018-11-10 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 0ef6070d7a477ec5c971ccd6502b2822f3fc2fd6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 07:58:23 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 11:45:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef6070d
sys-cluster/slurm: Version Bump
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-cluster/slurm/Manifest | 4 ++--
...17.11.7-disable-sview.patch => slurm-17.11.12-disable-sview.patch} | 0
...-18.08.0-disable-sview.patch => slurm-18.08.3-disable-sview.patch} | 0
sys-cluster/slurm/{slurm-17.11.9.ebuild => slurm-17.11.12.ebuild} | 2 +-
sys-cluster/slurm/{slurm-18.08.0.ebuild => slurm-18.08.3.ebuild} | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 0800d99dd77..9ef55782fc5 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b
-DIST slurm-18.08.0.tar.bz2 6100548 BLAKE2B 108a64c05cf704288b2ed3627b92edb6402c41aec9866b06d7fdf18b9e0e5f5e815a7e7ded5f8d5c4ab7e9ad46368b5bc54ac52902413fc8a9395c665f11e2ed SHA512 e0da38e2b8b96433c244bcad41e7dd0da56e9bf3de8a64eafd5a8d89ffb8400a3aebb2a54ec28f6c2e9804d40945bb8b53b2a9e3ac688a1d8a2a81ee71b4b11d
+DIST slurm-17.11.12.tar.bz2 6257065 BLAKE2B 3427645f9e54e90ce5f61395a1df7f2c1c9f5582e25780daab8a05dbe92bd39841356df8e66334bc3d8ee3d81f6a56b344e81ed142cd354d22fbdb4729c554d1 SHA512 bd59d2d9291e00c9ab71479e2190b89a7798f1ba9a4320b003d7c1ad6d62983c1d3debfdbdfc6e0abaf66472be6e3108c4969feb151e30874d3b51f53d213803
+DIST slurm-18.08.3.tar.bz2 6092020 BLAKE2B 63d5c7682decadc723637293660057a27a20b5ba4f0e0d53708091b86b59ed05c28ad19a70b2cf6d7c1e58df81f12fb2b5e26e44fa06cb5deacde5cd5b7db0f7 SHA512 2d1018e5b1520a5d71825d548d91d06d0f0a8df92b33f87d21a2238a5245a1199ca588370aea1df6ad9d09242df9a6af19ea80357dae41a0337812617721c8bf
diff --git a/sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.12-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.12-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.11.9.ebuild b/sys-cluster/slurm/slurm-17.11.12.ebuild
similarity index 99%
rename from sys-cluster/slurm/slurm-17.11.9.ebuild
rename to sys-cluster/slurm/slurm-17.11.12.ebuild
index 837a4d32c76..67111e2fac8 100644
--- a/sys-cluster/slurm/slurm-17.11.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/sys-cluster/slurm/slurm-18.08.0.ebuild b/sys-cluster/slurm/slurm-18.08.3.ebuild
similarity index 99%
rename from sys-cluster/slurm/slurm-18.08.0.ebuild
rename to sys-cluster/slurm/slurm-18.08.3.ebuild
index b3b7d52d447..d217effa43a 100644
--- a/sys-cluster/slurm/slurm-18.08.0.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2019-07-08 19:35 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2019-07-08 19:35 UTC (permalink / raw
To: gentoo-commits
commit: d21a20c69d563695edb1d5ad687dd72184dcfa2a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 17:49:08 2019 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 19:35:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21a20c6
sys-cluster/slurm: Version Bump
Clean mysql deps
Install torque wrapper correctly
Closes: https://bugs.gentoo.org/666102
Closes: https://bugs.gentoo.org/676916
Closes: https://bugs.gentoo.org/666072
Closes: https://bugs.gentoo.org/506706
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-cluster/slurm/Manifest | 4 ++--
...sable-sview.patch => slurm-17.11.13.2-disable-sview.patch} | 0
...-disable-sview.patch => slurm-18.08.7-disable-sview.patch} | 0
sys-cluster/slurm/metadata.xml | 1 +
.../slurm/{slurm-17.11.12.ebuild => slurm-17.11.13.2.ebuild} | 11 ++++++++---
.../slurm/{slurm-18.08.3-r1.ebuild => slurm-18.08.7.ebuild} | 9 ++++++---
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 9ef55782fc5..5d692ad2b82 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.11.12.tar.bz2 6257065 BLAKE2B 3427645f9e54e90ce5f61395a1df7f2c1c9f5582e25780daab8a05dbe92bd39841356df8e66334bc3d8ee3d81f6a56b344e81ed142cd354d22fbdb4729c554d1 SHA512 bd59d2d9291e00c9ab71479e2190b89a7798f1ba9a4320b003d7c1ad6d62983c1d3debfdbdfc6e0abaf66472be6e3108c4969feb151e30874d3b51f53d213803
-DIST slurm-18.08.3.tar.bz2 6092020 BLAKE2B 63d5c7682decadc723637293660057a27a20b5ba4f0e0d53708091b86b59ed05c28ad19a70b2cf6d7c1e58df81f12fb2b5e26e44fa06cb5deacde5cd5b7db0f7 SHA512 2d1018e5b1520a5d71825d548d91d06d0f0a8df92b33f87d21a2238a5245a1199ca588370aea1df6ad9d09242df9a6af19ea80357dae41a0337812617721c8bf
+DIST slurm-17.11.13-2.tar.bz2 6261416 BLAKE2B bca7a06e703799371da11a7427ce009784c7236569f4b24b278078231192bb0e90604fb90a61f8269881ccacd154cbf03174b3e4600410a8c726beccf4aefd18 SHA512 d419984bfa1bf1be20d3439672eaf868e3e0c45549b8d696bb6f588a57e1bc1e765dbca8a9a62c54bf27c3dfbbd0f165f573459a22ef87d976bc511c22fde639
+DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93
diff --git a/sys-cluster/slurm/files/slurm-17.11.12-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.11.12-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index 433eeb9e04c..ddcebd29a67 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -17,6 +17,7 @@
<flag name="netloc">Add support for netloc (amd64 only)</flag>
<flag name="numa">Add NUMA awareness</flag>
<flag name="ofed">Add Infiniband support via ofed</flag>
+ <flag name="slurmdbd">Install SQL server for slurmdbd</flag>
<flag name="torque">Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
</use>
</pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-17.11.12.ebuild b/sys-cluster/slurm/slurm-17.11.13.2.ebuild
similarity index 97%
rename from sys-cluster/slurm/slurm-17.11.12.ebuild
rename to sys-cluster/slurm/slurm-17.11.13.2.ebuild
index 67111e2fac8..d669350a8a3 100644
--- a/sys-cluster/slurm/slurm-17.11.12.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,14 +30,17 @@ HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd ssl static-libs torque X"
CDEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
- mysql? ( virtual/mysql )
+ mysql? (
+ || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+ slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
+ )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
@@ -70,6 +73,8 @@ PATCHES=(
"${FILESDIR}"/${P}-disable-sview.patch
)
+S="${WORKDIR}/${MY_P}"
+
src_unpack() {
if [[ ${PV} == *9999* ]]; then
git-r3_src_unpack
diff --git a/sys-cluster/slurm/slurm-18.08.3-r1.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild
similarity index 97%
rename from sys-cluster/slurm/slurm-18.08.3-r1.ebuild
rename to sys-cluster/slurm/slurm-18.08.7.ebuild
index 92e034a9760..5a7bf934b19 100644
--- a/sys-cluster/slurm/slurm-18.08.3-r1.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,14 +30,17 @@ HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd ssl static-libs torque X"
CDEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
- mysql? ( virtual/mysql )
+ mysql? (
+ || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+ slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
+ )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2022-09-15 8:01 Alexey Shvetsov
0 siblings, 0 replies; 12+ messages in thread
From: Alexey Shvetsov @ 2022-09-15 8:01 UTC (permalink / raw
To: gentoo-commits
commit: b1947dd126dfbf1a19f631b770d3e36fffdf334e
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 08:00:39 2022 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 08:00:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1947dd1
sys-cluster/slurm: Update to new version
Closes: https://bugs.gentoo.org/744148
Bug: https://bugs.gentoo.org/790296
Bug: https://bugs.gentoo.org/842789
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
sys-cluster/slurm/Manifest | 2 +-
...-lua.patch => slurm-22.05.3_autoconf-lua.patch} | 19 +-
sys-cluster/slurm/metadata.xml | 6 +-
sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild | 275 ---------------------
...-20.11.0.1-r104.ebuild => slurm-22.05.3.ebuild} | 34 ++-
5 files changed, 38 insertions(+), 298 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index ba0ae40fe894..94e324733874 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1 @@
-DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
+DIST slurm-22.05.3.tar.bz2 7098045 BLAKE2B 597d297bf5f98a6aa98f1cc3047f9d0e88051f80e0d55e931d53a9b3e6bfa5911fe8aa486f56fef2d8f8d3a02fe41cf89625ae65e3737c87ceb9d123f03beb0d SHA512 a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21
diff --git a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
similarity index 75%
rename from sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch
rename to sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
index f17039e0b59d..f5723f7b85bc 100644
--- a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch
+++ b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
@@ -1,23 +1,22 @@
-Prevent automagical detection of Lua, abort if Lua support has been
-requested but Lua cannot be found with pkg-config, and use the Lua
-pkg-config module set up by the eclass-provided wrapper (or unslotted Lua)
-instead of enumerating installed versions.
-
+diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
+index 6941281bd5..206498191f 100644
--- a/auxdir/x_ac_lua.m4
+++ b/auxdir/x_ac_lua.m4
-@@ -12,18 +12,21 @@
+@@ -12,20 +12,21 @@
AC_DEFUN([X_AC_LUA],
[
- x_ac_lua_pkg_name="lua"
-- #check for 5.3 then 5.2 then 5.1
-- PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
+- #check for 5.4, 5.3, 5.2 and then 5.1
+- PKG_CHECK_EXISTS([lua5.4], [x_ac_lua_pkg_name=lua5.4],
+- [PKG_CHECK_EXISTS([lua-5.4], [x_ac_lua_pkg_name=lua-5.4],
+- [PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
- [PKG_CHECK_EXISTS([lua-5.3], [x_ac_lua_pkg_name=lua-5.3],
- [PKG_CHECK_EXISTS([lua5.2], [x_ac_lua_pkg_name=lua5.2],
- [PKG_CHECK_EXISTS([lua-5.2], [x_ac_lua_pkg_name=lua-5.2],
- [PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1],
- [PKG_CHECK_EXISTS([lua-5.1], [x_ac_lua_pkg_name=lua-5.1],
-- [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])
+- [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])])])
- PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
- [x_ac_have_lua="yes"],
- [x_ac_have_lua="no"])
@@ -39,7 +38,7 @@ instead of enumerating installed versions.
if test "x$x_ac_have_lua" = "xyes"; then
saved_CFLAGS="$CFLAGS"
-@@ -52,8 +55,6 @@
+@@ -60,8 +61,6 @@ AC_DEFUN([X_AC_LUA],
fi
CFLAGS="$saved_CFLAGS"
LIBS="$saved_LIBS"
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index fbaaba0061db..5f5481fc23fa 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -10,16 +10,20 @@
<name>Gentoo Cluster Project</name>
</maintainer>
<use>
+
<flag name="html">Build html documentation</flag>
<flag name="ipmi">Build support for collecting some ipmi stats</flag>
<flag name="json">Add support for json-persing via json-c</flag>
<flag name="munge">Enable authentication via munge</flag>
<flag name="multiple-slurmd">Allow multiple slurmd to run</flag>
- <flag name="netloc">Add support for netloc (amd64 only)</flag>
<flag name="numa">Add NUMA awareness</flag>
+ <flag name="nvml">Enable the NVML device discovery</flag>
<flag name="ofed">Add Infiniband support via ofed</flag>
+ <flag name="rrdtool">Enable RRD export plugin</flag>
<flag name="slurmdbd">Install SQL server for slurmdbd</flag>
+ <flag name="slurmrestd">Enable interface to Slurm via REST API</flag>
<flag name="torque">Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
<flag name="ucx">Enable Unified Communication X library support</flag>
+ <flag name="yaml">Enable YAML support</flag>
</use>
</pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
deleted file mode 100644
index 0445fde0fe39..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
- INHERIT_GIT="git-r3"
- MY_P="${P}"
-else
- if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
- else
- MY_PV=$(ver_rs 1-4 '-') # stable releases
- fi
- MY_P="${PN}-${MY_PV}"
- INHERIT_GIT=""
- SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-fi
-
-inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
- !sys-cluster/torque
- !net-analyzer/slurm
- !net-analyzer/sinfo
- || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
- mysql? (
- || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
- slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
- )
- munge? ( sys-auth/munge )
- pam? ( sys-libs/pam )
- lua? ( ${LUA_DEPS} )
- ipmi? ( sys-libs/freeipmi )
- json? ( dev-libs/json-c:= )
- amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0:=[netloc(-)] ) )
- hdf5? ( sci-libs/hdf5:= )
- numa? ( sys-process/numactl )
- ofed? ( sys-cluster/rdma-core )
- ucx? ( sys-cluster/ucx )
- X? ( net-libs/libssh2 )
- >=sys-apps/hwloc-1.1.1-r1:=
- sys-libs/ncurses:0=
- app-arch/lz4:0=
- dev-libs/glib:2=
- sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
- html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
- acct-user/slurm
- acct-group/slurm
- dev-libs/libcgroup"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- tc-ld-disable-gold
- default
-
- # pids should go to /var/run/slurm
- sed \
- -e 's:/tmp:/var/tmp:g' \
- -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
- -e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
- -e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
- -i "${S}/etc/slurm.conf.example" \
- || die "Can't sed for /var/run/slurmctld.pid"
- sed \
- -e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
- -i "${S}/etc/slurmdbd.conf.example" \
- || die "Can't sed for /var/run/slurmdbd.pid"
- # gentooify systemd services
- sed \
- -e 's:sysconfig/.*:conf.d/slurm:g' \
- -e 's:var/run/:run/slurm/:g' \
- -e '/^EnvironmentFile=.*/d' \
- -i "${S}/etc"/*.service.in \
- || die "Can't sed systemd services for sysconfig or var/run/"
-
- sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
- hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --htmldir="${EPREFIX}/usr/share/doc/${PF}"
- )
- use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
- use mysql || myconf+=( --without-mysql_config )
- use amd64 && myconf+=( $(use_with netloc) )
- econf "${myconf[@]}" \
- $(use_enable debug) \
- $(use_enable lua) \
- $(use_enable pam) \
- $(use_enable X x11) \
- $(use_with munge) \
- $(use_with json) \
- $(use_with hdf5) \
- $(use_with ofed) \
- $(use_with ucx) \
- $(use_enable static-libs static) \
- $(use_enable multiple-slurmd)
-
- # --htmldir does not seems to propagate... Documentations are installed
- # in /usr/share/doc/slurm-2.3.0/html
- # instead of /usr/share/doc/slurm-2.3.0.2/html
- sed \
- -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
- -i doc/html/Makefile || die
- if use perl ; then
- # small hack to make it compile
- mkdir -p "${S}/src/api/.libs" || die
- mkdir -p "${S}/src/db_api/.libs" || die
- touch "${S}/src/api/.libs/libslurm.so" || die
- touch "${S}/src/db_api/.libs/libslurmdb.so" || die
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_configure
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_configure
- cd "${S}" || die
- rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
- fi
-}
-
-src_compile() {
- default
- use pam && emake -C contribs/pam
- if use perl ; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_compile
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
- cd "${S}" || die
- fi
- use torque && emake -C contribs/torque
-}
-
-src_install() {
- default
- use pam && emake DESTDIR="${D}" -C contribs/pam install
- if use perl; then
- cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_install
- cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_install
- cd "${S}" || die
- fi
- if use torque; then
- emake DESTDIR="${D}" -C contribs/torque
- rm -f "${D}"/usr/bin/mpiexec || die
- fi
- use static-libs || find "${ED}" -name '*.la' -exec rm {} +
- # install sample configs
- keepdir /etc/slurm
- insinto /etc/slurm
- doins \
- etc/prolog.example \
- etc/cgroup.conf.example \
- etc/slurm.conf.example \
- etc/slurmdbd.conf.example
- exeinto /etc/slurm
- keepdir /etc/slurm/layouts.d
- # install init.d files
- newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
- newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
- newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
- # install conf.d files
- newconfd "${FILESDIR}/slurm.confd" slurm
- # install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotate" slurm
- # install bashcomp
- newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
- bashcomp_alias scontrol \
- sreport sacctmgr squeue scancel sshare sbcast sinfo \
- sprio sacct salloc sbatch srun sattach sdiag sstat
- # install systemd files
- newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
- systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
- if use munge; then
- sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
- fi
-}
-
-create_folders_and_fix_permissions() {
- einfo "Fixing permissions in ${@}"
- mkdir -p ${@} || die
- chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
- paths=(
- "${EROOT}"/var/${PN}/checkpoint
- "${EROOT}"/var/${PN}
- "${EROOT}"/var/spool/${PN}/slurmd
- "${EROOT}"/var/spool/${PN}
- "${EROOT}"/var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
- )
- local folder_path
- for folder_path in ${paths[@]}; do
- create_folders_and_fix_permissions $folder_path
- done
- echo
-
- tmpfiles_process slurm.conf
-
- elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
- elog "through a (javascript enabled) browser to create a configureation file."
- elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
- echo
- elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
- elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " For the proctrack plugin:"
- elog " freezer"
- elog " For the task plugin:"
- elog " cpuset, memory, devices"
- elog " For the accounting plugin:"
- elog " cpuacct, memory, blkio"
- elog "Then, set these options in /etc/slurm/slurm.conf:"
- elog " ProctrackType=proctrack/cgroup"
- elog " TaskPlugin=task/cgroup"
- einfo
- ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
- for folder_path in ${paths[@]}; do
- ewarn " ${folder_path}"
- done
-}
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-22.05.3.ebuild
similarity index 89%
rename from sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
rename to sys-cluster/slurm/slurm-22.05.3.ebuild
index ffd4361860d3..607d3dc407bb 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
+++ b/sys-cluster/slurm/slurm-22.05.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-{1..4} )
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
@@ -15,10 +15,10 @@ else
else
MY_PV=$(ver_rs 1-4 '-') # stable releases
fi
- MY_P="${PN}-${MY_PV}"
+ MY_P="${P}"
INHERIT_GIT=""
- SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+ SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+IUSE="X debug hdf5 html ipmi json lua multiple-slurmd +munge mysql numa nvml ofed pam perl rrdtool slurmdbd slurmrestd static-libs torque ucx yaml"
# See bug #813924 for hdf5lib < dep, needs proper fix
COMMON_DEPEND="
@@ -40,21 +40,27 @@ COMMON_DEPEND="
|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
)
+ slurmrestd? (
+ net-libs/http-parser
+ )
munge? ( sys-auth/munge )
pam? ( sys-libs/pam )
lua? ( ${LUA_DEPS} )
ipmi? ( sys-libs/freeipmi )
json? ( dev-libs/json-c:= )
- amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0:=[netloc] ) )
hdf5? ( <sci-libs/hdf5-1.12:= )
numa? ( sys-process/numactl )
+ nvml? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers )
ofed? ( sys-cluster/rdma-core )
+ rrdtool? ( net-analyzer/rrdtool )
ucx? ( sys-cluster/ucx )
+ yaml? ( dev-libs/libyaml )
X? ( net-libs/libssh2 )
>=sys-apps/hwloc-1.1.1-r1:=
sys-libs/ncurses:0=
app-arch/lz4:0=
dev-libs/glib:2=
+ sys-apps/dbus
sys-libs/readline:0="
DEPEND="${COMMON_DEPEND}
@@ -66,9 +72,10 @@ RDEPEND="${COMMON_DEPEND}
dev-libs/libcgroup"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- torque? ( perl )"
+ torque? ( perl )
+ slurmrestd? ( json ) "
-S="${WORKDIR}/${PN}-${MY_P}"
+S="${WORKDIR}/${MY_P}"
LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
@@ -76,7 +83,7 @@ LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
+ "${FILESDIR}"/${PN}-22.05.3_autoconf-lua.patch
)
pkg_setup() {
@@ -124,6 +131,7 @@ src_prepare() {
src_configure() {
local myconf=(
+ CPPFLAGS="-I/opt/cuda/include"
--sysconfdir="${EPREFIX}/etc/${PN}"
--with-hwloc="${EPREFIX}/usr"
--htmldir="${EPREFIX}/usr/share/doc/${PF}"
@@ -139,9 +147,13 @@ src_configure() {
$(use_with munge) \
$(use_with json) \
$(use_with hdf5) \
+ $(use_with nvml) \
$(use_with ofed) \
+ $(use_with rrdtool) \
$(use_with ucx) \
+ $(use_with yaml) \
$(use_enable static-libs static) \
+ $(use_enable slurmrestd) \
$(use_enable multiple-slurmd)
# --htmldir does not seems to propagate... Documentations are installed
@@ -157,9 +169,9 @@ src_configure() {
touch "${S}/src/api/.libs/libslurm.so" || die
touch "${S}/src/db_api/.libs/libslurmdb.so" || die
cd "${LIBSLURM_PERL_S}" || die
- S="${LIBSLURM_PERL_S}" perl-module_src_configure
+ S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
cd "${LIBSLURMDB_PERL_S}" || die
- S="${LIBSLURMDB_PERL_S}" perl-module_src_configure
+ S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
cd "${S}" || die
rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
fi
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
@ 2024-10-18 13:47 Benda XU
0 siblings, 0 replies; 12+ messages in thread
From: Benda XU @ 2024-10-18 13:47 UTC (permalink / raw
To: gentoo-commits
commit: f2964e62173039c410e1d138960cb5892e5c667b
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 8 07:54:03 2024 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 13:37:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2964e62
sys-cluster/slurm: add slurm-22.05.11 to collaborate with Debian.
Manage /var/tmp and /run directories with tmpfiles.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sys-cluster/slurm/Manifest | 1 +
.../slurm/files/slurm-22.05.3_autoconf-lua.patch | 49 ++++++++++++++++++++++
sys-cluster/slurm/files/slurm.tmpfiles | 2 +
...{slurm-24.05.3.ebuild => slurm-22.05.11.ebuild} | 11 ++---
sys-cluster/slurm/slurm-24.05.3.ebuild | 8 ++--
5 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 6e8549336d1c..2c1368c808e0 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1,2 @@
+DIST slurm-22.05.11.tar.bz2 7151614 BLAKE2B f79406d50c74ecea9d612d2fad2b61cf8d87bf835d1f5d0482e9aa31e515ee7b017780bd4661af5d432e70805d1b069918f5924ff5a3d38dcc5b1f38d639a3b2 SHA512 ebe82f6ad6dec45ba611a294d1d19e8ad7853322190bf4be1f8175cd89e35120b26c349d45a1048aca802e96795a61d9ab432a9b4106c757835b7044bcbe459b
DIST slurm-24.05.3.tar.bz2 7189600 BLAKE2B 4da4c49a7db334494ea03529f45016741e93603680f592d0baf34657e12079f3766e32f67725d16c17336b28206cf920ae2314c9b7076bda22ee1cb239932229 SHA512 fa903aea77b667911d90e9bd7aec3a21b43d4f642e2fdf3f6eb309fd6c8ca0892fba36f371f67e944a4198248ff44d5b6ac6c0edd03cfd4f3e1828b03c12a539
diff --git a/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
new file mode 100644
index 000000000000..f5723f7b85bc
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
@@ -0,0 +1,49 @@
+diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
+index 6941281bd5..206498191f 100644
+--- a/auxdir/x_ac_lua.m4
++++ b/auxdir/x_ac_lua.m4
+@@ -12,20 +12,21 @@
+
+ AC_DEFUN([X_AC_LUA],
+ [
+- x_ac_lua_pkg_name="lua"
+- #check for 5.4, 5.3, 5.2 and then 5.1
+- PKG_CHECK_EXISTS([lua5.4], [x_ac_lua_pkg_name=lua5.4],
+- [PKG_CHECK_EXISTS([lua-5.4], [x_ac_lua_pkg_name=lua-5.4],
+- [PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
+- [PKG_CHECK_EXISTS([lua-5.3], [x_ac_lua_pkg_name=lua-5.3],
+- [PKG_CHECK_EXISTS([lua5.2], [x_ac_lua_pkg_name=lua5.2],
+- [PKG_CHECK_EXISTS([lua-5.2], [x_ac_lua_pkg_name=lua-5.2],
+- [PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1],
+- [PKG_CHECK_EXISTS([lua-5.1], [x_ac_lua_pkg_name=lua-5.1],
+- [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])])])
+- PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
+- [x_ac_have_lua="yes"],
+- [x_ac_have_lua="no"])
++ AC_MSG_CHECKING([whether to enable support for job scripts written in Lua])
++ AC_ARG_ENABLE(
++ [lua],
++ AS_HELP_STRING(--enable-lua, enable support for job scripts written in Lua),
++ [x_ac_enable_lua="$enableval"],
++ [x_ac_enable_lua=yes])
++ AC_MSG_RESULT([$x_ac_enable_lua])
++
++ x_ac_have_lua=no
++ if test "x$x_ac_enable_lua" = "xyes"; then
++ x_ac_lua_pkg_name="lua"
++ PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
++ [x_ac_have_lua="yes"],
++ [AC_MSG_ERROR([Lua support requested but Lua not found])])
++ fi
+
+ if test "x$x_ac_have_lua" = "xyes"; then
+ saved_CFLAGS="$CFLAGS"
+@@ -60,8 +61,6 @@ AC_DEFUN([X_AC_LUA],
+ fi
+ CFLAGS="$saved_CFLAGS"
+ LIBS="$saved_LIBS"
+- else
+- AC_MSG_WARN([unable to locate lua package])
+ fi
+
+ AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
diff --git a/sys-cluster/slurm/files/slurm.tmpfiles b/sys-cluster/slurm/files/slurm.tmpfiles
index c77457db5576..e8f5fa4103a9 100644
--- a/sys-cluster/slurm/files/slurm.tmpfiles
+++ b/sys-cluster/slurm/files/slurm.tmpfiles
@@ -1 +1,3 @@
d /run/slurm 755 slurm slurm -
+d /var/tmp/slurm/slurmd 755 slurm slurm -
+d /var/tmp/slurm 755 slurm slurm -
diff --git a/sys-cluster/slurm/slurm-24.05.3.ebuild b/sys-cluster/slurm/slurm-22.05.11.ebuild
similarity index 98%
copy from sys-cluster/slurm/slurm-24.05.3.ebuild
copy to sys-cluster/slurm/slurm-22.05.11.ebuild
index 1078be9a6b38..48a6b283d77a 100644
--- a/sys-cluster/slurm/slurm-24.05.3.ebuild
+++ b/sys-cluster/slurm/slurm-22.05.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -82,6 +82,10 @@ LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-22.05.3_autoconf-lua.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
}
@@ -136,7 +140,7 @@ src_configure() {
use mysql || myconf+=( --without-mysql_config )
econf "${myconf[@]}" \
$(use_enable debug) \
- $(use_with lua) \
+ $(use_enable lua) \
$(use_enable pam) \
$(use_enable X x11) \
$(use_with munge) \
@@ -233,9 +237,6 @@ src_install() {
/var/spool/${PN}/slurmd
/var/spool/${PN}
/var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
)
local folder_path
for folder_path in ${paths[@]}; do
diff --git a/sys-cluster/slurm/slurm-24.05.3.ebuild b/sys-cluster/slurm/slurm-24.05.3.ebuild
index 1078be9a6b38..1f7beec432cf 100644
--- a/sys-cluster/slurm/slurm-24.05.3.ebuild
+++ b/sys-cluster/slurm/slurm-24.05.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -222,7 +222,8 @@ src_install() {
newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
bashcomp_alias scontrol \
sreport sacctmgr squeue scancel sshare sbcast sinfo \
- sprio sacct salloc sbatch srun sattach sdiag sstat
+ sprio sacct salloc sbatch srun sattach sdiag sstat \
+ scrontab slurmrestd strigger
# install systemd files
newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
@@ -233,9 +234,6 @@ src_install() {
/var/spool/${PN}/slurmd
/var/spool/${PN}
/var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
)
local folder_path
for folder_path in ${paths[@]}; do
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-10-18 13:47 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-09 20:33 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2024-10-18 13:47 Benda XU
2022-09-15 8:01 Alexey Shvetsov
2019-07-08 19:35 Justin Lecher
2018-11-10 11:45 Justin Lecher
2018-09-04 13:37 Alexey Shvetsov
2018-09-04 13:37 Alexey Shvetsov
2018-04-01 20:51 Justin Lecher
2018-03-11 21:27 Justin Lecher
2017-11-12 19:56 Justin Lecher
2017-07-09 18:48 Justin Lecher
2016-08-13 7:29 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox