diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | slurm-llnl-default-conf | 16 | ||||
| -rw-r--r-- | slurm-llnl-git.install | 60 | ||||
| -rw-r--r-- | slurm-llnl.sysusers | 1 | ||||
| -rw-r--r-- | slurm-llnl.tmpfiles | 3 | ||||
| -rw-r--r-- | slurm-tmpfiles.conf | 3 | ||||
| -rw-r--r-- | slurmctld.service | 15 | ||||
| -rw-r--r-- | slurmd.service | 19 | ||||
| -rw-r--r-- | slurmdbd.service | 14 |
10 files changed, 42 insertions, 166 deletions
@@ -1,16 +1,18 @@ pkgbase = slurm-llnl-git pkgdesc = Simple Linux Utility for Resource Management (development version) - pkgver = 19.05.0.0rc1.r6.g1d5470a09c + pkgver = 22.05.5.1.r1233.gbfc106f0eb pkgrel = 1 url = https://www.schedmd.com - install = slurm-llnl-git.install arch = i686 arch = x86_64 arch = armv7h license = GPL + makedepends = git makedepends = python makedepends = gtk2 - makedepends = git + makedepends = hwloc + makedepends = rrdtool + makedepends = hdf5 depends = munge optdepends = hwloc: enables the task/cgroup plugin optdepends = lua: the lua API will be available in various plugins @@ -25,23 +27,19 @@ pkgbase = slurm-llnl-git optdepends = man2html: HTML versions of the man pages will be generated optdepends = rrdtool: support for the ext_sensors/rrd plugin optdepends = numactl: NUMA support in the task/affinity plugin - optdepends = ncurses: adds the smap command + optdepends = ncurses: ncurses interface in various utilities optdepends = gtk2: enables the sview command, a simple graphical frontend optdepends = pmix: support Open MPI applications using PMIx - provides = slurm-llnl=19.05.0.0rc1.r6.g1d5470a09c + provides = slurm-llnl=22.05.5.1.r1233.gbfc106f0eb conflicts = slurm-llnl - backup = etc/default/slurm-llnl - source = slurm-tmpfiles.conf - source = slurm-llnl-default-conf - source = slurmctld.service - source = slurmd.service - source = slurmdbd.service + backup = etc/sysconfig/slurmd + backup = etc/sysconfig/slurmctld + backup = etc/sysconfig/slurmdbd + source = slurm-llnl.sysusers + source = slurm-llnl.tmpfiles source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git - sha512sums = 61f07699353d607ec43bab2a4fe29b4a380dab10108619e67ca2737193ab044a6e263179f7def932660acefd34c790c9d2b301cd6a49d92b8b80deeb1c7b8011 - sha512sums = f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710 - sha512sums = a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5 - sha512sums = ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c - sha512sums = 56459e20d7f2624a8e8dd2982693b257e65df22c3609d991afdc1b2f79adaefc0586a76fd5fdd7dc2bdd39b3af0c91f38ddc4b1139081968903450bc28aca304 + sha512sums = 8373ef791d68a7e0b2114f5ce670da1936bd8d96fd51fa7319d4feb85f16a673f89abcb823a114455d32d8fd9eee3e121c313a0aa986542540f120e6d35686e6 + sha512sums = 4f7d1e36abc2ca5aa38b40403292b68f769238766ecdd44ea5d29f8106bd9b7c3e0d2236208f92e00818e37dd24c9520b6e9fe06e01b6e552ac485a1df682edd sha512sums = SKIP pkgname = slurm-llnl-git @@ -3,7 +3,7 @@ # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch> pkgname=slurm-llnl-git -pkgver=19.05.0.0rc1.r6.g1d5470a09c +pkgver=22.05.5.1.r1233.gbfc106f0eb pkgrel=1 pkgdesc="Simple Linux Utility for Resource Management (development version)" arch=('i686' 'x86_64' 'armv7h') @@ -23,25 +23,18 @@ optdepends=("hwloc: enables the task/cgroup plugin" "man2html: HTML versions of the man pages will be generated" "rrdtool: support for the ext_sensors/rrd plugin" "numactl: NUMA support in the task/affinity plugin" - "ncurses: adds the smap command " + "ncurses: ncurses interface in various utilities" "gtk2: enables the sview command, a simple graphical frontend" "pmix: support Open MPI applications using PMIx") -makedepends=('python' 'gtk2' 'git') +makedepends=('git' 'python' 'gtk2' 'hwloc' 'rrdtool' 'hdf5') provides=("slurm-llnl=${pkgver}") conflicts=('slurm-llnl') -backup=('etc/default/slurm-llnl') -install="${pkgname}.install" -source=("slurm-tmpfiles.conf" - "slurm-llnl-default-conf" - "slurmctld.service" - "slurmd.service" - "slurmdbd.service" +backup=('etc/sysconfig/slurmd' 'etc/sysconfig/slurmctld' 'etc/sysconfig/slurmdbd') +source=("slurm-llnl.sysusers" + "slurm-llnl.tmpfiles" "${pkgname}"::"git+https://github.com/SchedMD/slurm.git") -sha512sums=('61f07699353d607ec43bab2a4fe29b4a380dab10108619e67ca2737193ab044a6e263179f7def932660acefd34c790c9d2b301cd6a49d92b8b80deeb1c7b8011' - 'f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710' - 'a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5' - 'ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c' - '56459e20d7f2624a8e8dd2982693b257e65df22c3609d991afdc1b2f79adaefc0586a76fd5fdd7dc2bdd39b3af0c91f38ddc4b1139081968903450bc28aca304' +sha512sums=('8373ef791d68a7e0b2114f5ce670da1936bd8d96fd51fa7319d4feb85f16a673f89abcb823a114455d32d8fd9eee3e121c313a0aa986542540f120e6d35686e6' + '4f7d1e36abc2ca5aa38b40403292b68f769238766ecdd44ea5d29f8106bd9b7c3e0d2236208f92e00818e37dd24c9520b6e9fe06e01b6e552ac485a1df682edd' 'SKIP') pkgver() { @@ -69,13 +62,15 @@ build() { autoreconf ./configure \ + --disable-developer \ + --disable-debug \ + --enable-optimizations \ --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc/slurm-llnl \ --localstatedir=/var \ --enable-pam \ --with-proctrack \ - --with-pmix \ --with-hdf5 \ --with-hwloc \ --with-rrdtool \ @@ -93,20 +88,26 @@ package() { # Install slurm's configs and license install -D -m644 etc/slurm.conf.example "${pkgdir}/etc/slurm-llnl/slurm.conf.example" install -D -m644 etc/slurmdbd.conf.example "${pkgdir}/etc/slurm-llnl/slurmdbd.conf.example" + install -D -m644 etc/cgroup.conf.example "${pkgdir}/etc/slurm-llnl/cgroup.conf.example" install -D -m644 LICENSE.OpenSSL "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.OpenSSL" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - install -D -m644 ../slurm-llnl-default-conf "${pkgdir}/etc/default/slurm-llnl" + install -d -m755 "${pkgdir}/etc/sysconfig" + echo '#SLURMD_OPTIONS=""' > "${pkgdir}/etc/sysconfig/slurmd" + echo '#SLURMCTLD_OPTIONS=""' > "${pkgdir}/etc/sysconfig/slurmctld" + echo '#SLURMDBD_OPTIONS=""' > "${pkgdir}/etc/sysconfig/slurmdbd" + chmod 644 "${pkgdir}/etc/sysconfig/"{slurmd,slurmctld,slurmdbd} # Install init related files - install -D -m755 etc/init.d.slurm "${pkgdir}/etc/rc.d/slurm" - install -D -m755 etc/init.d.slurmdbd "${pkgdir}/etc/rc.d/slurmdbd" + install -D -m755 etc/init.d.slurm "${pkgdir}/etc/rc.d/slurm" + install -D -m755 etc/init.d.slurmdbd "${pkgdir}/etc/rc.d/slurmdbd" + install -D -m644 etc/slurmctld.service "${pkgdir}/usr/lib/systemd/system/slurmctld.service" + install -D -m644 etc/slurmd.service "${pkgdir}/usr/lib/systemd/system/slurmd.service" + install -D -m644 etc/slurmdbd.service "${pkgdir}/usr/lib/systemd/system/slurmdbd.service" # Install SystemD related files - install -D -m644 ../slurmctld.service "${pkgdir}/usr/lib/systemd/system/slurmctld.service" - install -D -m644 ../slurmd.service "${pkgdir}/usr/lib/systemd/system/slurmd.service" - install -D -m644 ../slurmdbd.service "${pkgdir}/usr/lib/systemd/system/slurmdbd.service" - install -D -m644 ../slurm-tmpfiles.conf "${pkgdir}/usr/lib/tmpfiles.d/slurm-tmpfiles.conf" + install -D -m644 ../slurm-llnl.sysusers "${pkgdir}/usr/lib/sysusers.d/slurm-llnl.conf" + install -D -m644 ../slurm-llnl.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/slurm-llnl.conf" # Create a log and a lib dir install -d -m755 "${pkgdir}/var/log/slurm-llnl" diff --git a/slurm-llnl-default-conf b/slurm-llnl-default-conf deleted file mode 100644 index 13ade045a3b3..000000000000 --- a/slurm-llnl-default-conf +++ /dev/null @@ -1,16 +0,0 @@ -# Defaults for slurm initscript -# sourced by /lib/systemd/system/slurm*.service -# installed at /etc/default/slurm-llnl by the maintainer scripts -# -# This is a POSIX shell fragment -# -# Additional options that are passed to the slurmctld daemon -#SLURMCTLD_OPTIONS="" - - -# Additional options that are passed to the slurmd daemon -#SLURMD_OPTIONS="" - - -# Additional options that are passed to the slurmdbd daemon -#SLURMDBD_OPTIONS="" diff --git a/slurm-llnl-git.install b/slurm-llnl-git.install deleted file mode 100644 index 98f9615e03eb..000000000000 --- a/slurm-llnl-git.install +++ /dev/null @@ -1,60 +0,0 @@ -post_install() { - if ! id slurm >&/dev/null; then - echo "Adding slurm system group..." - groupadd -g 64030 -r slurm || groupadd -r slurm - - echo "Adding slurm system user..." - useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm -u 64030 slurm || useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm slurm - - echo "Locking Slurm User Account..." - passwd -l slurm &>/dev/null - fi - - # Secure the log dir - if [ -d /var/log/slurm-llnl ]; then - chown -R slurm:slurm /var/log/slurm-llnl - fi - - echo "You have to create a slurm configuration-file in /etc/slurm-llnl/ prior to starting any slurm daemons." -} - -post_upgrade() { - # REMOVE ONEDAY - TODO - if [[ -f /etc/slurm/slurm.conf ]]; then - mv /etc/slurm/* /etc/slurm-llnl/ - rmdir /etc/slurm - echo "Your configuration-files were moved from /etc/slurm to /etc/slurm-llnl !" - fi -} - -pre_remove() { - if which systemctl >& /dev/null; then - echo "Stopping slurm daemons through SystemD..." - systemctl stop slurmd.service - systemctl stop slurmdbd.service - systemctl stop slurmctld.service - - echo "Disabling SystemD related file(s)..." - systemctl disable slurmd.service - systemctl disable slurmdbd.service - systemctl disable slurmctld.service - else - echo "Stopping slurm daemons..." - /etc/rc.d/slurm stop - /etc/rc.d/slurmdbd stop - fi -} - -post_remove() { - # Delete remnant recusivly - rm -rf /var/lib/slurm-llnl - - # Change directories which formerly belonged to slurm to be owned by root - [[ -d /var/spool/slurm ]] && chown -R root:root /var/spool/slurm - # Notify the user of kept dirs - [[ -d /etc/slurm-llnl ]] && echo "Custom configuration-file(s) in /etc/slurm-llnl/ were kept on your system." - [[ -d /var/log/slurm-llnl ]] && chown -R root:root /var/log/slurm-llnl && echo "Logfiles were preserved. They reside under /var/log/slurm-llnl ." - - echo "Removing slurm system user/group..." - userdel slurm -} diff --git a/slurm-llnl.sysusers b/slurm-llnl.sysusers new file mode 100644 index 000000000000..9224c1bb9527 --- /dev/null +++ b/slurm-llnl.sysusers @@ -0,0 +1 @@ +u slurm 64030 "slurm daemon" - - diff --git a/slurm-llnl.tmpfiles b/slurm-llnl.tmpfiles new file mode 100644 index 000000000000..59c26c9f2f11 --- /dev/null +++ b/slurm-llnl.tmpfiles @@ -0,0 +1,3 @@ +d /var/spool/slurmctld 0755 slurm slurm - +d /var/spool/slurmd 0755 root root - +Z /var/log/slurm-llnl - slurm slurm - - diff --git a/slurm-tmpfiles.conf b/slurm-tmpfiles.conf deleted file mode 100644 index 301151bb1bc0..000000000000 --- a/slurm-tmpfiles.conf +++ /dev/null @@ -1,3 +0,0 @@ -d /var/spool/slurm 0755 slurm slurm - -d /var/spool/slurm/slurmctld 0755 slurm slurm - -d /var/spool/slurm/slurmd 0755 root root - diff --git a/slurmctld.service b/slurmctld.service deleted file mode 100644 index a56d39c41b70..000000000000 --- a/slurmctld.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Slurm controller daemon -After=network.target munge.service -Requires=munge.service -ConditionPathExists=/etc/slurm-llnl/slurm.conf - -[Service] -Type=forking -EnvironmentFile=-/etc/default/slurm-llnl -ExecStart=/usr/bin/slurmctld $SLURMCTLD_OPTIONS -ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/run/slurmctld.pid - -[Install] -WantedBy=multi-user.target diff --git a/slurmd.service b/slurmd.service deleted file mode 100644 index 4b43e5fbd52f..000000000000 --- a/slurmd.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Slurm node daemon -After=network.target systemd-tmpfiles-clean.service -Requires=munge.service -ConditionPathExists=/etc/slurm-llnl/slurm.conf - -[Service] -Type=forking -EnvironmentFile=-/etc/default/slurm-llnl -ExecStart=/usr/bin/slurmd $SLURMD_OPTIONS -ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/run/slurmd.pid -KillMode=process -LimitNOFILE=51200 -LimitMEMLOCK=infinity -LimitSTACK=infinity - -[Install] -WantedBy=multi-user.target diff --git a/slurmdbd.service b/slurmdbd.service deleted file mode 100644 index a46e39f89c6a..000000000000 --- a/slurmdbd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Slurm DBD accounting daemon -After=network.target mysqld.service -ConditionPathExists=/etc/slurm-llnl/slurmdbd.conf - -[Service] -Type=forking -EnvironmentFile=-/etc/default/slurm-llnl -ExecStart=/usr/bin/slurmdbd $SLURMDBD_OPTIONS -ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/run/slurmdbd.pid - -[Install] -WantedBy=multi-user.target |