diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
commit | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch) | |
tree | c99a472cce74148d499f42ada873454b0e32a42d /sys-cluster/slurm/files | |
parent | da6a52f691ef980bab92d003d5df8f463c623af8 (diff) |
gentoo resync : 13.03.2018
Diffstat (limited to 'sys-cluster/slurm/files')
-rw-r--r-- | sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch | 34 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.11.4-buffer.patch | 16 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch) | 58 |
3 files changed, 60 insertions, 48 deletions
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch deleted file mode 100644 index f9d22f479f89..000000000000 --- a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch +++ /dev/null @@ -1,34 +0,0 @@ - configure.ac | 2 +- - src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 869a989..2936983 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \ - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - AC_HEADER_STDC -- -+AC_HEADER_MAJOR - - dnl Checks for structures. - dnl -diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c -index 554583c..9be99d8 100644 ---- a/src/plugins/task/cgroup/task_cgroup_devices.c -+++ b/src/plugins/task/cgroup/task_cgroup_devices.c -@@ -42,6 +42,12 @@ - #include <sched.h> - #include <glob.h> - #include <sys/types.h> -+#ifdef MAJOR_IN_MKDEV -+# include <sys/mkdev.h> -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include <sys/sysmacros.h> -+#endif - #include <sys/stat.h> - #include <slurm/slurm.h> - #include <slurm/slurm_errno.h> diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch new file mode 100644 index 000000000000..eec43fb449c0 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch @@ -0,0 +1,16 @@ + src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c +index 51f72df226..3a5ffef60d 100644 +--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c ++++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c +@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap) + if (mem_sort && (numa_available() != -1)) { + struct stat sb; + int buf_len, fd, i, len, rc; +- char buf[8]; ++ char buf[10]; + + if (stat(ZONE_SORT_PATH, &sb) == -1) { + rc = system(MODPROBE_PATH " zonesort_module"); diff --git a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch index 1e4a5b4fae3a..f7e2c5b26739 100644 --- a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch @@ -1,7 +1,13 @@ -diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac ---- slurm-16.05.2.orig/configure.ac 2016-07-07 02:51:37.000000000 +0300 -+++ slurm-16.05.2/configure.ac 2016-07-15 20:02:41.373270765 +0300 -@@ -261,44 +261,6 @@ + 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") @@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac - -AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"]) - - X_AC_DATABASES - dnl Cray ALPS/Basil support depends on mySQL -@@ -503,7 +465,6 @@ + X_AC_CRAY + +@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile @@ -54,16 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile -diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am ---- slurm-16.05.2.orig/src/Makefile.am 2016-07-07 02:51:37.000000000 +0300 -+++ slurm-16.05.2/src/Makefile.am 2016-07-15 20:02:41.373270765 +0300 -@@ -27,8 +27,7 @@ +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 - - if !REAL_BG_L_P_LOADED - SUBDIRS += srun |