[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/, profiles/
commit: 878ee04160ad05c9a40beeac3ba2c973dbf436d6 Author: John Helmert III gentoo org> AuthorDate: Sun Jan 14 22:20:09 2024 + Commit: John Helmert III gentoo org> CommitDate: Sun Jan 14 22:20:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878ee041 sys-cluster/slurm: treeclean Bug: https://bugs.gentoo.org/631552 Bug: https://bugs.gentoo.org/920104 Signed-off-by: John Helmert III gentoo.org> profiles/package.mask | 4 - sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/files/logrotate | 20 -- .../slurm/files/slurm-22.05.3_autoconf-lua.patch | 49 sys-cluster/slurm/files/slurm.confd| 6 - sys-cluster/slurm/files/slurm.tmpfiles | 1 - sys-cluster/slurm/files/slurmctld.initd| 76 -- sys-cluster/slurm/files/slurmd.initd | 79 -- sys-cluster/slurm/files/slurmdbd.initd | 74 -- sys-cluster/slurm/metadata.xml | 28 -- sys-cluster/slurm/slurm-22.05.3.ebuild | 287 - 11 files changed, 625 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index f289c9fbacdb..f6b66fd25bb7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -665,10 +665,6 @@ x11-drivers/nvidia-drivers:0/390 # migrate to a newer branch. (2022-09-18) -# Unfixed root privilege escalation, bug #631552 -sys-cluster/slurm - # Joonas Niilola (2022-04-29) # Apparently the "b" in version means "beta". 3.24 is available, we # should update to that. #841437 diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest deleted file mode 100644 index 94e324733874.. --- a/sys-cluster/slurm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slurm-22.05.3.tar.bz2 7098045 BLAKE2B 597d297bf5f98a6aa98f1cc3047f9d0e88051f80e0d55e931d53a9b3e6bfa5911fe8aa486f56fef2d8f8d3a02fe41cf89625ae65e3737c87ceb9d123f03beb0d SHA512 a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21 diff --git a/sys-cluster/slurm/files/logrotate b/sys-cluster/slurm/files/logrotate deleted file mode 100644 index 978a869eb993.. --- a/sys-cluster/slurm/files/logrotate +++ /dev/null @@ -1,20 +0,0 @@ -/var/log/slurm/*.log { -weekly -compress -missingok -nocopytruncate -nocreate -nodelaycompress -nomail -notifempty -noolddir -rotate 5 -sharedscripts -size=5M -create 640 slurm slurm -postrotate -/etc/init.d/slurmd reload -/etc/init.d/slurmctld reload -/etc/init.d/slurmdbd reload -endscript -} 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 deleted file mode 100644 index f5723f7b85bc.. --- a/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch +++ /dev/null @@ -1,49 +0,0 @@ -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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 2a601335b109925d2790d8b8ea08773fc01a604c Author: Sam James gentoo org> AuthorDate: Thu Oct 27 04:28:02 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 27 04:46:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a601335 sys-cluster/slurm: drop netloc vestige Closes: https://bugs.gentoo.org/870220 Signed-off-by: Sam James gentoo.org> sys-cluster/slurm/slurm-22.05.3.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-22.05.3.ebuild b/sys-cluster/slurm/slurm-22.05.3.ebuild index 0b5e602258f3..a9e9ee8b26b4 100644 --- a/sys-cluster/slurm/slurm-22.05.3.ebuild +++ b/sys-cluster/slurm/slurm-22.05.3.ebuild @@ -138,7 +138,6 @@ src_configure() { ) 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) \
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: a5ed39a0c39115c1f4789bd765cdd1b0e17d1369 Author: Petr Vaněk atlas cz> AuthorDate: Thu Sep 15 08:25:01 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Oct 6 11:14:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ed39a0 sys-cluster/slurm: remove unneeded empty line from metadata Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27275 Signed-off-by: Joonas Niilola gentoo.org> sys-cluster/slurm/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml index 5f5481fc23fa..aeaca3548e77 100644 --- a/sys-cluster/slurm/metadata.xml +++ b/sys-cluster/slurm/metadata.xml @@ -10,7 +10,6 @@ Gentoo Cluster Project - Build html documentation Build support for collecting some ipmi stats Add support for json-persing via json-c
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 0aea4dac7e2b6099fbe6d299ef0299e04c6832a6 Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Sep 15 08:05:51 2022 + Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Sep 15 08:05:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aea4dac sys-cluster/slurm: Should fix possible privilege escalation Bug: https://bugs.gentoo.org/631552 Signed-off-by: Alexey Shvetsov gentoo.org> sys-cluster/slurm/slurm-22.05.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-22.05.3.ebuild b/sys-cluster/slurm/slurm-22.05.3.ebuild index 607d3dc407bb..0b5e602258f3 100644 --- a/sys-cluster/slurm/slurm-22.05.3.ebuild +++ b/sys-cluster/slurm/slurm-22.05.3.ebuild @@ -243,7 +243,7 @@ pkg_preinst() { create_folders_and_fix_permissions() { einfo "Fixing permissions in ${@}" mkdir -p ${@} || die - chown -R ${PN}:${PN} ${@} || die + chown ${PN}:${PN} ${@} || die } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: b1947dd126dfbf1a19f631b770d3e36fffdf334e Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Sep 15 08:00:39 2022 + Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Sep 15 08:00:39 2022 + 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 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 @@ Gentoo Cluster Project + Build html documentation Build support for collecting some ipmi stats Add support for json-persing via json-c Enable authentication via munge Allow multiple slurmd to run - Add support for netloc (amd64 only) Add NUMA awareness + Enable the NVML device discovery Add Infiniband support via ofed + Enable RRD export plugin Install SQL server for slurmdbd + Enable interface to Slurm via REST API Enable perl scripts that emulates pbs (qstat, qsub etc.) Enable Unified Communication X library support + Enable YAML support diff
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: a5aa10b1fee001e4b9b2ad92de3551406ac57c51 Author: David Seifert gentoo org> AuthorDate: Sat Jul 9 08:37:58 2022 + Commit: David Seifert gentoo org> CommitDate: Sat Jul 9 08:37:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5aa10b1 sys-cluster/slurm: remove dead SRC_PREP variable Signed-off-by: David Seifert gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild | 4 ++-- sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild index a4c90ef8ec66..ffd4361860d3 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild @@ -157,9 +157,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}" SRC_PREP="no" perl-module_src_configure + S="${LIBSLURM_PERL_S}" perl-module_src_configure cd "${LIBSLURMDB_PERL_S}" || die - S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure + S="${LIBSLURMDB_PERL_S}" perl-module_src_configure cd "${S}" || die rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die fi diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild index dd2ad525430a..0445fde0fe39 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild @@ -156,9 +156,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}" SRC_PREP="no" perl-module_src_configure + S="${LIBSLURM_PERL_S}" perl-module_src_configure cd "${LIBSLURMDB_PERL_S}" || die - S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure + S="${LIBSLURMDB_PERL_S}" perl-module_src_configure cd "${S}" || die rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die fi
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: aa5804fc23f73e7208b06102845271edf0e8f2cc Author: Sam James gentoo org> AuthorDate: Sun Jun 26 06:55:16 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jun 26 07:02:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5804fc sys-cluster/slurm: unpin hdf5 dep; fix MissingUseDepDefault We've ported back to autotools in hdf5 for now. Bug: https://github.com/HDFGroup/hdf5/issues/1814 Closes: https://bugs.gentoo.org/813924 Signed-off-by: Sam James gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild | 275 ++ 1 file changed, 275 insertions(+) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild new file mode 100644 index ..dd2ad525430a --- /dev/null +++ b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild @@ -0,0 +1,275 @@ +# 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} == ** ]]; 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} == ** ]]; 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}" +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 3c8a20ea993d6d1f7fc669c57452e52d0892cc59 Author: Sam James gentoo org> AuthorDate: Wed Feb 2 06:20:53 2022 + Commit: Sam James gentoo org> CommitDate: Wed Feb 2 06:20:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8a20ea sys-cluster/slurm: Keyword 20.11.0.1-r104 arm64, #829381 Signed-off-by: Sam James gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild index 7e9988bd49b4..a4c90ef8ec66 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild @@ -18,7 +18,7 @@ else MY_P="${PN}-${MY_PV}" INHERIT_GIT="" SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="amd64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: e68e99f2a0ef13a3b4c265f2287385d7e835e350 Author: Sam James gentoo org> AuthorDate: Wed Feb 2 05:30:21 2022 + Commit: Sam James gentoo org> CommitDate: Wed Feb 2 05:30:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68e99f2 sys-cluster/slurm: Stabilize 20.11.0.1-r104 amd64, #816579 Signed-off-by: Sam James gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild index 378b082b71ea..7e9988bd49b4 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild @@ -18,7 +18,7 @@ else MY_P="${PN}-${MY_PV}" INHERIT_GIT="" SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="~amd64 ~riscv ~x86" + KEYWORDS="amd64 ~riscv ~x86" fi inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 82156a4819d72bd62ed25821ae87e6561b8c8f1d Author: David Seifert gentoo org> AuthorDate: Sun Jan 16 18:47:08 2022 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 16 18:47:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82156a48 sys-cluster/slurm: 'sys-fabric/ofed' → 'sys-cluster/rdma-core' Bug: https://bugs.gentoo.org/830999 Signed-off-by: David Seifert gentoo.org> .../{slurm-20.11.0.1-r103.ebuild => slurm-20.11.0.1-r104.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild similarity index 99% rename from sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild rename to sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild index 3ba3c42e8448..378b082b71ea 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,7 @@ COMMON_DEPEND=" amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0:=[netloc] ) ) hdf5? ( =sys-apps/hwloc-1.1.1-r1:=
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 9dfefb27f6f9d63814ce390cb9638d83ca280e6c Author: Sam James gentoo org> AuthorDate: Fri Oct 29 22:41:14 2021 + Commit: Sam James gentoo org> CommitDate: Fri Oct 29 22:43:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfefb27 sys-cluster/slurm: add hwloc subslot operator Signed-off-by: Sam James gentoo.org> .../{slurm-20.11.0.1-r102.ebuild => slurm-20.11.0.1-r103.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild similarity index 98% rename from sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild rename to sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild index 4ec46d7d5f5..3ba3c42e844 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r103.ebuild @@ -45,13 +45,13 @@ COMMON_DEPEND=" lua? ( ${LUA_DEPS} ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) - amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) + amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0:=[netloc] ) ) hdf5? ( =sys-apps/hwloc-1.1.1-r1 + >=sys-apps/hwloc-1.1.1-r1:= sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2=
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: b372f20dd03c96d59ee2ef978d76ef174a026ad7 Author: Sam James gentoo org> AuthorDate: Tue Oct 12 07:05:57 2021 + Commit: Sam James gentoo org> CommitDate: Tue Oct 12 07:05:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b372f20d sys-cluster/slurm: add < dep on hdf5lib for now Bug: https://bugs.gentoo.org/813924 Signed-off-by: Sam James gentoo.org> .../slurm/{slurm-20.11.0.1-r101.ebuild => slurm-20.11.0.1-r102.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild similarity index 98% rename from sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild rename to sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild index f964ff1a8d4..4ec46d7d5f5 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild @@ -30,6 +30,7 @@ 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" +# See bug #813924 for hdf5lib < dep, needs proper fix COMMON_DEPEND=" !sys-cluster/torque !net-analyzer/slurm @@ -45,7 +46,7 @@ COMMON_DEPEND=" ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) - hdf5? ( sci-libs/hdf5:= ) + hdf5? (
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 4b6fd057b47979a6d444aa79f920c08a3203e7a1 Author: Sam James gentoo org> AuthorDate: Fri Jul 30 22:59:17 2021 + Commit: Sam James gentoo org> CommitDate: Fri Jul 30 23:30:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6fd057 sys-cluster/slurm: [QA] call tmpfiles_process in pkg_postinst This is needed to actually apply the tmpfiles configuration we've installed in the ebuild. See tmpfiles.eclass documentation. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sam James gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild index f8a84798d70..f964ff1a8d4 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild @@ -250,6 +250,8 @@ pkg_postinst() { 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."
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: a17a8b449369e304c9fb14370598f7e305b90210 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 5 18:43:06 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 5 19:38:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17a8b44 sys-cluster/slurm: only call lua-single_pkg_setup when USE=lua is set Calling this unconditionally can be a problem when the default Lua target is not available on a certain architecture, as it is currently the case with lua5-1 on riscv. Signed-off-by: Marek Szuba gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild index 7f857b26e59..e5987b34b2c 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild @@ -78,6 +78,10 @@ PATCHES=( "${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch ) +pkg_setup() { + use lua && lua-single_pkg_setup +} + src_unpack() { if [[ ${PV} == ** ]]; then git-r3_src_unpack
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 4ca510873e64af273205430264b091384317e2d6 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 5 19:34:06 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 5 19:38:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca51087 sys-cluster/slurm: keyword 20.11.0.1-r101 for ~riscv Signed-off-by: Marek Szuba gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild index e5987b34b2c..f8a84798d70 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild @@ -18,7 +18,7 @@ else MY_P="${PN}-${MY_PV}" INHERIT_GIT="" SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~riscv ~x86" fi inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 3df8ac44fd8068ef817463d7172d3659c9b98b5f Author: Conrad Kostecki gentoo org> AuthorDate: Thu Mar 25 23:27:25 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu Mar 25 23:31:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df8ac44 sys-cluster/slurm: drop old version Drop old version, which does not support slotted lua. Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild | 261 1 file changed, 261 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild deleted file mode 100644 index 9601550773f..000 --- a/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; 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 ~x86" -fi - -inherit autotools bash-completion-r1 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? ( dev-lang/lua:0= ) - !lua? ( !dev-lang/lua ) - 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-fabric/ofed ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - 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="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" - -src_unpack() { - if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: a04b036f648d0a1999489a520aabdf7657bc7f74 Author: David Seifert gentoo org> AuthorDate: Sat Mar 13 17:24:01 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Mar 13 17:24:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04b036f sys-cluster/slurm: Remove sys-apps/netloc dependency * sys-apps/netloc is completely broken and will be removed from the tree soon. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> sys-cluster/slurm/{slurm-20.11.0.1.ebuild => slurm-20.11.0.1-r1.ebuild} | 2 +- .../slurm/{slurm-20.11.0.1-r100.ebuild => slurm-20.11.0.1-r101.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild similarity index 98% rename from sys-cluster/slurm/slurm-20.11.0.1.ebuild rename to sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild index 78837b1cd3d..9601550773f 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild @@ -43,7 +43,7 @@ COMMON_DEPEND=" !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) - amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild similarity index 99% rename from sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild rename to sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild index 860e614604a..7f857b26e59 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild @@ -44,7 +44,7 @@ COMMON_DEPEND=" lua? ( ${LUA_DEPS} ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) - amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 2fe3a25abf359db42c9eaec21520b1d3f4e81808 Author: Theo Anderson posteo de> AuthorDate: Sun Mar 7 11:57:40 2021 + Commit: David Seifert gentoo org> CommitDate: Sun Mar 7 11:57:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe3a25a sys-cluster/slurm: migrate to tmpfiles.eclass Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Theo Anderson posteo.de> Signed-off-by: David Seifert gentoo.org> sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild | 6 +++--- sys-cluster/slurm/slurm-20.11.0.1.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild index ab498c39729..860e614604a 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ else KEYWORDS="~amd64 ~x86" fi -inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} +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; @@ -213,7 +213,7 @@ src_install() { 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 + newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service } diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild index e74fe466f7e..78837b1cd3d 100644 --- a/sys-cluster/slurm/slurm-20.11.0.1.ebuild +++ b/sys-cluster/slurm/slurm-20.11.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ else KEYWORDS="~amd64 ~x86" fi -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} +inherit autotools bash-completion-r1 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; @@ -205,7 +205,7 @@ src_install() { 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 + newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service }
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: f89eb6a135bfee35b22e3075dbe0caec6c875e55 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Jan 5 15:16:13 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Jan 5 15:16:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89eb6a1 sys-cluster/slurm: Drop myself from metadata Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml index f4298bcbe29..3dc0121151f 100644 --- a/sys-cluster/slurm/metadata.xml +++ b/sys-cluster/slurm/metadata.xml @@ -5,10 +5,6 @@ ale...@gentoo.org Alexey Shvetsov - - zlog...@gentoo.org - Mikle Kolyada - clus...@gentoo.org Gentoo Cluster Project
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, profiles/, sys-cluster/slurm/
commit: 53b559b7358366581882f69cdcfbf5366475c1c6 Author: Marek Szuba gentoo org> AuthorDate: Thu Dec 17 13:48:15 2020 + Commit: Marek Szuba gentoo org> CommitDate: Thu Dec 17 13:54:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b559b7 sys-cluster/slurm: migrate to lua-single.eclass Version compatibility as per upstream build scripts. Includes fixes for Bugs: 760465 (the applied patch + 'use_enable lua' in src_configure) and 760468 (dev-libs/glib:2 in COMMON_DEPEND), both should be directly applicable to the unmigrated ebuild as well. Still vulnerable to Bug 631552. Closes: https://bugs.gentoo.org/752867 Bug: https://bugs.gentoo.org/760465 Bug: https://bugs.gentoo.org/760468 Signed-off-by: Marek Szuba gentoo.org> profiles/package.mask | 1 + .../slurm/files/slurm-20.11.0.1_autoconf-lua.patch | 50 sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild | 269 + 3 files changed, 320 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index c08107392a3..c8907265af7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -530,6 +530,7 @@ kde-apps/kdebase-meta:5 =sci-visualization/gnuplot-5.4.1-r1 >=sci-visualization/fityk-1.3.1-r100 >=sys-apps/likwid-4.3.4 +>=sys-cluster/slurm-20.11.0.1-r100 >=www-apache/mod_security-2.9.3-r100 >=www-client/elinks-0.13.5-r100 >=www-client/luakit-2.2.1-r100 diff --git a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch b/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch new file mode 100644 index 000..f17039e0b59 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch @@ -0,0 +1,50 @@ +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. + +--- a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4 +@@ -12,18 +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], +- [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" +@@ -52,8 +55,6 @@ + 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/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild new file mode 100644 index 000..ab498c39729 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) + +if [[ ${PV} == ** ]]; 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 ~x86" +fi + +inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +DESCRIPTION="A Highly Scalable Resource Manager" +HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm; + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: f1e50c073e77c9979e71d4fda0f8d21b99f4d2d1 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Dec 1 12:15:53 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Dec 1 12:15:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e50c07 sys-cluster/slurm: Drop old Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 2 - sys-cluster/slurm/slurm-20.02.4.1.ebuild | 265 --- sys-cluster/slurm/slurm-20.02.5.1.ebuild | 265 --- 3 files changed, 532 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 882131982a9..ba0ae40fe89 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,3 +1 @@ -DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5 -DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f41d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678 diff --git a/sys-cluster/slurm/slurm-20.02.4.1.ebuild b/sys-cluster/slurm/slurm-20.02.4.1.ebuild deleted file mode 100644 index 74a772b3b66..000 --- a/sys-cluster/slurm/slurm-20.02.4.1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; 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 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -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? ( dev-lang/lua:0= ) - !lua? ( !dev-lang/lua ) - ipmi? ( sys-libs/freeipmi ) - json? ( dev-libs/json-c:= ) - amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) - hdf5? ( sci-libs/hdf5:= ) - numa? ( sys-process/numactl ) - ofed? ( sys-fabric/ofed ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - 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="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" - -src_unpack() { - if [[ ${PV} == ** ]]; 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" \ -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 06bdd71742105d3f8691ed43f54accc70bf9af6f Author: Mikle Kolyada gentoo org> AuthorDate: Tue Dec 1 12:13:10 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Dec 1 12:13:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06bdd717 sys-cluster/slurm: Version bump (v20.11.0.1) Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.11.0.1.ebuild | 261 +++ 2 files changed, 262 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 719a485c8a9..882131982a9 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1,3 @@ DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5 DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f41d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d +DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678 diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild new file mode 100644 index 000..e74fe466f7e --- /dev/null +++ b/sys-cluster/slurm/slurm-20.11.0.1.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( dev-lang/lua:0= ) + !lua? ( !dev-lang/lua ) + ipmi? ( sys-libs/freeipmi ) + json? ( dev-libs/json-c:= ) + amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + hdf5? ( sci-libs/hdf5:= ) + numa? ( sys-process/numactl ) + ofed? ( sys-fabric/ofed ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + 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="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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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" \ + ||
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: de36ed78552c9da321e211987ad258788c2f93cd Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 20 13:06:49 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 20 13:07:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de36ed78 sys-cluster/slurm: Version bump (v20.02.5) Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.5.1.ebuild | 265 +++ 2 files changed, 266 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 91eb297ef62..2b0e16b8b3d 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1,3 @@ DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5 +DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f41d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d diff --git a/sys-cluster/slurm/slurm-20.02.5.1.ebuild b/sys-cluster/slurm/slurm-20.02.5.1.ebuild new file mode 100644 index 000..74a772b3b66 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.5.1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( dev-lang/lua:0= ) + !lua? ( !dev-lang/lua ) + ipmi? ( sys-libs/freeipmi ) + json? ( dev-libs/json-c:= ) + amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + hdf5? ( sci-libs/hdf5:= ) + numa? ( sys-process/numactl ) + ofed? ( sys-fabric/ofed ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + 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="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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 9c321f8fee724ddb9f9116f4315286e4158ccdc1 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 20 13:07:31 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 20 13:07:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c321f8f sys-cluster/slurm: Drop old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/slurm-20.02.3.1.ebuild | 265 --- 2 files changed, 266 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 2b0e16b8b3d..719a485c8a9 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,3 +1,2 @@ -DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5 DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f41d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d diff --git a/sys-cluster/slurm/slurm-20.02.3.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild deleted file mode 100644 index 74a772b3b66..000 --- a/sys-cluster/slurm/slurm-20.02.3.1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; 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 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -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? ( dev-lang/lua:0= ) - !lua? ( !dev-lang/lua ) - ipmi? ( sys-libs/freeipmi ) - json? ( dev-libs/json-c:= ) - amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) - hdf5? ( sci-libs/hdf5:= ) - numa? ( sys-process/numactl ) - ofed? ( sys-fabric/ofed ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - 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="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" - -src_unpack() { - if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 25138402504cd659cd4ef66696546eb4fdf77af4 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Aug 29 10:09:56 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Aug 29 10:10:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25138402 sys-cluster/slurm: Version bump (v20.02.4.1) Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.4.1.ebuild | 265 +++ 2 files changed, 266 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 35918cfdb8f..91eb297ef62 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +1,2 @@ DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 +DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5 diff --git a/sys-cluster/slurm/slurm-20.02.4.1.ebuild b/sys-cluster/slurm/slurm-20.02.4.1.ebuild new file mode 100644 index 000..74a772b3b66 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.4.1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( dev-lang/lua:0= ) + !lua? ( !dev-lang/lua ) + ipmi? ( sys-libs/freeipmi ) + json? ( dev-libs/json-c:= ) + amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + hdf5? ( sci-libs/hdf5:= ) + numa? ( sys-process/numactl ) + ofed? ( sys-fabric/ofed ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + 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="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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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 \ +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: b0615d951ed8d14e00b925da22680e5fc384bd0f Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jul 26 01:49:42 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 26 01:49:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0615d95 sys-cluster/slurm: fix MissingSlotDep on dev-db/{mariadb,mysql} Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> sys-cluster/slurm/slurm-20.02.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.02.3.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild index 53bcab470f7..74a772b3b66 100644 --- a/sys-cluster/slurm/slurm-20.02.3.1.ebuild +++ b/sys-cluster/slurm/slurm-20.02.3.1.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" || ( 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 ) ) + slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/
commit: 81aac4f7a57ae1e5262a272403b47af1c611986e Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jul 1 17:18:57 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Jul 1 19:57:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81aac4f7 sys-cluster/slurm: remove unused patch Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16536 Signed-off-by: Aaron Bauman gentoo.org> sys-cluster/slurm/files/disable-sview.patch | 76 - 1 file changed, 76 deletions(-) diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch deleted file mode 100644 index f409765a847..000 --- a/sys-cluster/slurm/files/disable-sview.patch +++ /dev/null @@ -1,76 +0,0 @@ a/configure.ac 2019-08-13 20:40:08.0 +0200 -+++ b/configure.ac 2019-08-22 12:02:02.127865098 +0200 -@@ -229,42 +229,6 @@ - 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"]) - - X_AC_CRAY -@@ -447,7 +411,6 @@ -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 -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am slurm-19.05.2.orig/src/Makefile.am 2019-08-13 20:40:08.0 +0200 -+++ slurm-19.05.2/src/Makefile.am 2019-08-22 12:02:02.127865098 +0200 -@@ -25,5 +25,4 @@ - srun\ - sshare \ - sstat \ -- strigger\ -- sview -+ strigger -diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in slurm-19.05.2.orig/src/Makefile.in 2019-08-13 20:40:08.0 +0200 -+++ slurm-19.05.2/src/Makefile.in 2019-08-22 12:02:02.127865098 +0200 -@@ -495,8 +495,7 @@ - srun\ - sshare \ - sstat \ -- strigger\ -- sview -+ strigger - - all: all-recursive -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 9ce4f2bd2510ff32ed4e2f88cd980fadbb8a4d28 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jun 7 10:53:45 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jun 7 10:54:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce4f2bd sys-cluster/slurm: fix a typo to inherit deps Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-20.02.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-20.02.3.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild index 1872358a4ee..53bcab470f7 100644 --- a/sys-cluster/slurm/slurm-20.02.3.1.ebuild +++ b/sys-cluster/slurm/slurm-20.02.3.1.ebuild @@ -57,7 +57,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} html? ( sys-apps/man2html )" -RDEPEND="${OMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} acct-user/slurm acct-group/slurm dev-libs/libcgroup"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 5612366a33d4ee1767f27e39b8431ffe5c76661c Author: Alexey Shvetsov gentoo org> AuthorDate: Mon May 25 20:44:16 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon May 25 20:47:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5612366a Revert "sys-cluster/slurm: improve netloc dep, disable-static" This reverts commit 742fa1d6fa947439c72884ebe6193627f0f7539c. This change was partialy incorporated already Signed-off-by: Alexey Shvetsov gentoo.org> sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild | 267 1 file changed, 267 deletions(-) diff --git a/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild deleted file mode 100644 index 1a37f7c41a8..000 --- a/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -if [[ "${PV}" == ** ]]; 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-3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -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 ucx torque X" - -COMMON_DEPEND=" - app-arch/lz4:0= - !net-analyzer/slurm - !net-analyzer/sinfo - >=sys-apps/hwloc-1.1.1-r1 - !sys-cluster/torque - sys-libs/ncurses:0= - sys-libs/readline:0= - - || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) - - amd64? ( netloc? ( || ( >=sys-apps/hwloc-2.1.0[netloc] sys-apps/netloc ) ) ) - hdf5? ( sci-libs/hdf5:= ) - ipmi? ( sys-libs/freeipmi ) - json? ( dev-libs/json-c:= ) - lua? ( dev-lang/lua:0= ) - !lua? ( !dev-lang/lua ) - mysql? ( - || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) - slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) ) - ) - munge? ( sys-auth/munge ) - numa? ( sys-process/numactl ) - ofed? ( sys-fabric/ofed ) - pam? ( sys-libs/pam ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) -" -DEPEND="${COMMON_DEPEND} - html? ( sys-apps/man2html ) -" -RDEPEND="${COMMON_DEPEND} - acct-user/slurm - acct-group/slurm - dev-libs/libcgroup -" -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" - -src_unpack() { - if [[ "${PV}" == ** ]]; 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=( - $(use_enable debug) - $(use_enable multiple-slurmd) - $(use_enable pam) - $(use_enable X x11) - $(use_with hdf5) - $(use_with json) - $(use_with munge) - $(use_with ofed) - $(use_with
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 742fa1d6fa947439c72884ebe6193627f0f7539c Author: Alessandro Barbieri gmail com> AuthorDate: Thu May 14 18:45:27 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon May 25 19:46:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742fa1d6 sys-cluster/slurm: improve netloc dep, disable-static netloc will be provided by hwloc[netloc] from now on changes reflect that Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15795 Signed-off-by: Alexey Shvetsov gentoo.org> sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild | 267 1 file changed, 267 insertions(+) diff --git a/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild new file mode 100644 index 000..1a37f7c41a8 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.2.1-r1.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +if [[ "${PV}" == ** ]]; 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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 ucx torque X" + +COMMON_DEPEND=" + app-arch/lz4:0= + !net-analyzer/slurm + !net-analyzer/sinfo + >=sys-apps/hwloc-1.1.1-r1 + !sys-cluster/torque + sys-libs/ncurses:0= + sys-libs/readline:0= + + || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) + + amd64? ( netloc? ( || ( >=sys-apps/hwloc-2.1.0[netloc] sys-apps/netloc ) ) ) + hdf5? ( sci-libs/hdf5:= ) + ipmi? ( sys-libs/freeipmi ) + json? ( dev-libs/json-c:= ) + lua? ( dev-lang/lua:0= ) + !lua? ( !dev-lang/lua ) + mysql? ( + || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) + slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) ) + ) + munge? ( sys-auth/munge ) + numa? ( sys-process/numactl ) + ofed? ( sys-fabric/ofed ) + pam? ( sys-libs/pam ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) +" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html ) +" +RDEPEND="${COMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup +" +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" + +src_unpack() { + if [[ "${PV}" == ** ]]; 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=( + $(use_enable debug) + $(use_enable multiple-slurmd) + $(use_enable pam) + $(use_enable X x11) + $(use_with hdf5) +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 6d359ca848d188d27a64405a2b7ddfe5672f7fdc Author: Mikle Kolyada gentoo org> AuthorDate: Fri May 22 10:39:26 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri May 22 10:39:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d359ca8 sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/slurm-20.02.2.1.ebuild | 263 --- 2 files changed, 264 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 03b6460a4c5..35918cfdb8f 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1 @@ -DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513 DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 diff --git a/sys-cluster/slurm/slurm-20.02.2.1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1.ebuild deleted file mode 100644 index a2a4e4bd829..000 --- a/sys-cluster/slurm/slurm-20.02.2.1.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; 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-3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -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? ( 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 ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - sys-libs/readline:0=" -DEPEND="${COMMON_DEPEND} - html? ( sys-apps/man2html )" -RDEPEND="${OMMON_DEPEND} - acct-user/slurm - acct-group/slurm - dev-libs/libcgroup" - -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" - -src_unpack() { - if [[ ${PV} == ** ]]; 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' \ -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 28b208231f2585a9e874f84bf59646e6c4dfa0e4 Author: Mikle Kolyada gentoo org> AuthorDate: Fri May 22 10:36:46 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri May 22 10:38:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b20823 sys-cluster/slurm: Version bump (v20.02.3.1) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.3.1.ebuild | 265 +++ 2 files changed, 266 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index fb495d39b96..03b6460a4c5 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +1,2 @@ DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513 +DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22 diff --git a/sys-cluster/slurm/slurm-20.02.3.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild new file mode 100644 index 000..1872358a4ee --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.3.1.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( dev-lang/lua:0= ) + !lua? ( !dev-lang/lua ) + ipmi? ( sys-libs/freeipmi ) + json? ( dev-libs/json-c:= ) + amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) + hdf5? ( sci-libs/hdf5:= ) + numa? ( sys-process/numactl ) + ofed? ( sys-fabric/ofed ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" + +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" + +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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 \ +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 37090d8bbcf9e6923340e8a629e270c94810e3b1 Author: Mikle Kolyada gentoo org> AuthorDate: Thu May 14 14:20:11 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu May 14 14:21:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37090d8b sys-cluster/slurm: Version bump (v20.02.2.1) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.2.1.ebuild | 263 +++ 2 files changed, 264 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 91e8bb4d295..7950e8cc9ae 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -2,3 +2,4 @@ DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf1 DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a DIST slurm-20-02-1-1.tar.gz 8660993 BLAKE2B 8f3a6ce0177410ae25490bb995fc14696002a22a8a0ec82d97f697fe5898c8c7d07fe2ad4ab824e1056f3be59adb2cb30b3e89a50a529e786a59aacab5cc6673 SHA512 a0974f52a561dc7596a9a7aeea4f09075a97dc30c729e59aef625584264e5b4ae003466275be379bae42a2a0e0be0c910b9349d3e7c6631f18969518ac9a0910 +DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513 diff --git a/sys-cluster/slurm/slurm-20.02.2.1.ebuild b/sys-cluster/slurm/slurm-20.02.2.1.ebuild new file mode 100644 index 000..a2a4e4bd829 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.2.1.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: e8714b48b1830259838f810b13c6f24a4d1b994d Author: Mikle Kolyada gentoo org> AuthorDate: Thu May 14 14:21:29 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu May 14 14:21:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8714b48 sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 4 - sys-cluster/slurm/slurm-19.05.4.1.ebuild | 264 --- sys-cluster/slurm/slurm-19.05.5.1.ebuild | 264 --- sys-cluster/slurm/slurm-20.02.0.1.ebuild | 263 -- sys-cluster/slurm/slurm-20.02.1.1.ebuild | 263 -- 5 files changed, 1058 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 7950e8cc9ae..fb495d39b96 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,5 +1 @@ -DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c -DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be -DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a -DIST slurm-20-02-1-1.tar.gz 8660993 BLAKE2B 8f3a6ce0177410ae25490bb995fc14696002a22a8a0ec82d97f697fe5898c8c7d07fe2ad4ab824e1056f3be59adb2cb30b3e89a50a529e786a59aacab5cc6673 SHA512 a0974f52a561dc7596a9a7aeea4f09075a97dc30c729e59aef625584264e5b4ae003466275be379bae42a2a0e0be0c910b9349d3e7c6631f18969518ac9a0910 DIST slurm-20-02-2-1.tar.gz 8680227 BLAKE2B 9058c5161a3e087201b17484fbb8430d2af392b4abec4cfea3b6a882609bb978987a8e6aeda512b08def8010403c9f0893827632358225c15c374d15a583432f SHA512 6ed8628be442138c90f0f497846679eb2a4ea8e2c612d31c1276cc451333663bf310719a8f823dc873536343065186dc5f26871ce80340c0bdb71ab564620513 diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild deleted file mode 100644 index e412669c3ed..000 --- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; - INHERIT_GIT="git-r3" - SRC_URI="" - KEYWORDS="" - 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-3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -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? ( 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 ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - sys-libs/readline:0=" -DEPEND="${COMMON_DEPEND} - html? ( sys-apps/man2html )" -RDEPEND="${OMMON_DEPEND} - acct-user/slurm - acct-group/slurm - dev-libs/libcgroup" - -REQUIRED_USE="torque? ( perl )" - -S="${WORKDIR}/${PN}-${MY_P}" -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: ffedf7eae799fd5c529083ba313d9924fe09ec01 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Mar 27 13:30:05 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Mar 27 13:30:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffedf7ea sys-cluster/slurm: Version bump (v20.02.1.1) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.1.1.ebuild | 263 +++ 2 files changed, 264 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 156435a049b..91e8bb4d295 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,3 +1,4 @@ DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a +DIST slurm-20-02-1-1.tar.gz 8660993 BLAKE2B 8f3a6ce0177410ae25490bb995fc14696002a22a8a0ec82d97f697fe5898c8c7d07fe2ad4ab824e1056f3be59adb2cb30b3e89a50a529e786a59aacab5cc6673 SHA512 a0974f52a561dc7596a9a7aeea4f09075a97dc30c729e59aef625584264e5b4ae003466275be379bae42a2a0e0be0c910b9349d3e7c6631f18969518ac9a0910 diff --git a/sys-cluster/slurm/slurm-20.02.1.1.ebuild b/sys-cluster/slurm/slurm-20.02.1.1.ebuild new file mode 100644 index 000..a2a4e4bd829 --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.1.1.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 7eed44a5fe19fb7240415eeb49700079a0313e6b Author: Mikle Kolyada gentoo org> AuthorDate: Fri Mar 27 13:18:55 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Mar 27 13:23:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eed44a5 sys-cluster/slurm: drop gtk macro defenition Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-20.02.0.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-cluster/slurm/slurm-20.02.0.1.ebuild b/sys-cluster/slurm/slurm-20.02.0.1.ebuild index 10e2d81f7ef..a2a4e4bd829 100644 --- a/sys-cluster/slurm/slurm-20.02.0.1.ebuild +++ b/sys-cluster/slurm/slurm-20.02.0.1.ebuild @@ -102,6 +102,8 @@ src_prepare() { -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 }
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 3ee03f951945af53592a94c3ff9ff900e2e9095c Author: Mikle Kolyada gentoo org> AuthorDate: Sat Feb 29 12:59:07 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Feb 29 13:00:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee03f95 sys-cluster/slurm: Version bump (v20.02.0.1) Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-20.02.0.1.ebuild | 261 +++ 2 files changed, 262 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 8bb13bbfd2a..156435a049b 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1,3 @@ DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be +DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a diff --git a/sys-cluster/slurm/slurm-20.02.0.1.ebuild b/sys-cluster/slurm/slurm-20.02.0.1.ebuild new file mode 100644 index 000..10e2d81f7ef --- /dev/null +++ b/sys-cluster/slurm/slurm-20.02.0.1.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +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" + +src_unpack() { + if [[ ${PV} == ** ]]; 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" +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: d4966c52c31b513eeffefc9de66405e792172e34 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 11:11:19 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 11:11:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4966c52 sys-cluster/slurm: drop double autoreconf call Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-19.05.4.1.ebuild | 1 - sys-cluster/slurm/slurm-19.05.5.1.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild index 6cadf68379e..f9a659b1dc9 100644 --- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild +++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild @@ -82,7 +82,6 @@ src_unpack() { src_prepare() { tc-ld-disable-gold eapply "${FILESDIR}"/disable-sview.patch - eautoreconf default # pids should go to /var/run/slurm diff --git a/sys-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild index 925771131f4..c7cb6c9ce41 100644 --- a/sys-cluster/slurm/slurm-19.05.5.1.ebuild +++ b/sys-cluster/slurm/slurm-19.05.5.1.ebuild @@ -82,7 +82,6 @@ src_unpack() { src_prepare() { tc-ld-disable-gold eapply "${FILESDIR}"/disable-sview.patch - eautoreconf default # pids should go to /var/run/slurm
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: b8a6f13c309753c80dfb15688cc900c825c2fb24 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 09:46:27 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 09:46:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a6f13c sys-cluster/slurm: Version bump (v19.05.5.1) Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-19.05.5.1.ebuild | 266 +++ 2 files changed, 267 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index acf204239f1..8bb13bbfd2a 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +1,2 @@ DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c +DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be diff --git a/sys-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild new file mode 100644 index 000..925771131f4 --- /dev/null +++ b/sys-cluster/slurm/slurm-19.05.5.1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; + INHERIT_GIT="git-r3" + SRC_URI="" + KEYWORDS="" + 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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? ( 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +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" + +src_unpack() { + if [[ ${PV} == ** ]]; then + git-r3_src_unpack + else + default + fi +} + +src_prepare() { + tc-ld-disable-gold + eapply "${FILESDIR}"/disable-sview.patch + eautoreconf + 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: db298e566fb30a5038dfca41a0199a00f95a78e1 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 09:21:56 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 09:22:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db298e56 sys-cluster/slurm: re-introduce sview disabling Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/files/disable-sview.patch | 76 + sys-cluster/slurm/slurm-19.05.4.1.ebuild| 2 + 2 files changed, 78 insertions(+) diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch new file mode 100644 index 000..f409765a847 --- /dev/null +++ b/sys-cluster/slurm/files/disable-sview.patch @@ -0,0 +1,76 @@ +--- a/configure.ac 2019-08-13 20:40:08.0 +0200 b/configure.ac 2019-08-22 12:02:02.127865098 +0200 +@@ -229,42 +229,6 @@ + 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"]) + + X_AC_CRAY +@@ -447,7 +411,6 @@ +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 -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am +--- slurm-19.05.2.orig/src/Makefile.am 2019-08-13 20:40:08.0 +0200 slurm-19.05.2/src/Makefile.am 2019-08-22 12:02:02.127865098 +0200 +@@ -25,5 +25,4 @@ + srun\ + sshare \ + sstat \ +- strigger\ +- sview ++ strigger +diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in +--- slurm-19.05.2.orig/src/Makefile.in 2019-08-13 20:40:08.0 +0200 slurm-19.05.2/src/Makefile.in 2019-08-22 12:02:02.127865098 +0200 +@@ -495,8 +495,7 @@ + srun\ + sshare \ + sstat \ +- strigger\ +- sview ++ strigger + + all: all-recursive + diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild index b2750515b35..6cadf68379e 100644 --- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild +++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild @@ -81,6 +81,8 @@ src_unpack() { src_prepare() { tc-ld-disable-gold + eapply "${FILESDIR}"/disable-sview.patch + eautoreconf default # pids should go to /var/run/slurm
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: c5dea14eb42fb2e259e14910bd213c7fbfbc83ff Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 09:05:25 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 09:05:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dea14e sys-cluster/slurm: change source dir for correct perl support Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-19.05.4.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild index 4ebfbf7e9f1..b2750515b35 100644 --- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild +++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild @@ -66,8 +66,8 @@ REQUIRED_USE="torque? ( perl )" S="${WORKDIR}/${PN}-${MY_P}" -LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl" -LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" +LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl" +LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl" RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 50b3759e1d3d4ddb758c6e71da0ffcc4fc3ab9fc Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 08:58:53 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 08:59:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b3759e sys-cluster/slurm: ssl plugin is gone Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-19.05.4.1.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild index 2bfe56a32f5..4ebfbf7e9f1 100644 --- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild +++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild @@ -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 ssl static-libs ucx torque X" +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 @@ -41,7 +41,6 @@ COMMON_DEPEND=" ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) - ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) @@ -123,7 +122,6 @@ src_configure() { $(use_enable debug) \ $(use_enable pam) \ $(use_enable X x11) \ - $(use_with ssl) \ $(use_with munge) \ $(use_with json) \ $(use_with hdf5) \
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 5dc1e55d035989d645998f1ff84ad938564cf089 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 21 08:25:10 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 21 08:25:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc1e55d sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/slurm-19.05.3.2.ebuild | 266 --- 2 files changed, 267 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 2acf65263d4..acf204239f1 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1 @@ DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c -DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.3.2.ebuild deleted file mode 100644 index 4c9d3cbf4ae..000 --- a/sys-cluster/slurm/slurm-19.05.3.2.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; - INHERIT_GIT="git-r3" - SRC_URI="" - KEYWORDS="" - 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 3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2; - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} - -DESCRIPTION="A Highly Scalable Resource Manager" -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 slurmdbd ssl 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 ) - 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 ) - ucx? ( sys-cluster/ucx ) - X? ( net-libs/libssh2 ) - >=sys-apps/hwloc-1.1.1-r1 - sys-libs/ncurses:0= - app-arch/lz4:0= - sys-libs/readline:0=" -DEPEND="${COMMON_DEPEND} - html? ( sys-apps/man2html )" -RDEPEND="${OMMON_DEPEND} - acct-user/slurm - acct-group/slurm - dev-libs/libcgroup" - -REQUIRED_USE="torque? ( perl )" - -S="${WORKDIR}/${MY_P}" - -LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl" -LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" - -RESTRICT="test" - -src_unpack() { - if [[ ${PV} == ** ]]; 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 \ -
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/
commit: 3b94b4905c9101a723c6fc1013047d2dd03acd98 Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Dec 4 07:05:16 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Dec 4 15:38:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b94b490 sys-cluster/slurm: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13864 Signed-off-by: Aaron Bauman gentoo.org> .../slurm/files/slurm-18.08.7-disable-sview.patch | 99 -- 1 file changed, 99 deletions(-) diff --git a/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch deleted file mode 100644 index f7e2c5b2673..000 --- a/sys-cluster/slurm/files/slurm-18.08.7-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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 34d7e9ffa540545006693cf8d2d48e0371428f2e Author: Mikle Kolyada gentoo org> AuthorDate: Sun Dec 1 08:56:42 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Dec 1 08:56:42 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d7e9ff sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - sys-cluster/slurm/slurm-18.08.7.ebuild | 271 - 2 files changed, 272 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 0f860576a6c..2acf65263d4 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,3 +1,2 @@ -DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93 DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild deleted file mode 100644 index 09991608150..000 --- a/sys-cluster/slurm/slurm-18.08.7.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; - INHERIT_GIT="git-r3" - SRC_URI="" - KEYWORDS="" - MY_P="${P}" -else - inherit eapi7-ver - if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then - MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate - else - MY_PV=$(ver_rs 3 '-') # stable releases - fi - MY_P="${PN}-${MY_PV}" - INHERIT_GIT="" - SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2; - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -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 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? ( - || ( 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 ) - 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 - 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}/${MY_P}/contribs/perlapi/libslurm/perl" -LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${P}-disable-sview.patch -) - -src_unpack() { - if [[ ${PV} == ** ]]; then - git-r3_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:/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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 8c3a1e6fafd3b859958e250818cfac17e471c09c Author: Mikle Kolyada gentoo org> AuthorDate: Fri Nov 15 14:38:08 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Nov 15 15:04:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3a1e6f sys-cluster/slurm: Version bump (v19.05.4.1) Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/slurm-19.05.4.1.ebuild | 266 +++ 2 files changed, 267 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 1ec305f1dbd..0f860576a6c 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1,3 @@ DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93 +DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild new file mode 100644 index 000..2bfe56a32f5 --- /dev/null +++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; + INHERIT_GIT="git-r3" + SRC_URI="" + KEYWORDS="" + 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-3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +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 ssl 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 ) + 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +REQUIRED_USE="torque? ( perl )" + +S="${WORKDIR}/${PN}-${MY_P}" + +LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl" +LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" + +RESTRICT="test" + +src_unpack() { + if [[ ${PV} == ** ]]; 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" \ +
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 8e2dcab16c0c3b8432ff6605c218c11dd8a64e61 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 20:26:04 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 20:27:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e2dcab1 sys-cluster/slurm: Add slashes Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-19.05.3.2.ebuild | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.3.2.ebuild index 58a1775accb..9487d67f72c 100644 --- a/sys-cluster/slurm/slurm-19.05.3.2.ebuild +++ b/sys-cluster/slurm/slurm-19.05.3.2.ebuild @@ -177,7 +177,7 @@ src_install() { fi if use torque; then emake DESTDIR="${D}" -C contribs/torque - rm -f "${ED}/usr/bin/mpiexec" || die + rm -f "${D}"/usr/bin/mpiexec || die fi use static-libs || find "${ED}" -name '*.la' -exec rm {} + # install sample configs @@ -221,7 +221,7 @@ src_install() { pkg_preinst() { if use munge; then - sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die + sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die fi } @@ -233,11 +233,11 @@ create_folders_and_fix_permissions() { pkg_postinst() { paths=( - "${EROOT}"var/${PN}/checkpoint - "${EROOT}"var/${PN} - "${EROOT}"var/spool/${PN}/slurmd - "${EROOT}"var/spool/${PN} - "${EROOT}"var/log/${PN} + "${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}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 808db2cfe02cd63deb0eb563b8778faa9b006e7a Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 19:35:09 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 19:35:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808db2cf sys-cluster/slurm: Version bump (v19.05.3.2) Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 + sys-cluster/slurm/metadata.xml | 1 + sys-cluster/slurm/slurm-19.05.3.2.ebuild | 271 +++ 3 files changed, 273 insertions(+) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index d61e5c59422..1ec305f1dbd 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +1,2 @@ DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93 +DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml index c588bb7a952..f4298bcbe29 100644 --- a/sys-cluster/slurm/metadata.xml +++ b/sys-cluster/slurm/metadata.xml @@ -24,5 +24,6 @@ Add Infiniband support via ofed Install SQL server for slurmdbd Enable perl scripts that emulates pbs (qstat, qsub etc.) + Enable Unified Communication X library support diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.3.2.ebuild new file mode 100644 index 000..58a1775accb --- /dev/null +++ b/sys-cluster/slurm/slurm-19.05.3.2.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == ** ]]; then + EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; + INHERIT_GIT="git-r3" + SRC_URI="" + KEYWORDS="" + 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 3 '-') # stable releases + fi + MY_P="${PN}-${MY_PV}" + INHERIT_GIT="" + SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2; + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} + +DESCRIPTION="A Highly Scalable Resource Manager" +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 slurmdbd ssl 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 ) + 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 ) + ucx? ( sys-cluster/ucx ) + X? ( net-libs/libssh2 ) + >=sys-apps/hwloc-1.1.1-r1 + sys-libs/ncurses:0= + app-arch/lz4:0= + sys-libs/readline:0=" +DEPEND="${COMMON_DEPEND} + html? ( sys-apps/man2html )" +RDEPEND="${OMMON_DEPEND} + acct-user/slurm + acct-group/slurm + dev-libs/libcgroup" + +REQUIRED_USE="torque? ( perl )" + +S="${WORKDIR}/${MY_P}" + +LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl" +LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" + +RESTRICT="test" + +src_unpack() { + if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 75377bdf192a71ab1c742c59706eec073179d5b6 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 18:35:14 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 18:35:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75377bdf sys-cluster/slurm: remove EnvironmentFile from systemd units Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-18.08.7.ebuild | 6 ++ 1 file changed, 6 insertions(+) diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild index b260ae6e392..69c7fcf16db 100644 --- a/sys-cluster/slurm/slurm-18.08.7.ebuild +++ b/sys-cluster/slurm/slurm-18.08.7.ebuild @@ -216,6 +216,12 @@ src_install() { # install systemd files systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service + + cd "${D}"/lib/systemd/system || die + + for file in slurm*; do + sed -i -e '/^EnvironmentFile=.*/d' ${file} || die + done } pkg_preinst() {
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 7ec89166df69e1978f9542e1c076001fc3c36bc2 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 17:25:18 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 17:25:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec89166 sys-cluster/slurm: remove primaryuri Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-18.08.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild index 78a580e9b30..b260ae6e392 100644 --- a/sys-cluster/slurm/slurm-18.08.7.ebuild +++ b/sys-cluster/slurm/slurm-18.08.7.ebuild @@ -67,7 +67,7 @@ REQUIRED_USE="torque? ( perl )" LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl" LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl" -RESTRICT="primaryuri test" +RESTRICT="test" PATCHES=( "${FILESDIR}"/${P}-disable-sview.patch
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: 780631adde5c43c700a9c0d0f56466d882807cab Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 16:46:40 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 16:50:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780631ad sys-cluster/slurm: Drop old Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/Manifest | 1 - .../files/slurm-17.11.13.2-disable-sview.patch | 99 sys-cluster/slurm/slurm-17.11.13.2.ebuild | 278 - 3 files changed, 378 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 5d692ad2b82..d61e5c59422 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,2 +1 @@ -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.13.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.13.2-disable-sview.patch deleted file mode 100644 index f7e2c5b2673..000 --- a/sys-cluster/slurm/files/slurm-17.11.13.2-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.11.13.2.ebuild b/sys-cluster/slurm/slurm-17.11.13.2.ebuild deleted file mode 100644 index
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 666d7ba16d2dc714e798fa756ed361e25dc31fbb Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 16:49:44 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 16:50:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666d7ba1 sys-cluster/slurm: respect CFLAGS Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-18.08.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild index b8797d5c132..78a580e9b30 100644 --- a/sys-cluster/slurm/slurm-18.08.7.ebuild +++ b/sys-cluster/slurm/slurm-18.08.7.ebuild @@ -115,7 +115,6 @@ src_prepare() { } src_configure() { - use debug || myconf+=( --disable-debug ) local myconf=( --sysconfdir="${EPREFIX}/etc/${PN}" --with-hwloc="${EPREFIX}/usr" @@ -126,6 +125,7 @@ src_configure() { use mysql || myconf+=( --without-mysql_config ) use amd64 && myconf+=( $(use_with netloc) ) econf "${myconf[@]}" \ + $(use_enable debug) \ $(use_enable pam) \ $(use_enable X x11) \ $(use_with ssl) \
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 7933973f35d9c2bc8b83d25d6195cad509a25363 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Oct 12 18:40:27 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Oct 12 18:40:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7933973f sys-cluster/slurm: migrate to sys-libs/pam Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-17.11.13.2.ebuild | 2 +- sys-cluster/slurm/slurm-18.08.7.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-17.11.13.2.ebuild b/sys-cluster/slurm/slurm-17.11.13.2.ebuild index d669350a8a3..1f9e31f2508 100644 --- a/sys-cluster/slurm/slurm-17.11.13.2.ebuild +++ b/sys-cluster/slurm/slurm-17.11.13.2.ebuild @@ -42,7 +42,7 @@ CDEPEND=" slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) ) ) munge? ( sys-auth/munge ) - pam? ( virtual/pam ) + pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild index 5a7bf934b19..b8797d5c132 100644 --- a/sys-cluster/slurm/slurm-18.08.7.ebuild +++ b/sys-cluster/slurm/slurm-18.08.7.ebuild @@ -42,7 +42,7 @@ CDEPEND=" slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) ) ) munge? ( sys-auth/munge ) - pam? ( virtual/pam ) + pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua )
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 3d7e7bce3711cb490dcd27769960e01b4089c041 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 6 18:06:44 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 6 18:07:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7e7bce sys-cluster/slurm: co-maintain Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/metadata.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml index ddcebd29a67..c588bb7a952 100644 --- a/sys-cluster/slurm/metadata.xml +++ b/sys-cluster/slurm/metadata.xml @@ -3,6 +3,11 @@ ale...@gentoo.org + Alexey Shvetsov + + + zlog...@gentoo.org + Mikle Kolyada clus...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: d21a20c69d563695edb1d5ad687dd72184dcfa2a Author: Justin Lecher gentoo org> AuthorDate: Sun Jul 7 17:49:08 2019 + Commit: Justin Lecher gentoo org> CommitDate: Mon Jul 8 19:35:26 2019 + 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 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 @@ Add support for netloc (amd64 only) Add NUMA awareness Add Infiniband support via ofed + Install SQL server for slurmdbd Enable perl scripts that emulates pbs (qstat, qsub etc.) 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=(
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: 9aa4f6dd9345daba4b121c66b31548c67bcac400 Author: Justin Lecher gentoo org> AuthorDate: Sat Nov 10 13:25:08 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sat Nov 10 13:25:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa4f6dd sys-cluster/slurm: Fix init stuff Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-cluster/slurm/files/slurmctld.initd| 26 + sys-cluster/slurm/files/slurmd.initd | 22 -- sys-cluster/slurm/files/slurmdbd.initd | 22 -- ...lurm-18.08.3.ebuild => slurm-18.08.3-r1.ebuild} | 27 ++ 4 files changed, 59 insertions(+), 38 deletions(-) diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd index e87dfdb83ad..5cb5888fa15 100644 --- a/sys-cluster/slurm/files/slurmctld.initd +++ b/sys-cluster/slurm/files/slurmctld.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_commands="reload" @@ -25,7 +25,7 @@ create_folder_and_set_permission() { eerror "SLURM: folder == ${folder} == /var/tmp" exit fi -checkpath -d -o slurm:slurm ${folder} +checkpath -d -o slurm:slurm "${folder}" } checkconfig() { @@ -35,12 +35,20 @@ checkconfig() { eerror "in slurm doc directory" return 1 fi - + # Make sure folders exists . /etc/slurm/slurm.conf - folders=(${SlurmdSpoolDir} `dirname ${SlurmctldLogFile}` `dirname ${SlurmctldPidFile}` `dirname ${SlurmdLogFile}` `dirname ${SlurmdPidFile}` ${SlurmdSpoolDir} ${StateSaveLocation}) - for folder in ${folders[*]}; do - create_folder_and_set_permission ${folder} + folders=( + ${SlurmdSpoolDir} + $(dirname ${SlurmctldLogFile}) + $(dirname ${SlurmctldPidFile}) + $(dirname ${SlurmdLogFile}) + $(dirname ${SlurmdPidFile}) + ${SlurmdSpoolDir} + ${StateSaveLocation} + ) + for folder in ${folders[@]}; do + create_folder_and_set_permission "${folder}" done } @@ -48,7 +56,7 @@ start() { ebegin "Starting slurm control daemon" checkconfig start-stop-daemon --start --quiet --background \ - --pidfile /var/run/slurm/slurmctld.pid \ + --pidfile /run/slurm/slurmctld.pid \ --user slurm \ --group slurm \ --exec /usr/sbin/slurmctld -- ${SLURMCTLD_OPTS} @@ -57,12 +65,12 @@ start() { stop() { ebegin "Stopping slurm control daemon" - start-stop-daemon --stop --pidfile /var/run/slurm/slurmctld.pid + start-stop-daemon --stop --pidfile /run/slurm/slurmctld.pid eend $? } reload() { ebegin "Reloading slurm daemon configuration" - start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmctld.pid + start-stop-daemon --signal HUP --pidfile /run/slurm/slurmctld.pid eend $? } diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd index a4a165be87d..dd9797c0c7d 100644 --- a/sys-cluster/slurm/files/slurmd.initd +++ b/sys-cluster/slurm/files/slurmd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_commands="reload" @@ -37,9 +37,17 @@ checkconfig() { fi # Make sure folders exists . /etc/slurm/slurm.conf - folders=(${SlurmdSpoolDir} `dirname ${SlurmctldLogFile}` `dirname ${SlurmctldPidFile}` `dirname ${SlurmdLogFile}` `dirname ${SlurmdPidFile}` ${SlurmdSpoolDir} ${StateSaveLocation}) - for folder in ${folders[*]}; do - create_folder_and_set_permission ${folder} + folders=( + ${SlurmdSpoolDir} + $(dirname ${SlurmctldLogFile}) + $(dirname ${SlurmctldPidFile}) + $(dirname ${SlurmdLogFile}) + $(dirname ${SlurmdPidFile}) + ${SlurmdSpoolDir} + ${StateSaveLocation} + ) + for folder in ${folders[@]}; do + create_folder_and_set_permission "${folder}" done } @@ -51,7 +59,7 @@ start() { # and https://computing.llnl.gov/linux/slurm/faq.html#rlimit ulimit -l unlimited start-stop-daemon --start --quiet --background \ - --pidfile /var/run/slurm/slurmd.pid \ + --pidfile /run/slurm/slurmd.pid \ --user root \ --group root \ --exec /usr/sbin/slurmd -- ${SLURMD_OPTS} @@ -60,12 +68,12 @@ start() { stop() { ebegin "Stopping
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 0ef6070d7a477ec5c971ccd6502b2822f3fc2fd6 Author: Justin Lecher gentoo org> AuthorDate: Sat Nov 10 07:58:23 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sat Nov 10 11:45:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef6070d sys-cluster/slurm: Version Bump Signed-off-by: Justin Lecher 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: c4c3069edbfb9bb37bc73cde4e9df278d84f59ae Author: Justin Lecher gentoo org> AuthorDate: Sat Oct 27 12:15:08 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sat Oct 27 12:15:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c3069e sys-cluster/slurm: Don't install non-existing files Closes: https://bugs.gentoo.org/665514 Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-cluster/slurm/slurm-18.08.0.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-cluster/slurm/slurm-18.08.0.ebuild b/sys-cluster/slurm/slurm-18.08.0.ebuild index 837a4d32c76..b3b7d52d447 100644 --- a/sys-cluster/slurm/slurm-18.08.0.ebuild +++ b/sys-cluster/slurm/slurm-18.08.0.ebuild @@ -191,12 +191,9 @@ src_install() { 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 keepdir /etc/slurm/layouts.d insinto /etc/slurm/layouts.d newins etc/layouts.d.power.conf.example power.conf.example
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: 017cd425528e318e78e4aac574169be21f1bd523 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Sep 4 13:36:43 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Sep 4 13:36:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017cd425 sys-cluster/slurm: Version bump Closes: https://bugs.gentoo.org/656960 Package-Manager: Portage-2.3.49, Repoman-2.3.10 sys-cluster/slurm/Manifest | 1 + .../slurm/files/slurm-18.08.0-disable-sview.patch | 99 ++ sys-cluster/slurm/slurm-17.11.9.ebuild | 2 +- .../{slurm-17.11.9.ebuild => slurm-18.08.0.ebuild} | 2 +- 4 files changed, 102 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index ab80e3b9bdc..0800d99dd77 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +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 diff --git a/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch new file mode 100644 index 000..f7e2c5b2673 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch @@ -0,0 +1,99 @@ + 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.11.9.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 759a83663940a35618f0ffbfae5911e1301f5963 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Sep 4 13:32:15 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Sep 4 13:32:48 2018 + 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..000 --- 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..000 ---
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 87493661de13b2f850a0b7de0f955d8e9504fe83 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Sep 4 13:31:38 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Sep 4 13:31:38 2018 + 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 000..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 @@ Gentoo Cluster Project + Build html documentation + Build support for collecting some ipmi stats + Add support for json-persing via json-c Enable authentication via munge Allow multiple slurmd to run + Add support for netloc (amd64 only) + Add NUMA awareness + Add Infiniband support via ofed Enable perl scripts that emulates pbs (qstat, qsub etc.) 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} == ** ]]; 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? (
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 01804741ea7cc0ea726cb60e6edb439be45efb82 Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 10 09:40:45 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 10 09:41:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01804741 sys-cluster/slurm: Disable ld.gold, bug filed upstream Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-cluster/slurm/slurm-17.02.11.ebuild | 3 ++- sys-cluster/slurm/slurm-17.11.7.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-17.02.11.ebuild b/sys-cluster/slurm/slurm-17.02.11.ebuild index 9387b9d5355..b52290725ed 100644 --- a/sys-cluster/slurm/slurm-17.02.11.ebuild +++ b/sys-cluster/slurm/slurm-17.02.11.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT} +inherit autotools eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT} DESCRIPTION="A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com; @@ -71,6 +71,7 @@ pkg_setup() { } src_prepare() { + tc-ld-disable-gold default # pids should go to /var/run/slurm diff --git a/sys-cluster/slurm/slurm-17.11.7.ebuild b/sys-cluster/slurm/slurm-17.11.7.ebuild index dcd9cec0e6d..c0310a53cc3 100644 --- a/sys-cluster/slurm/slurm-17.11.7.ebuild +++ b/sys-cluster/slurm/slurm-17.11.7.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools bash-completion-r1 eutils pam perl-module prefix user ${INHERIT_GIT} +inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT} DESCRIPTION="A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com; @@ -72,6 +72,7 @@ pkg_setup() { } src_prepare() { + tc-ld-disable-gold default # pids should go to /var/run/slurm
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 7f3509acf5cb66578a5a17946cf473198af68550 Author: Justin Lecher gentoo org> AuthorDate: Sat Jun 9 14:31:33 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sat Jun 9 20:33:19 2018 + 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 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 f417546f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4 Author: Justin Lecher gentoo org> AuthorDate: Sun Apr 1 20:50:01 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sun Apr 1 20:51:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c190a28 sys-cluster/slurm: Version Bump Signed-off-by: Justin Lecher 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 f417546f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 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..000 --- 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, ) == -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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: ccbe4b91900465c3f71b5fb769d369b4bfba408b Author: Justin Lecher gentoo org> AuthorDate: Sun Mar 11 21:26:28 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sun Mar 11 21:27:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbe4b91 sys-cluster/slurm: Version Bump Signed-off-by: Justin Lecher 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..000 --- 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 - #include - #include -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif - #include - #include - #include 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 000..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, ) == -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.ac2016-07-07 02:51:37.0 +0300 -+++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300 -@@ -261,44 +261,6 @@ + configure.ac | 39
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 4c498216e49c0e314b54f01fc80fcd72fb8ccfb2 Author: Justin Lecher gentoo org> AuthorDate: Sun Nov 26 16:50:40 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Nov 26 17:17:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c498216 sys-cluster/slurm: Add missing prefix.eclass Closes: https://bugs.gentoo.org/638744 Closes: https://bugs.gentoo.org/637348 Package-Manager: Portage-2.3.14, Repoman-2.3.6 Signed-off-by: Justin Lecher gentoo.org> sys-cluster/slurm/slurm-16.05.11.ebuild | 2 +- sys-cluster/slurm/slurm-17.02.9.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild index 3438722b95d..b04149a4cce 100644 --- a/sys-cluster/slurm/slurm-16.05.11.ebuild +++ b/sys-cluster/slurm/slurm-16.05.11.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools eutils pam perl-module user ${INHERIT_GIT} +inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT} DESCRIPTION="SLURM: A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com; diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild index 3f6085571b0..a6b63138f0d 100644 --- a/sys-cluster/slurm/slurm-17.02.9.ebuild +++ b/sys-cluster/slurm/slurm-17.02.9.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools eutils pam perl-module user ${INHERIT_GIT} +inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT} DESCRIPTION="A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com;
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 4c004e09e0f22f5dc591d9a25ca23c984915477e Author: Justin Lecher gentoo org> AuthorDate: Sun Nov 26 17:08:38 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Nov 26 17:17:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c004e09 sys-cluster/slurm: No tests defined Closes: https://bugs.gentoo.org/624448 Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.14, Repoman-2.3.6 sys-cluster/slurm/slurm-16.05.11.ebuild | 2 +- sys-cluster/slurm/slurm-17.02.9.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild index b04149a4cce..6f935a07577 100644 --- a/sys-cluster/slurm/slurm-16.05.11.ebuild +++ b/sys-cluster/slurm/slurm-16.05.11.ebuild @@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )" LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl" LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" -RESTRICT="primaryuri" +RESTRICT="primaryuri test" PATCHES=( "${FILESDIR}"/${P}-disable-sview.patch diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild index a6b63138f0d..f4c3c841d3f 100644 --- a/sys-cluster/slurm/slurm-17.02.9.ebuild +++ b/sys-cluster/slurm/slurm-17.02.9.ebuild @@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )" LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl" LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" -RESTRICT="primaryuri" +RESTRICT="primaryuri test" PATCHES=( "${FILESDIR}"/${P}-disable-sview.patch
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 87b4be04dbc8f2e65eacae7b9d1b87d0e50a30b2 Author: Justin Lecher gentoo org> AuthorDate: Sun Nov 12 19:38:37 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Nov 12 19:56:27 2017 + 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 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..000 --- a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 056d9ff26b1d2ccac45da3c26a6918f182f8c559 -Author: Justin Lecher-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 - -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 - #include - #include - #include - #include -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 59da33de0859235ea550b0bbbc088322e45f9b93 Author: Justin Lecher gentoo org> AuthorDate: Sun Nov 12 19:45:39 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Nov 12 19:56:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59da33de sys-cluster/slurm: Drop unused eclass Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-cluster/slurm/slurm-16.05.11.ebuild | 2 +- sys-cluster/slurm/slurm-17.02.9.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild index 956fa3e1251..3438722b95d 100644 --- a/sys-cluster/slurm/slurm-16.05.11.ebuild +++ b/sys-cluster/slurm/slurm-16.05.11.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT} +inherit autotools eutils pam perl-module user ${INHERIT_GIT} DESCRIPTION="SLURM: A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com; diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild index dc8afb80830..3f6085571b0 100644 --- a/sys-cluster/slurm/slurm-17.02.9.ebuild +++ b/sys-cluster/slurm/slurm-17.02.9.ebuild @@ -22,7 +22,7 @@ else S="${WORKDIR}/${MY_P}" fi -inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT} +inherit autotools eutils pam perl-module user ${INHERIT_GIT} DESCRIPTION="A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com;
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/
commit: 0deff097b2eaf288c2d2480e69f4564b6ddd57dd Author: David Hicks hicks id au> AuthorDate: Sat Jul 29 14:48:50 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Jul 30 09:22:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0deff097 sys-cluster/slurm: use HTTPS for GitHub, HOMEPAGE, SRC_URI and doc Package-Manager: Portage-2.3.6, Repoman-2.3.3 sys-cluster/slurm/slurm-16.05.2.ebuild | 8 sys-cluster/slurm/slurm-17.02.6.ebuild | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild index 9e0f02d6bbf..956fa3e1251 100644 --- a/sys-cluster/slurm/slurm-16.05.2.ebuild +++ b/sys-cluster/slurm/slurm-16.05.2.ebuild @@ -4,7 +4,7 @@ EAPI=6 if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="git://github.com/SchedMD/slurm.git" + EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; INHERIT_GIT="git-r3" SRC_URI="" KEYWORDS="" @@ -17,7 +17,7 @@ else fi MY_P="${PN}-${MY_PV}" INHERIT_GIT="" - SRC_URI="http://www.schedmd.com/download/latest/${MY_P}.tar.bz2; + SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2; KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" fi @@ -25,7 +25,7 @@ fi inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT} DESCRIPTION="SLURM: A Highly Scalable Resource Manager" -HOMEPAGE="http://www.schedmd.com; +HOMEPAGE="https://www.schedmd.com; LICENSE="GPL-2" SLOT="0" @@ -220,7 +220,7 @@ pkg_postinst() { 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 - elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html; + 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 --->" diff --git a/sys-cluster/slurm/slurm-17.02.6.ebuild b/sys-cluster/slurm/slurm-17.02.6.ebuild index 1d246ec803a..72d5cafc994 100644 --- a/sys-cluster/slurm/slurm-17.02.6.ebuild +++ b/sys-cluster/slurm/slurm-17.02.6.ebuild @@ -4,7 +4,7 @@ EAPI=6 if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="git://github.com/SchedMD/slurm.git" + EGIT_REPO_URI="https://github.com/SchedMD/slurm.git; INHERIT_GIT="git-r3" SRC_URI="" KEYWORDS="" @@ -17,7 +17,7 @@ else fi MY_P="${PN}-${MY_PV}" INHERIT_GIT="" - SRC_URI="http://www.schedmd.com/download/latest/${MY_P}.tar.bz2; + SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2; KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" fi @@ -25,7 +25,7 @@ fi inherit autotools eutils pam perl-module user prefix ${INHERIT_GIT} DESCRIPTION="A Highly Scalable Resource Manager" -HOMEPAGE="http://www.schedmd.com; +HOMEPAGE="https://www.schedmd.com; LICENSE="GPL-2" SLOT="0" @@ -213,7 +213,7 @@ pkg_postinst() { 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 "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 --->"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: 7c939e7a1b163ab5a754ba6592067be14ed9158c Author: Justin Lecher gentoo org> AuthorDate: Sun Jul 9 14:50:58 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Jul 9 18:48:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c939e7a sys-cluster/slurm: Fix compilation error with glibc-2.25 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=617192 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Signed-off-by: Justin Lecher gentoo.org> .../slurm/files/slurm-16.05.2-sysmacros.patch | 34 ++ sys-cluster/slurm/slurm-16.05.2.ebuild | 5 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch new file mode 100644 index 000..f9d22f479f8 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch @@ -0,0 +1,34 @@ + 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 + #include + #include ++#ifdef MAJOR_IN_MKDEV ++# include ++#endif ++#ifdef MAJOR_IN_SYSMACROS ++# include ++#endif + #include + #include + #include diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild index 2561857e107..9e0f02d6bbf 100644 --- a/sys-cluster/slurm/slurm-16.05.2.ebuild +++ b/sys-cluster/slurm/slurm-16.05.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,8 @@ LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" RESTRICT="primaryuri" PATCHES=( - "${FILESDIR}/${P}-disable-sview.patch" + "${FILESDIR}"/${P}-disable-sview.patch + "${FILESDIR}"/${P}-sysmacros.patch ) src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: f642dbad4a32533562e287dbbe0a96d5e48b61a0 Author: Justin Lecher gentoo org> AuthorDate: Sun Jul 9 16:35:55 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Jul 9 18:48:30 2017 + 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 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.0 +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.ac2016-07-07 02:51:37.0 +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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
commit: 0fa0a7c33eabedbcd6c79622746974b3d919f3b7 Author: Benda Xu gentoo org> AuthorDate: Sat Aug 13 07:27:45 2016 + Commit: Benda XU gentoo org> CommitDate: Sat Aug 13 07:29:04 2016 + 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
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/, sys-cluster/slurm/
commit: 10d045b613c46cc566bfee34d537ffa06b49c646 Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Jul 19 10:28:28 2016 + Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Jul 19 10:28:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d045b6 sys-cluster/slurm: Version bump! Gentoo-bug: 531710 Gentoo-bug: 570728 Package-Manager: portage-2.3.0 sys-cluster/slurm/Manifest | 2 +- .../slurm/files/slurm-16.05.2-disable-sview.patch | 90 ++ sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch| 43 --- sys-cluster/slurm/metadata.xml | 2 - .../{slurm-2.6.3.ebuild => slurm-16.05.2.ebuild} | 51 5 files changed, 107 insertions(+), 81 deletions(-) diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 1bdaad0..d98544e 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1 +1 @@ -DIST slurm-2.6.3.tar.bz2 5945106 SHA256 3523f6866531d48061e6b4d769a17e005b7d440bb5cee6c6ab6a12518c884d23 SHA512 98e212db02d14d9808c3e89bf0a44f7925dbb8bae360e5084e28c71c0dea0e670a28a0baa1a1511666c42e19693ecd807f24241baa082475f385bf7285dba0cd WHIRLPOOL 5e8955df7419d15f4be78eb1584a5797f6c3b29c01b4352b3f0bf8a7c5e9b96b97aa4ef74ba6bda0f278e80723b72a860eb2c65686bd2adb383ea444d4a62e29 +DIST slurm-16.05.2.tar.bz2 5982329 SHA256 de57ab107c98499f7184c54de8d5ac115a55657aa03d29d69cd0b7e737a42852 SHA512 8b4296481c5ad83da2bde1530937b3da9b6e32b6606ba0b0a3899e0f2f0b4fc42ca8a802d4bf346d0de28852d75839e9359e28c4ce77588cd22a08ddbd34dd21 WHIRLPOOL 925902c9432b24a2c85488d1ba6a867abed0adaaecaa94b648402e48d250d924000741b2be486b34d3b7f6890aeabb9aea6c47e2e8fd9896dda3a3ae416a4a89 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 new file mode 100644 index 000..5b861c3 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch @@ -0,0 +1,90 @@ +diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac +--- slurm-16.05.2.orig/configure.ac2016-07-07 02:51:37.0 +0300 slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300 +@@ -261,44 +261,6 @@ + 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"]) +- + X_AC_DATABASES + + dnl Cray ALPS/Basil support depends on mySQL +@@ -503,7 +465,6 @@ +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 -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.0 +0300 slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300 +@@ -27,8 +27,7 @@ + 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.0 +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