diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-cluster/slurm | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'sys-cluster/slurm')
-rw-r--r-- | sys-cluster/slurm/Manifest | 7 | ||||
-rw-r--r-- | sys-cluster/slurm/files/disable-sview.patch | 76 | ||||
-rw-r--r-- | sys-cluster/slurm/slurm-19.05.4.1.ebuild | 9 | ||||
-rw-r--r-- | sys-cluster/slurm/slurm-19.05.5.1.ebuild (renamed from sys-cluster/slurm/slurm-19.05.3.2.ebuild) | 19 |
4 files changed, 93 insertions, 18 deletions
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 8312d1c61a4f..9871e4ecd5b9 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,3 +1,4 @@ +AUX disable-sview.patch 2451 BLAKE2B 4cf247c55bd439f72e428c94c2826394f6be2a3eb9b65ff6b713b1651248eb7470e2fa9aeb3fe27ad122971924a3d6e154659a3a3cbff19aafec713d6a25e861 SHA512 d828d64703c86bba79d929ed3583842b0b9e82f4f6e1f887eb7d4b4d0015e16cdfdc812454b4adb184afa08011afaa24a3def6d90dbc957375fc88e05c93e199 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164463a167459082a23eea25fa22edf2987e52c71f953160c12b29cdb5e5f437a3bdc89f1cd8395b5 SHA512 b7f116687e0dee0377b43cbb49f63569088d6f5f9b1514014999b1135b1b4da462e04887851b753161d7b9691436048b692b7697ffee2a4e45daa339a412c93c @@ -5,7 +6,7 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8 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 -EBUILD slurm-19.05.3.2.ebuild 8000 BLAKE2B e150b57f5e125dbd200a27baee3487b738acd88e1ac8f3955a9cd13a8ebc1b260f390c1c3d207c3856029f906d5a0b55ed9a59de0ed7b8c5c5eed401f147e2af SHA512 94bc73f29ea276cabc863a9b4c62aac4b043ba93a43bcaaaf64c7d34c8bf8e25916c05991071ea72075735ef7e653013c76d98efaa5e2e053c9253fdd30b0ec4 -EBUILD slurm-19.05.4.1.ebuild 8046 BLAKE2B 7a20345c3cca566b6fa0f7908880080adf2052732c50c1665da56a45fcf35580dd1911da3fcc803c4961957f7a7a2a4883bd9eb5c63f3a8f2191c71d1f461e5d SHA512 d5b615b0c664d734f709538ee9e8eb38d53e1710bb87864102bf3a5034b55351df32f95f987e1640536f753b0246937a6455e6442f9811a91404c1f1299198e6 +DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be +EBUILD slurm-19.05.4.1.ebuild 8006 BLAKE2B c0d5f023c1a5e8ba30f9732c6e0c0dd51ee9009f62ffd48f8825ae2ada2e6d44d4ccfbb7c6aa8f2d5c95a9802e3e78cb268eb91a47df8acae327a9348da9bb08 SHA512 f0e0c5b2c0e4fa1a9bc954de8f5ada094371351b5bf45453f1110ddf5eaa17830d3652f3e515bc78aa2fe57e5e0352717198a0f1214044a038e1a8ef298b7582 +EBUILD slurm-19.05.5.1.ebuild 7999 BLAKE2B 7529d970466ca2744f2329b11e2722a2de855b4b460a9e4d55918eb20a80f36d471d4207634ca076c513d64c1e9d318527f1237e1415b42d893f50cea3b0eaac SHA512 d99b37d9e8d16be68d7e945706f0401d2b72806a59cdd0d01818fd234245f1988628c890ab207eb959319259a3c053528cbdd96737baa1e54d1ac10e3759aee3 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch new file mode 100644 index 000000000000..f409765a847a --- /dev/null +++ b/sys-cluster/slurm/files/disable-sview.patch @@ -0,0 +1,76 @@ +--- a/configure.ac 2019-08-13 20:40:08.000000000 +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.000000000 +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.000000000 +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 2bfe56a32f5a..f9a659b1dc90 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 ) @@ -67,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" @@ -82,6 +81,7 @@ src_unpack() { src_prepare() { tc-ld-disable-gold + eapply "${FILESDIR}"/disable-sview.patch default # pids should go to /var/run/slurm @@ -123,7 +123,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) \ diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild index 4c9d3cbf4ae4..c7cb6c9ce414 100644 --- a/sys-cluster/slurm/slurm-19.05.3.2.ebuild +++ b/sys-cluster/slurm/slurm-19.05.5.1.ebuild @@ -13,22 +13,22 @@ 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 + MY_PV=$(ver_rs 1-3 '-') # stable releases fi MY_P="${PN}-${MY_PV}" INHERIT_GIT="" - SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2" + 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" +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 ) @@ -65,10 +64,10 @@ RDEPEND="${OMMON_DEPEND} REQUIRED_USE="torque? ( perl )" -S="${WORKDIR}/${MY_P}" +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" @@ -82,6 +81,7 @@ src_unpack() { src_prepare() { tc-ld-disable-gold + eapply "${FILESDIR}"/disable-sview.patch default # pids should go to /var/run/slurm @@ -123,7 +123,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) \ @@ -185,7 +184,7 @@ src_install() { keepdir /etc/slurm insinto /etc/slurm doins \ - etc/bluegene.conf.example \ + etc/prolog.example \ etc/cgroup.conf.example \ etc/slurm.conf.example \ etc/slurmdbd.conf.example |