diff options
| author | Gordian Edenhofer | 2021-02-19 09:50:11 +0100 |
|---|---|---|
| committer | Gordian Edenhofer | 2021-02-19 09:50:11 +0100 |
| commit | 703d808626a10c0875828bc0c14fc04624d03179 (patch) | |
| tree | ebc30e8f1eecd679cf9adf336cebe089b1f5b1ff | |
| parent | 944eace2f680822f396971197f38b189ca0e51e7 (diff) | |
| download | aur-703d808626a10c0875828bc0c14fc04624d03179.tar.gz | |
upgpkg: slurm-llnl-git 20.11.4.1.r451.gf9ee4b9190-1
Replace systemd service files with native upstream ones.
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | slurmctld.service | 15 | ||||
| -rw-r--r-- | slurmd.service | 19 | ||||
| -rw-r--r-- | slurmdbd.service | 14 |
5 files changed, 8 insertions, 68 deletions
@@ -1,6 +1,6 @@ pkgbase = slurm-llnl-git pkgdesc = Simple Linux Utility for Resource Management (development version) - pkgver = 20.11.3.1.r347.g7ccf501a81 + pkgver = 20.11.4.1.r451.gf9ee4b9190 pkgrel = 1 url = https://www.schedmd.com arch = i686 @@ -27,22 +27,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.3.1.r347.g7ccf501a81 + provides = slurm-llnl=20.11.4.1.r451.gf9ee4b9190 conflicts = slurm-llnl backup = etc/default/slurm-llnl source = slurm-llnl.sysusers source = slurm-llnl.tmpfiles source = slurm-llnl-default-conf - source = slurmctld.service - source = slurmd.service - source = slurmdbd.service source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git sha512sums = 40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab sha512sums = 0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581 sha512sums = f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710 - sha512sums = a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5 - sha512sums = ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c - sha512sums = 56459e20d7f2624a8e8dd2982693b257e65df22c3609d991afdc1b2f79adaefc0586a76fd5fdd7dc2bdd39b3af0c91f38ddc4b1139081968903450bc28aca304 sha512sums = SKIP pkgname = slurm-llnl-git @@ -3,7 +3,7 @@ # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch> pkgname=slurm-llnl-git -pkgver=20.11.3.1.r347.g7ccf501a81 +pkgver=20.11.4.1.r451.gf9ee4b9190 pkgrel=1 pkgdesc="Simple Linux Utility for Resource Management (development version)" arch=('i686' 'x86_64' 'armv7h') @@ -33,16 +33,10 @@ backup=('etc/default/slurm-llnl') source=("slurm-llnl.sysusers" "slurm-llnl.tmpfiles" "slurm-llnl-default-conf" - "slurmctld.service" - "slurmd.service" - "slurmdbd.service" "${pkgname}"::"git+https://github.com/SchedMD/slurm.git") sha512sums=('40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab' '0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581' 'f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710' - 'a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5' - 'ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c' - '56459e20d7f2624a8e8dd2982693b257e65df22c3609d991afdc1b2f79adaefc0586a76fd5fdd7dc2bdd39b3af0c91f38ddc4b1139081968903450bc28aca304' 'SKIP') pkgver() { @@ -103,13 +97,13 @@ package() { install -D -m644 ../slurm-llnl-default-conf "${pkgdir}/etc/default/slurm-llnl" # 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-llnl.sysusers "${pkgdir}/usr/lib/sysusers.d/slurm-llnl.conf" install -D -m644 ../slurm-llnl.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/slurm-llnl.conf" 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 |