* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/
@ 2019-12-04 15:39 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-12-04 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 3b94b4905c9101a723c6fc1013047d2dd03acd98
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 4 07:05:16 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 15:38:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b94b490
sys-cluster/slurm: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13864
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../slurm/files/slurm-18.08.7-disable-sview.patch | 99 ----------------------
1 file changed, 99 deletions(-)
diff --git a/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch
deleted file mode 100644
index f7e2c5b2673..00000000000
--- a/sys-cluster/slurm/files/slurm-18.08.7-disable-sview.patch
+++ /dev/null
@@ -1,99 +0,0 @@
- configure.ac | 39 ---------------------------------------
- doc/man/man1/Makefile.am | 8 --------
- src/Makefile.am | 3 +--
- 3 files changed, 1 insertion(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f177ec..ff4d69b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
-
--#
--# Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
--fi
--
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
-- AC_MSG_WARN([cannot build sview without gtk library]);
--fi
--
--AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
--
- dnl Cray ALPS/Basil support depends on mySQL
- X_AC_CRAY
-
-@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
- src/sshare/Makefile
- src/sstat/Makefile
- src/strigger/Makefile
-- src/sview/Makefile
- src/plugins/Makefile
- src/plugins/accounting_storage/Makefile
- src/plugins/accounting_storage/common/Makefile
-diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
-index 246f16d..ba39af2 100644
---- a/doc/man/man1/Makefile.am
-+++ b/doc/man/man1/Makefile.am
-@@ -29,10 +29,6 @@ if WITH_BLCR
- man1_MANS += srun_cr.1
- endif
-
--if BUILD_SVIEW
--man1_MANS += sview.1
--endif
--
- EXTRA_DIST = $(man1_MANS)
-
- if HAVE_MAN2HTML
-@@ -65,10 +61,6 @@ if WITH_BLCR
- html_DATA += srun_cr.html
- endif
-
--if BUILD_SVIEW
--html_DATA += sview.html
--endif
--
- MOSTLYCLEANFILES = ${html_DATA}
-
- EXTRA_DIST += $(html_DATA)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcd5aa7..a8cbf17 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,5 +28,4 @@ SUBDIRS = \
- srun_cr \
- sshare \
- sstat \
-- strigger \
-- sview
-+ strigger
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/
@ 2020-07-01 19:59 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-07-01 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 81aac4f7a57ae1e5262a272403b47af1c611986e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jul 1 17:18:57 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jul 1 19:57:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81aac4f7
sys-cluster/slurm: remove unused patch
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16536
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sys-cluster/slurm/files/disable-sview.patch | 76 -----------------------------
1 file changed, 76 deletions(-)
diff --git a/sys-cluster/slurm/files/disable-sview.patch b/sys-cluster/slurm/files/disable-sview.patch
deleted file mode 100644
index f409765a847..00000000000
--- a/sys-cluster/slurm/files/disable-sview.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/configure.ac 2019-08-13 20:40:08.000000000 +0200
-+++ b/configure.ac 2019-08-22 12:02:02.127865098 +0200
-@@ -229,42 +229,6 @@
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
-
--#
--# Tests for GTK+
--#
--
--# use the correct libs if running on 64bit
--if test -d "/usr/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--if test -d "/opt/gnome/lib64/pkgconfig"; then
-- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH"
--fi
--
--AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
--
--if test ${glib_config_minor_version=0} -ge 32 ; then
-- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
--fi
--
--AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread])
--if test ${gtk_config_minor_version=0} -ge 10 ; then
-- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 12 ; then
-- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher])
--fi
--
--if test ${gtk_config_minor_version=0} -ge 14 ; then
-- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
--fi
--
--if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then
-- AC_MSG_WARN([cannot build sview without gtk library]);
--fi
--
- AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
-
- X_AC_CRAY
-@@ -447,7 +411,6 @@
- src/sshare/Makefile
- src/sstat/Makefile
- src/strigger/Makefile
-- src/sview/Makefile
- src/plugins/Makefile
- src/plugins/accounting_storage/Makefile
- src/plugins/accounting_storage/common/Makefile
-diff -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am
---- slurm-19.05.2.orig/src/Makefile.am 2019-08-13 20:40:08.000000000 +0200
-+++ slurm-19.05.2/src/Makefile.am 2019-08-22 12:02:02.127865098 +0200
-@@ -25,5 +25,4 @@
- srun \
- sshare \
- sstat \
-- strigger \
-- sview
-+ strigger
-diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in
---- slurm-19.05.2.orig/src/Makefile.in 2019-08-13 20:40:08.000000000 +0200
-+++ slurm-19.05.2/src/Makefile.in 2019-08-22 12:02:02.127865098 +0200
-@@ -495,8 +495,7 @@
- srun \
- sshare \
- sstat \
-- strigger \
-- sview
-+ strigger
-
- all: all-recursive
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/
@ 2024-10-18 13:47 Benda XU
0 siblings, 0 replies; 3+ messages in thread
From: Benda XU @ 2024-10-18 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 2f398e18bc708f4b03b3616b1d85262a06ce1018
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 02:13:58 2024 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 13:38:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f398e18
sys-cluster/slurm: drop bashism in the initd script.
Remove duplicated directories.
Suggested-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sys-cluster/slurm/files/slurmd.initd | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
index dd9797c0c7d2..c912468e8152 100644
--- a/sys-cluster/slurm/files/slurmd.initd
+++ b/sys-cluster/slurm/files/slurmd.initd
@@ -37,16 +37,14 @@ checkconfig() {
fi
# Make sure folders exists
. /etc/slurm/slurm.conf
- folders=(
- ${SlurmdSpoolDir}
- $(dirname ${SlurmctldLogFile})
- $(dirname ${SlurmctldPidFile})
- $(dirname ${SlurmdLogFile})
- $(dirname ${SlurmdPidFile})
- ${SlurmdSpoolDir}
+
+ for folder in ${SlurmdSpoolDir} \
+ $(dirname ${SlurmctldLogFile}) \
+ $(dirname ${SlurmctldPidFile}) \
+ $(dirname ${SlurmdLogFile}) \
+ $(dirname ${SlurmdPidFile}) \
${StateSaveLocation}
- )
- for folder in ${folders[@]}; do
+ do
create_folder_and_set_permission "${folder}"
done
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-18 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-04 15:39 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2020-07-01 19:59 Aaron Bauman
2024-10-18 13:47 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox