summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2018-04-01 21:50:01 +0100
committerJustin Lecher <jlec@gentoo.org>2018-04-01 21:51:34 +0100
commit2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4 (patch)
treec0a00e4a11c9eace36b9f087819fd7db4c84c430
parentsys-cluster/pmix: New package (diff)
downloadgentoo-2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4.zip
gentoo-2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4.tar.gz
gentoo-2c190a28b3a11e1b9b4507a2a8a6b7cc1514d7d4.tar.bz2
sys-cluster/slurm: Version Bump
Signed-off-by: Justin Lecher <jlec@gentoo.org> Package-Manager: Portage-2.3.27, Repoman-2.3.9
-rw-r--r--sys-cluster/slurm/Manifest4
-rw-r--r--sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch)0
-rw-r--r--sys-cluster/slurm/files/slurm-17.11.4-buffer.patch16
-rw-r--r--sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch)0
-rw-r--r--sys-cluster/slurm/slurm-17.02.10.ebuild (renamed from sys-cluster/slurm/slurm-17.02.9.ebuild)3
-rw-r--r--sys-cluster/slurm/slurm-17.11.5.ebuild (renamed from sys-cluster/slurm/slurm-17.11.4.ebuild)14
6 files changed, 12 insertions, 25 deletions
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 168ca92..4fb2eb5 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
-DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962
+DIST slurm-17.02.10.tar.bz2 6056342 BLAKE2B 1e6f3af68371e75a880fc28e4c7931fa61372a52bf9ce7b089c9bc62c5660c57c1e4b74d93c4105e611b9702c3bf64f1b9713d26c21513cb83bc11edc258be40 SHA512 b6fbec81abc36dcb5cd742363c33caeecad6c42ee80fe7a13ddc81703b5f5c28f3ddd88bbfbabe94550257d46b56d2c0e0ded9da6b92617074c57358ba33d449
+DIST slurm-17.11.5.tar.bz2 6248551 BLAKE2B f41754eeee6f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 SHA512 cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
diff --git a/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
index f7e2c5b..f7e2c5b 100644
--- a/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch
+++ b/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 eec43fb..00000000
--- a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-index 51f72df226..3a5ffef60d 100644
---- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-+++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap)
- if (mem_sort && (numa_available() != -1)) {
- struct stat sb;
- int buf_len, fd, i, len, rc;
-- char buf[8];
-+ char buf[10];
-
- if (stat(ZONE_SORT_PATH, &sb) == -1) {
- rc = system(MODPROBE_PATH " zonesort_module");
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
index f7e2c5b..f7e2c5b 100644
--- a/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
+++ b/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
index f4c3c84..9387b9d 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
index 0b943a4..dcd9cec 100644
--- a/sys-cluster/slurm/slurm-17.11.4.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.5.ebuild
@@ -22,25 +22,27 @@ else
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix user ${INHERIT_GIT}
DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X"
DEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
+ sys-cluster/pmix[-pmi]
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
+ X? ( net-libs/libssh2 )
>=sys-apps/hwloc-1.1.1-r1"
RDEPEND="${DEPEND}
dev-libs/libcgroup"
@@ -54,7 +56,6 @@ RESTRICT="primaryuri test"
PATCHES=(
"${FILESDIR}"/${P}-disable-sview.patch
- "${FILESDIR}"/${P}-buffer.patch
)
src_unpack() {
@@ -104,6 +105,7 @@ src_configure() {
use mysql || myconf+=( --without-mysql_config )
econf "${myconf[@]}" \
$(use_enable pam) \
+ $(use_enable X x11) \
$(use_with ssl) \
$(use_with munge) \
$(use_enable static-libs static) \
@@ -180,9 +182,9 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
- newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
- bashcomp_alias \
- sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+ newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+ bashcomp_alias scontrol \
+ sreport sacctmgr squeue scancel sshare sbcast sinfo \
sprio sacct salloc sbatch srun sattach sdiag sstat
}