upgpkg: slurm-llnl 21.08.0.1-1

Add some optional dependencies to `makedepends`, clean up the user
creation and tidy up the sysconfig.

upgpkg: slurm-llnl-git 21.08.0.1.r33.g30f31a7b6f-1

5 files changed, 24 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcdb4fd0f66f..185cb992ccf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = slurm-llnl-git
 	pkgdesc = Simple Linux Utility for Resource Management (development version)
-	pkgver = 20.11.8.1.r1585.g03aaa5f65c
+	pkgver = 21.08.0.1.r33.g30f31a7b6f
 	pkgrel = 1
 	url = https://www.schedmd.com
 	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
@@ -27,16 +30,16 @@ pkgbase = slurm-llnl-git
 	optdepends = ncurses: adds the smap command
 	optdepends = gtk2: enables the sview command, a simple graphical frontend
 	optdepends = pmix: support Open MPI applications using PMIx
-	provides = slurm-llnl=20.11.8.1.r1585.g03aaa5f65c
+	provides = slurm-llnl=21.08.0.1.r33.g30f31a7b6f
 	conflicts = slurm-llnl
-	backup = etc/default/slurm-llnl
+	backup = etc/sysconfig/slurmd
+	backup = etc/sysconfig/slurmctld,
+	backup = etc/sysconfig/slurmdbd
 	source = slurm-llnl.sysusers
 	source = slurm-llnl.tmpfiles
-	source = slurm-llnl-default-conf
 	source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git
-	sha512sums = 40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab
-	sha512sums = 0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581
-	sha512sums = f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710
+	sha512sums = 8373ef791d68a7e0b2114f5ce670da1936bd8d96fd51fa7319d4feb85f16a673f89abcb823a114455d32d8fd9eee3e121c313a0aa986542540f120e6d35686e6
+	sha512sums = 4f7d1e36abc2ca5aa38b40403292b68f769238766ecdd44ea5d29f8106bd9b7c3e0d2236208f92e00818e37dd24c9520b6e9fe06e01b6e552ac485a1df682edd
 	sha512sums = SKIP
 
 pkgname = slurm-llnl-git
diff --git a/PKGBUILD b/PKGBUILD
index b54649ea324c..9b6d75bf03a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
 
 pkgname=slurm-llnl-git
-pkgver=20.11.8.1.r1585.g03aaa5f65c
+pkgver=21.08.0.1.r33.g30f31a7b6f
 pkgrel=1
 pkgdesc="Simple Linux Utility for Resource Management (development version)"
 arch=('i686' 'x86_64' 'armv7h')
@@ -26,17 +26,15 @@ optdepends=("hwloc: enables the task/cgroup plugin"
 	"ncurses: adds the smap command "
 	"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')
+backup=('etc/sysconfig/slurmd' 'etc/sysconfig/slurmctld', 'etc/sysconfig/slurmdbd')
 source=("slurm-llnl.sysusers"
 	"slurm-llnl.tmpfiles"
-	"slurm-llnl-default-conf"
 	"${pkgname}"::"git+https://github.com/SchedMD/slurm.git")
-sha512sums=('40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab'
-            '0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581'
-            'f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710'
+sha512sums=('8373ef791d68a7e0b2114f5ce670da1936bd8d96fd51fa7319d4feb85f16a673f89abcb823a114455d32d8fd9eee3e121c313a0aa986542540f120e6d35686e6'
+            '4f7d1e36abc2ca5aa38b40403292b68f769238766ecdd44ea5d29f8106bd9b7c3e0d2236208f92e00818e37dd24c9520b6e9fe06e01b6e552ac485a1df682edd'
             'SKIP')
 
 pkgver() {
@@ -73,7 +71,6 @@ build() {
 		--localstatedir=/var \
 		--enable-pam \
 		--with-proctrack \
-		--with-pmix=/usr \
 		--with-hdf5 \
 		--with-hwloc \
 		--with-rrdtool \
@@ -94,7 +91,11 @@ package() {
 	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"
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.sysusers b/slurm-llnl.sysusers
index c27f642c3445..9224c1bb9527 100644
--- a/slurm-llnl.sysusers
+++ b/slurm-llnl.sysusers
@@ -1 +1 @@
-u slurm 64030 "slurm daemon" /var/log/slurm-llnl /bin/nologin
+u slurm 64030 "slurm daemon" - -
diff --git a/slurm-llnl.tmpfiles b/slurm-llnl.tmpfiles
index d44008d23639..59c26c9f2f11 100644
--- a/slurm-llnl.tmpfiles
+++ b/slurm-llnl.tmpfiles
@@ -1,4 +1,3 @@
-d /var/spool/slurm 0755 slurm slurm -
-d /var/spool/slurm/slurmctld 0755 slurm slurm -
-d /var/spool/slurm/slurmd 0755 root root -
+d /var/spool/slurmctld 0755 slurm slurm -
+d /var/spool/slurmd 0755 root root -
 Z /var/log/slurm-llnl - slurm slurm - -