diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /sys-cluster/slurm | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'sys-cluster/slurm')
-rw-r--r-- | sys-cluster/slurm/Manifest | 18 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.11.12-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch) | 0 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch) | 0 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurmctld.initd | 26 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurmd.initd | 22 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurmdbd.initd | 22 | ||||
-rw-r--r-- | sys-cluster/slurm/slurm-17.11.12.ebuild (renamed from sys-cluster/slurm/slurm-17.11.9.ebuild) | 2 | ||||
-rw-r--r-- | sys-cluster/slurm/slurm-18.08.3-r1.ebuild (renamed from sys-cluster/slurm/slurm-18.08.0.ebuild) | 29 |
8 files changed, 70 insertions, 49 deletions
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest index f15790748d08..c306d25e4e2a 100644 --- a/sys-cluster/slurm/Manifest +++ b/sys-cluster/slurm/Manifest @@ -1,13 +1,13 @@ AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9 -AUX slurm-17.11.7-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 -AUX slurm-18.08.0-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 +AUX slurm-17.11.12-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 +AUX slurm-18.08.3-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164463a167459082a23eea25fa22edf2987e52c71f953160c12b29cdb5e5f437a3bdc89f1cd8395b5 SHA512 b7f116687e0dee0377b43cbb49f63569088d6f5f9b1514014999b1135b1b4da462e04887851b753161d7b9691436048b692b7697ffee2a4e45daa339a412c93c -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-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b -DIST slurm-18.08.0.tar.bz2 6100548 BLAKE2B 108a64c05cf704288b2ed3627b92edb6402c41aec9866b06d7fdf18b9e0e5f5e815a7e7ded5f8d5c4ab7e9ad46368b5bc54ac52902413fc8a9395c665f11e2ed SHA512 e0da38e2b8b96433c244bcad41e7dd0da56e9bf3de8a64eafd5a8d89ffb8400a3aebb2a54ec28f6c2e9804d40945bb8b53b2a9e3ac688a1d8a2a81ee71b4b11d -EBUILD slurm-17.11.9.ebuild 8334 BLAKE2B 0b83f0d3587dab4d094c10aab1565fe8ba66551323512a3f1ba4985a67ebdc09e5f137d3b61502687090f2b5add7154f3406c01d698757c4ad8b15e9746d2e47 SHA512 d4d38d06d0ac2036c757e7d37a18d94df079cca7389ee9807ea4a7f471016afeadd4e43042f0c517e2d6f428db31bb167ff67eb6006be553047b607a933ec729 -EBUILD slurm-18.08.0.ebuild 8251 BLAKE2B 0c090d146b675eb47948855ea96fe23776e04ef25579c99323b720bb8628f85b6d55814db81261d2df2333626594e711862d08a5b02fe079b03d063fc72f091e SHA512 854c6c32f6306c4593e30235d11ccdb0f4743738d94efef6c7b81e7fc7b1553cabc60bc830491a7e4c95cc3d19eba66d4fe11c9422680c7d89a67b3e95693893 +AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf48433a54fd34f49d2f4f95b5c6dd9e4ab1f40938c274be6be2e88cdb8959ecb12b4a86d07bc0a5bc86 SHA512 4356552630d1a154bbf369012c0315baf08b5b98ff6411d66ea3b1b039bfff5f105091b110e8fa1e64209eb0990038abda86d980cf2316ca97a5c10a43243df6 +AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a +AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8 +DIST slurm-17.11.12.tar.bz2 6257065 BLAKE2B 3427645f9e54e90ce5f61395a1df7f2c1c9f5582e25780daab8a05dbe92bd39841356df8e66334bc3d8ee3d81f6a56b344e81ed142cd354d22fbdb4729c554d1 SHA512 bd59d2d9291e00c9ab71479e2190b89a7798f1ba9a4320b003d7c1ad6d62983c1d3debfdbdfc6e0abaf66472be6e3108c4969feb151e30874d3b51f53d213803 +DIST slurm-18.08.3.tar.bz2 6092020 BLAKE2B 63d5c7682decadc723637293660057a27a20b5ba4f0e0d53708091b86b59ed05c28ad19a70b2cf6d7c1e58df81f12fb2b5e26e44fa06cb5deacde5cd5b7db0f7 SHA512 2d1018e5b1520a5d71825d548d91d06d0f0a8df92b33f87d21a2238a5245a1199ca588370aea1df6ad9d09242df9a6af19ea80357dae41a0337812617721c8bf +EBUILD slurm-17.11.12.ebuild 8331 BLAKE2B 859a06ebb4fed89dc1f79e4cfe625f0c335ff9e938f6d412b8072384049c8643556f4ba682ca983bbebdb3b25a079e7c4cb2c357f0009c21614f49ddc8cf9af0 SHA512 323937788d9afb45692b096d57bc1a559071a8b7e7daacf16411a0b52fb1c30ed3f09d12772038d3837c926bb792cea31e5613e64ddd726ed94ffe547e55a6be +EBUILD slurm-18.08.3-r1.ebuild 7949 BLAKE2B 402faf2a7f4655d6e9bf194cd422331f1c135c04f9dab969007f613fb23a34179679df7710fe51aaa258e4cfb19ffcf49f9db6c92c3858992edda1f2434bf811 SHA512 31285cb1d2fcb1bca3c1d332c3a1759852dfa18aa6802b4ebe7cfed2bc0546e8f9860ff6b6b2e98c1f5dce015b30ccc56ad619f79a9d5c7446df1cae875e6193 MISC metadata.xml 924 BLAKE2B 677aa97b18c363554f12f5b1433933b420452ae82ab170523893132d42ce06b20e18e3b5a6650d9154630d2d3ed6d37bbdb8e31adf33e53fdfd8d5b5ff5d646c SHA512 68823ac5369c0aa934352fc2fb06115e7458ea8773dbd6aaa11380b38c0abc73d7a158a26c9e510355dd3d0e92ad7e05751350c084a47e4413c0504e680fcc5b 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 index f7e2c5b26739..f7e2c5b26739 100644 --- a/sys-cluster/slurm/files/slurm-17.11.7-disable-sview.patch +++ b/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 index f7e2c5b26739..f7e2c5b26739 100644 --- a/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-18.08.3-disable-sview.patch diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd index e87dfdb83ad3..5cb5888fa153 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 a4a165be87d3..dd9797c0c7d2 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 slurm daemon" - start-stop-daemon --stop --pidfile /var/run/slurm/slurmd.pid + start-stop-daemon --stop --pidfile /run/slurm/slurmd.pid eend $? } reload() { ebegin "Reloading slurm daemon configuration" - start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmd.pid + start-stop-daemon --signal HUP --pidfile /run/slurm/slurmd.pid eend $? } diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd index 296afaf9421c..27b5102101cb 100644 --- a/sys-cluster/slurm/files/slurmdbd.initd +++ b/sys-cluster/slurm/files/slurmdbd.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" @@ -36,9 +36,17 @@ checkconfig() { # 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 } @@ -46,7 +54,7 @@ start() { ebegin "Starting slurmdb daemon" checkconfig start-stop-daemon --start --quiet --background \ - --pidfile /var/run/slurm/slurmdbd.pid \ + --pidfile /run/slurm/slurmdbd.pid \ --user slurm \ --group slurm \ --exec /usr/sbin/slurmdbd -- ${SLURMD_OPTS} @@ -55,12 +63,12 @@ start() { stop() { ebegin "Stopping slurmdb daemon" - start-stop-daemon --stop --pidfile /var/run/slurm/slurmdbd.pid + start-stop-daemon --stop --pidfile /run/slurm/slurmdbd.pid eend $? } reload() { ebegin "Reloading slurmdb daemon configuration" - start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmdbd.pid + start-stop-daemon --signal HUP --pidfile /run/slurm/slurmdbd.pid eend $? } diff --git a/sys-cluster/slurm/slurm-17.11.9.ebuild b/sys-cluster/slurm/slurm-17.11.12.ebuild index 837a4d32c760..67111e2fac8c 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-r1.ebuild index b3b7d52d4479..92e034a9760e 100644 --- a/sys-cluster/slurm/slurm-18.08.0.ebuild +++ b/sys-cluster/slurm/slurm-18.08.3-r1.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 @@ -88,27 +88,24 @@ src_prepare() { default # pids should go to /var/run/slurm - sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \ + 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 -i "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \ + || 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" - # also state dirs are in /var/spool/slurm - sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \ - -e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \ - -i "${S}/etc/slurm.conf.example" \ - || die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*" - # and tmp should go to /var/tmp/slurm - sed -e 's:/tmp:/var/tmp:g' \ - -i "${S}/etc/slurm.conf.example" \ - || die "Can't sed for StateSaveLocation=*./tmp" + || die "Can't sed for /var/run/slurmdbd.pid" # gentooify systemd services - sed -e 's:sysconfig/.*:conf.d/slurm:g' \ + sed \ + -e 's:sysconfig/.*:conf.d/slurm:g' \ -e 's:var/run/:run/slurm/:g' \ -i "${S}/etc"/*.service.in \ - || die "Can't sed systemd services for sysconfig or var/run/" + || die "Can't sed systemd services for sysconfig or var/run/" hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4 eautoreconf |