commit: f2964e62173039c410e1d138960cb5892e5c667b
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 8 07:54:03 2024 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 13:37:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2964e62
sys-cluster/slurm: add slurm-22.05.11 to collaborate with Debian.
Manage /var/tmp and /run directories with tmpfiles.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sys-cluster/slurm/Manifest | 1 +
.../slurm/files/slurm-22.05.3_autoconf-lua.patch | 49 ++++++++++++++++++++++
sys-cluster/slurm/files/slurm.tmpfiles | 2 +
...{slurm-24.05.3.ebuild => slurm-22.05.11.ebuild} | 11 ++---
sys-cluster/slurm/slurm-24.05.3.ebuild | 8 ++--
5 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 6e8549336d1c..2c1368c808e0 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1 +1,2 @@
+DIST slurm-22.05.11.tar.bz2 7151614 BLAKE2B
f79406d50c74ecea9d612d2fad2b61cf8d87bf835d1f5d0482e9aa31e515ee7b017780bd4661af5d432e70805d1b069918f5924ff5a3d38dcc5b1f38d639a3b2
SHA512
ebe82f6ad6dec45ba611a294d1d19e8ad7853322190bf4be1f8175cd89e35120b26c349d45a1048aca802e96795a61d9ab432a9b4106c757835b7044bcbe459b
DIST slurm-24.05.3.tar.bz2 7189600 BLAKE2B
4da4c49a7db334494ea03529f45016741e93603680f592d0baf34657e12079f3766e32f67725d16c17336b28206cf920ae2314c9b7076bda22ee1cb239932229
SHA512
fa903aea77b667911d90e9bd7aec3a21b43d4f642e2fdf3f6eb309fd6c8ca0892fba36f371f67e944a4198248ff44d5b6ac6c0edd03cfd4f3e1828b03c12a539
diff --git a/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
new file mode 100644
index 000000000000..f5723f7b85bc
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
@@ -0,0 +1,49 @@
+diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
+index 6941281bd5..206498191f 100644
+--- a/auxdir/x_ac_lua.m4
++++ b/auxdir/x_ac_lua.m4
+@@ -12,20 +12,21 @@
+
+ AC_DEFUN([X_AC_LUA],
+ [
+- x_ac_lua_pkg_name="lua"
+- #check for 5.4, 5.3, 5.2 and then 5.1
+- PKG_CHECK_EXISTS([lua5.4], [x_ac_lua_pkg_name=lua5.4],
+- [PKG_CHECK_EXISTS([lua-5.4], [x_ac_lua_pkg_name=lua-5.4],
+- [PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
+- [PKG_CHECK_EXISTS([lua-5.3], [x_ac_lua_pkg_name=lua-5.3],
+- [PKG_CHECK_EXISTS([lua5.2], [x_ac_lua_pkg_name=lua5.2],
+- [PKG_CHECK_EXISTS([lua-5.2], [x_ac_lua_pkg_name=lua-5.2],
+- [PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1],
+- [PKG_CHECK_EXISTS([lua-5.1], [x_ac_lua_pkg_name=lua-5.1],
+- [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])])])
+- PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
+- [x_ac_have_lua="yes"],
+- [x_ac_have_lua="no"])
++ AC_MSG_CHECKING([whether to enable support for job scripts written in
Lua])
++ AC_ARG_ENABLE(
++ [lua],
++ AS_HELP_STRING(--enable-lua, enable support for job scripts
written in Lua),
++ [x_ac_enable_lua="$enableval"],
++ [x_ac_enable_lua=yes])
++ AC_MSG_RESULT([$x_ac_enable_lua])
++
++ x_ac_have_lua=no
++ if test "x$x_ac_enable_lua" = "xyes"; then
++ x_ac_lua_pkg_name="lua"
++ PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
++ [x_ac_have_lua="yes"],
++ [AC_MSG_ERROR([Lua support requested but Lua not
found])])
++ fi
+
+ if test "x$x_ac_have_lua" = "xyes"; then
+ saved_CFLAGS="$CFLAGS"
+@@ -60,8 +61,6 @@ AC_DEFUN([X_AC_LUA],
+ fi
+ CFLAGS="$saved_CFLAGS"
+ LIBS="$saved_LIBS"
+- else
+- AC_MSG_WARN([unable to locate lua package])
+ fi
+
+ AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
diff --git a/sys-cluster/slurm/files/slurm.tmpfiles
b/sys-cluster/slurm/files/slurm.tmpfiles
index c77457db5576..e8f5fa4103a9 100644
--- a/sys-cluster/slurm/files/slurm.tmpfiles
+++ b/sys-cluster/slurm/files/slurm.tmpfiles
@@ -1 +1,3 @@
d /run/slurm 755 slurm slurm -
+d /var/tmp/slurm/slurmd 755 slurm slurm -
+d /var/tmp/slurm 755 slurm slurm -
diff --git a/sys-cluster/slurm/slurm-24.05.3.ebuild
b/sys-cluster/slurm/slurm-22.05.11.ebuild
similarity index 98%
copy from sys-cluster/slurm/slurm-24.05.3.ebuild
copy to sys-cluster/slurm/slurm-22.05.11.ebuild
index 1078be9a6b38..48a6b283d77a 100644
--- a/sys-cluster/slurm/slurm-24.05.3.ebuild
+++ b/sys-cluster/slurm/slurm-22.05.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -82,6 +82,10 @@ LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-22.05.3_autoconf-lua.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
}
@@ -136,7 +140,7 @@ src_configure() {
use mysql || myconf+=( --without-mysql_config )
econf "${myconf[@]}" \
$(use_enable debug) \
- $(use_with lua) \
+ $(use_enable lua) \
$(use_enable pam) \
$(use_enable X x11) \
$(use_with munge) \
@@ -233,9 +237,6 @@ src_install() {
/var/spool/${PN}/slurmd
/var/spool/${PN}
/var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
)
local folder_path
for folder_path in ${paths[@]}; do
diff --git a/sys-cluster/slurm/slurm-24.05.3.ebuild
b/sys-cluster/slurm/slurm-24.05.3.ebuild
index 1078be9a6b38..1f7beec432cf 100644
--- a/sys-cluster/slurm/slurm-24.05.3.ebuild
+++ b/sys-cluster/slurm/slurm-24.05.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -222,7 +222,8 @@ src_install() {
newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
bashcomp_alias scontrol \
sreport sacctmgr squeue scancel sshare sbcast sinfo \
- sprio sacct salloc sbatch srun sattach sdiag sstat
+ sprio sacct salloc sbatch srun sattach sdiag sstat \
+ scrontab slurmrestd strigger
# install systemd files
newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
systemd_dounit etc/slurmd.service etc/slurmctld.service
etc/slurmdbd.service
@@ -233,9 +234,6 @@ src_install() {
/var/spool/${PN}/slurmd
/var/spool/${PN}
/var/log/${PN}
- /var/tmp/${PN}/${PN}d
- /var/tmp/${PN}
- /run/${PN}
)
local folder_path
for folder_path in ${paths[@]}; do
