diff options
Diffstat (limited to 'sys-cluster/slurm')
| -rw-r--r-- | sys-cluster/slurm/Manifest | 8 | ||||
| -rw-r--r-- | sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch | 34 | ||||
| -rw-r--r-- | sys-cluster/slurm/files/slurm-17.11.4-buffer.patch | 16 | ||||
| -rw-r--r-- | sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch) | 58 | ||||
| -rw-r--r-- | sys-cluster/slurm/slurm-17.11.4.ebuild (renamed from sys-cluster/slurm/slurm-16.05.11.ebuild) | 90 |
5 files changed, 108 insertions, 98 deletions
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index 940475ff970e..d716f19469dc 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,13 +1,13 @@ AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9 -AUX slurm-16.05.11-disable-sview.patch 2317 BLAKE2B bcdacd63a962600705fbe7ea8318beaf16b586c9b3de2963d24c80742ba03afe40516028a7c13ea307efc32e053246172d7d4f96cc95c0202303120ee04dffaa SHA512 d351f3293976e49971a70fdfaf18247babfff870f6d8be216ad5beee8b866157405fd30afee832b29484064535dfa64eec17c720e8c6b72042481d17ac95eaff -AUX slurm-16.05.11-sysmacros.patch 983 BLAKE2B 3439a38f2cb87be2977f9554b57434a580cb4377a61f7bd30374754651fefeaceea49aa916cdf5f128b2e563652badf5815200606fd8689375021824121b451c SHA512 f9c2ce668e1ec0c191b809ffe7d94d4a47623a0325b63dcc7a51cce6a95bf322e03f03c81f02f26162df20c320bf45d810bdc6f7ebbfecb1bf651a8dac88f04c AUX slurm-17.02.9-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 +AUX slurm-17.11.4-buffer.patch 744 BLAKE2B 05c45fe1efe0a2238cbc9f595bc549f5d3e526a768c8c4eb5c81f29cff295d39ae103342dd7922f53f4f73268c534e6be9a422a532d7659b451f2e36ea624360 SHA512 33cb1c7317100f2ef5174adc2ff19e98f08c0d2470aa5794583b20bdb377f19189b75202cb153e73a91564119e068e8179775e087cb64bdd4f4c5167a95aee88 +AUX slurm-17.11.4-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f AUX slurmctld.initd 1833 BLAKE2B 3cc18daa26fd4b7b5b3dce33aa3536d99ce6af53e64abd6e76045345750a8f6254f702aa3d7e93e8123b95b6a664ea1021fd6bac53d68a2010b4ebd3ee00a4da SHA512 14246262aaf70642237f2ad13194d2bdc64f72b26e34113c2e7d340cf7661c62c79c4f939c61684c98fc5181680c08dbc55807dea0e382a3b2d1e26d0e57ce1c AUX slurmd.initd 1993 BLAKE2B 820153a8df6a5f1ce0d7db44d6c38170cc6ec7920f8d64743c65aaa65002e4c47c25bd9c3069b6df7feffb24506408aa42c2a67c486f5700f2d61a49fb971ca0 SHA512 f58b68c3fb5e9109b6fa261cbb816ef240f9d1465229ec418f3a2bba9a1bc47ca22bf1386d7014ea62a23d0807d73b263c4a4df86e8c354fcb760af3cc9d0250 AUX slurmdbd.initd 1709 BLAKE2B 12aa8ecb83991a4af8dbbd124d46d84c2c8b3c60756a42f9cb87df84dafb572553348e00eb720699a5d58020ca3fdf28a3357eb2903341a9d635ca4b399f5f8a SHA512 323852ab3ae1cbec55c51e54f7f7acc2e60a694e46a91454638b7f167f5dc0c1ecdba8bdb82641aee9ad303558c445d7551e774a6b470da279173b5c44123911 -DIST slurm-16.05.11.tar.bz2 6100281 BLAKE2B d9e368f22f55c457e2fb6caaca0a496e6de1c0c77af891e62259db88fa7fca68d4df0731f1a6cada046341698e673860eb7d3883ef9dba8589fc01c7882a1735 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c -EBUILD slurm-16.05.11.ebuild 7621 BLAKE2B 3bc53a9700d4f26b26819f007c21e269dfd4cf35d1d428367b0d75dcd273b2547844b311c30a134c928bb9895d57c38adbddec6460e63047e154953f8795e43b SHA512 0c389ecab3d99963e1d957d852da051d168864c7a39cddec1c6509dbbd6eb56dfedeecad2fb69b411f71834559c8a6cf7c1fb1d21bb9dcdb982bcf0fc6699c60 +DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962 EBUILD slurm-17.02.9.ebuild 7042 BLAKE2B 0b91317ab3a1042954baf44df9910dc77df326969984f7214e033e04ddd69b4654b74409f333b7907edfd5adef14a001816fdae1a51a2eadb08d073f3acaec14 SHA512 2591578099b94b137d7ec71fe2da59cb6bccce1210b0f7617ccb7972e4136a3ce9752c8c1f4071b8493870f3180a634d674a62e93f1d2255a2cc7d62b19c19dd +EBUILD slurm-17.11.4.ebuild 7277 BLAKE2B 4a840fe4296b6ba84a125b27690507e3accd4a858844c4e67d5dc8d73d02d430a624b9e9d39d5f81258e5dbecf2aae49cf311f1b0502173d9c094b4bae6642b8 SHA512 3886b8a1699cbbbc60dd114312386110fcfccf0ab2138439be4e18a56107dafb8a690fcad8d59e16f6f9f94e0c4df7e10e6f4980f8305d8a550a97e3c882cf77 MISC metadata.xml 563 BLAKE2B 26101a6dbee3ad181afe3c7b072a747c1640ca8d78ab3c16380eb3a636937c3f6b9b8469dfcb3bfb369e3f4ca8ee609f3666668976b36d6ce77657b14227a2d4 SHA512 31d52fcdcd9526f8dc9ac00d173986943303b74ff6c554f6be30f2c059a0e1cc54330871ec132c451ab6f23ac062b3a9161293c13f3fffa13343f964d6cb959b 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 f9d22f479f89..000000000000 --- a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch +++ /dev/null @@ -1,34 +0,0 @@ - configure.ac | 2 +- - src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 869a989..2936983 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \ - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - AC_HEADER_STDC -- -+AC_HEADER_MAJOR - - dnl Checks for structures. - dnl -diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c -index 554583c..9be99d8 100644 ---- a/src/plugins/task/cgroup/task_cgroup_devices.c -+++ b/src/plugins/task/cgroup/task_cgroup_devices.c -@@ -42,6 +42,12 @@ - #include <sched.h> - #include <glob.h> - #include <sys/types.h> -+#ifdef MAJOR_IN_MKDEV -+# include <sys/mkdev.h> -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include <sys/sysmacros.h> -+#endif - #include <sys/stat.h> - #include <slurm/slurm.h> - #include <slurm/slurm_errno.h> diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch new file mode 100644 index 000000000000..eec43fb449c0 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch @@ -0,0 +1,16 @@ + src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c +index 51f72df226..3a5ffef60d 100644 +--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c ++++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c +@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap) + if (mem_sort && (numa_available() != -1)) { + struct stat sb; + int buf_len, fd, i, len, rc; +- char buf[8]; ++ char buf[10]; + + if (stat(ZONE_SORT_PATH, &sb) == -1) { + rc = system(MODPROBE_PATH " zonesort_module"); diff --git a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch index 1e4a5b4fae3a..f7e2c5b26739 100644 --- a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch @@ -1,7 +1,13 @@ -diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac ---- slurm-16.05.2.orig/configure.ac 2016-07-07 02:51:37.000000000 +0300 -+++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300 -@@ -261,44 +261,6 @@ + configure.ac | 39 --------------------------------------- + doc/man/man1/Makefile.am | 8 -------- + src/Makefile.am | 3 +-- + 3 files changed, 1 insertion(+), 49 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f177ec..ff4d69b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES) PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") @@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac - -AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"]) - - X_AC_DATABASES - dnl Cray ALPS/Basil support depends on mySQL -@@ -503,7 +465,6 @@ + X_AC_CRAY + +@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile @@ -54,16 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile -diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am ---- slurm-16.05.2.orig/src/Makefile.am 2016-07-07 02:51:37.000000000 +0300 -+++ slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300 -@@ -27,8 +27,7 @@ +diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am +index 246f16d..ba39af2 100644 +--- a/doc/man/man1/Makefile.am ++++ b/doc/man/man1/Makefile.am +@@ -29,10 +29,6 @@ if WITH_BLCR + man1_MANS += srun_cr.1 + endif + +-if BUILD_SVIEW +-man1_MANS += sview.1 +-endif +- + EXTRA_DIST = $(man1_MANS) + + if HAVE_MAN2HTML +@@ -65,10 +61,6 @@ if WITH_BLCR + html_DATA += srun_cr.html + endif + +-if BUILD_SVIEW +-html_DATA += sview.html +-endif +- + MOSTLYCLEANFILES = ${html_DATA} + + EXTRA_DIST += $(html_DATA) +diff --git a/src/Makefile.am b/src/Makefile.am +index bcd5aa7..a8cbf17 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,5 +28,4 @@ SUBDIRS = \ srun_cr \ sshare \ sstat \ - strigger \ - sview + strigger - - if !REAL_BG_L_P_LOADED - SUBDIRS += srun diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-17.11.4.ebuild index 6f935a075773..0b943a40504f 100644 --- a/sys-cluster/slurm/slurm-16.05.11.ebuild +++ b/sys-cluster/slurm/slurm-17.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,19 +17,19 @@ else fi MY_P="${PN}-${MY_PV}" INHERIT_GIT="" - SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2" + SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" fi inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT} -DESCRIPTION="SLURM: A Highly Scalable Resource Manager" +DESCRIPTION="A Highly Scalable Resource Manager" HOMEPAGE="https://www.schedmd.com" LICENSE="GPL-2" SLOT="0" -IUSE="lua multiple-slurmd +munge mysql pam perl ssl static-libs torque" +IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque" DEPEND=" !sys-cluster/torque @@ -54,7 +54,7 @@ RESTRICT="primaryuri test" PATCHES=( "${FILESDIR}"/${P}-disable-sview.patch - "${FILESDIR}"/${P}-sysmacros.patch + "${FILESDIR}"/${P}-buffer.patch ) src_unpack() { @@ -71,10 +71,8 @@ pkg_setup() { } src_prepare() { - if [ ${#PATCHES[0]} -ne 0 ]; then - epatch "${PATCHES[@]}" - fi - eapply_user + default + # pids should go to /var/run/slurm sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \ -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \ @@ -101,6 +99,7 @@ src_configure() { --docdir="${EPREFIX}/usr/share/doc/${P}" --htmldir="${EPREFIX}/usr/share/doc/${P}" ) + use debug || myconf+=( --disable-debug ) use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) ) use mysql || myconf+=( --without-mysql_config ) econf "${myconf[@]}" \ @@ -113,19 +112,21 @@ src_configure() { # --htmldir does not seems to propagate... Documentations are installed # in /usr/share/doc/slurm-2.3.0/html # instead of /usr/share/doc/slurm-2.3.0.2/html - sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die + sed \ + -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \ + -i doc/html/Makefile || die if use perl ; then # small hack to make it compile - mkdir -p "${S}/src/api/.libs" - mkdir -p "${S}/src/db_api/.libs" - touch "${S}/src/api/.libs/libslurm.so" - touch "${S}/src/db_api/.libs/libslurmdb.so" - cd "${LIBSLURM_PERL_S}" + mkdir -p "${S}/src/api/.libs" || die + mkdir -p "${S}/src/db_api/.libs" || die + touch "${S}/src/api/.libs/libslurm.so" || die + touch "${S}/src/db_api/.libs/libslurmdb.so" || die + cd "${LIBSLURM_PERL_S}" || die S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure - cd "${LIBSLURMDB_PERL_S}" + cd "${LIBSLURMDB_PERL_S}" || die S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure - cd "${S}" - rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" + cd "${S}" || die + rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die fi } @@ -133,26 +134,24 @@ src_compile() { default use pam && emake -C contribs/pam if use perl ; then - cd "${LIBSLURM_PERL_S}" + cd "${LIBSLURM_PERL_S}" || die S="${LIBSLURM_PERL_S}" perl-module_src_compile - cd "${LIBSLURMDB_PERL_S}" + cd "${LIBSLURMDB_PERL_S}" || die S="${LIBSLURMDB_PERL_S}" perl-module_src_compile - cd "${S}" - fi - if use torque ; then - emake -C contribs/torque + cd "${S}" || die fi + use torque && emake -C contribs/torque } src_install() { default use pam && emake DESTDIR="${D}" -C contribs/pam install if use perl; then - cd "${LIBSLURM_PERL_S}" + cd "${LIBSLURM_PERL_S}" || die S="${LIBSLURM_PERL_S}" perl-module_src_install - cd "${LIBSLURMDB_PERL_S}" + cd "${LIBSLURMDB_PERL_S}" || die S="${LIBSLURMDB_PERL_S}" perl-module_src_install - cd "${S}" + cd "${S}" || die fi if use torque; then emake DESTDIR="${D}" -C contribs/torque @@ -162,30 +161,29 @@ src_install() { # install sample configs keepdir /etc/slurm insinto /etc/slurm - doins etc/bluegene.conf.example - doins etc/cgroup.conf.example - doins etc/cgroup_allowed_devices_file.conf.example - doins etc/slurm.conf.example - doins etc/slurmdbd.conf.example + doins \ + etc/bluegene.conf.example \ + etc/cgroup.conf.example \ + etc/cgroup_allowed_devices_file.conf.example \ + etc/slurm.conf.example \ + etc/slurmdbd.conf.example exeinto /etc/slurm - doexe etc/cgroup.release_common.example - doexe etc/slurm.epilog.clean + doexe \ + etc/slurm.epilog.clean # install init.d files - newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd - newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld - newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd + newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd + newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld + newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd # install conf.d files newconfd "${FILESDIR}/slurm.confd" slurm # Install logrotate file insinto /etc/logrotate.d newins "${FILESDIR}/logrotate" slurm - # cgroups support - exeinto /etc/slurm/cgroup - doexe etc/cgroup.release_common.example - mv "${ED}"/etc/slurm/cgroup/{cgroup.release_common.example,release_common} || die "Can't move cgroup.release_common.example" - ln -s release_common "${ED}"/etc/slurm/cgroup/release_cpuset || die "Can't create symbolic link release_cpuset" - ln -s release_common "${ED}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices" - ln -s release_common "${ED}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer" + + newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN} + bashcomp_alias \ + sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \ + sprio sacct salloc sbatch srun sattach sdiag sstat } pkg_preinst() { @@ -214,12 +212,12 @@ pkg_postinst() { for folder_path in ${paths[@]}; do create_folders_and_fix_permissions $folder_path done - einfo + echo elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html" elog "through a (javascript enabled) browser to create a configureation file." elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster." - einfo + echo elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html" elog "Your kernel must be compiled with the wanted cgroup feature:" elog " General setup --->" |