diff options
Diffstat (limited to 'sysutils/slurm-wlm/files')
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-etc_slurm.conf.example | 6 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_common_half__duplex.c | 14 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_common_read__config.h | 26 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h | 4 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_common_track__script.c | 10 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c (renamed from sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c) | 8 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c | 8 |
7 files changed, 55 insertions, 21 deletions
diff --git a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example b/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example index 136ff0f6f2f7..3ae74874bf7b 100644 --- a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example +++ b/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example @@ -1,4 +1,4 @@ ---- etc/slurm.conf.example.orig 2018-10-26 20:10:17 UTC +--- etc/slurm.conf.example.orig 2019-07-11 00:40:34 UTC +++ etc/slurm.conf.example @@ -8,8 +8,8 @@ # @@ -52,10 +52,10 @@ # LOGGING SlurmctldDebug=3 -SlurmctldLogFile=/var/log/slurmctld.log -+SlurmctldLogFile=/var/log/slurm/slurmctld.log ++SlurmctldLogFile=/var/log/slurm/slurmctld SlurmdDebug=3 -SlurmdLogFile=/var/log/slurmd.log -+SlurmdLogFile=/var/log/slurm/slurm_accounting.log ++SlurmdLogFile=/var/log/slurm/slurmd JobCompType=jobcomp/none #JobCompLoc= # diff --git a/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c b/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c new file mode 100644 index 000000000000..841d510264a7 --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c @@ -0,0 +1,14 @@ +--- src/common/half_duplex.c.orig 2019-06-09 17:09:36 UTC ++++ src/common/half_duplex.c +@@ -35,6 +35,11 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + \*****************************************************************************/ + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/socket.h> ++#endif ++ + #include "src/common/eio.h" + #include "src/common/half_duplex.h" + #include "src/common/list.h" diff --git a/sysutils/slurm-wlm/files/patch-src_common_read__config.h b/sysutils/slurm-wlm/files/patch-src_common_read__config.h index d9091ff770ab..1f701c5e8444 100644 --- a/sysutils/slurm-wlm/files/patch-src_common_read__config.h +++ b/sysutils/slurm-wlm/files/patch-src_common_read__config.h @@ -1,14 +1,24 @@ ---- src/common/read_config.h.orig 2018-10-23 14:45:36 UTC +--- src/common/read_config.h.orig 2019-05-28 17:23:14 UTC +++ src/common/read_config.h -@@ -140,8 +140,10 @@ extern uint16_t drop_priv_flag; +@@ -113,7 +113,7 @@ extern uint16_t drop_priv_flag; + #define DEFAULT_KILL_TREE 0 + #define DEFAULT_KILL_WAIT 30 + #define DEFAULT_LAUNCH_TYPE "launch/slurm" +-#define DEFAULT_MAIL_PROG "/bin/mail" ++#define DEFAULT_MAIL_PROG "/usr/bin/mail" + #define DEFAULT_MAIL_PROG_ALT "/usr/bin/mail" + #define DEFAULT_MAX_ARRAY_SIZE 1001 + #define DEFAULT_MAX_JOB_COUNT 10000 +@@ -129,7 +129,11 @@ extern uint16_t drop_priv_flag; + #define DEFAULT_MSG_TIMEOUT 10 + #define DEFAULT_POWER_PLUGIN "" #define DEFAULT_CHECKPOINT_TYPE "checkpoint/none" - #if defined HAVE_REAL_CRAY/* ALPS requires cluster-unique job container IDs */ - # define DEFAULT_PROCTRACK_TYPE "proctrack/sgi_job" --#else -+#elif defined __linux__ - # define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" +-#define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" ++#if defined __linux__ ++# define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" +#else +# define DEFAULT_PROCTRACK_TYPE "proctrack/pgid" - #endif ++#endif #define DEFAULT_PREEMPT_TYPE "preempt/none" #define DEFAULT_PRIORITY_DECAY 604800 /* 7 days */ + #define DEFAULT_PRIORITY_CALC_PERIOD 300 /* in seconds */ diff --git a/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h b/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h index 68a24595579c..d298eab351d8 100644 --- a/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h +++ b/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h @@ -1,6 +1,6 @@ ---- src/common/slurm_xlator.h.orig 2019-04-12 04:20:25 UTC +--- src/common/slurm_xlator.h.orig 2019-05-28 17:23:14 UTC +++ src/common/slurm_xlator.h -@@ -299,7 +299,9 @@ +@@ -300,7 +300,9 @@ * The header file used only for #define values. */ /* strlcpy.[ch] functions */ diff --git a/sysutils/slurm-wlm/files/patch-src_common_track__script.c b/sysutils/slurm-wlm/files/patch-src_common_track__script.c new file mode 100644 index 000000000000..f6d2e4dffcbb --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_common_track__script.c @@ -0,0 +1,10 @@ +--- src/common/track_script.c.orig 2019-06-10 01:59:00 UTC ++++ src/common/track_script.c +@@ -36,6 +36,7 @@ + + #include <signal.h> + #include <sys/time.h> ++#include <sys/wait.h> + + #include "src/common/macros.h" + #include "src/common/xmalloc.h" diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c b/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c index 922d378f72d4..5ceed7965cc0 100644 --- a/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c +++ b/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c @@ -1,10 +1,10 @@ ---- src/plugins/switch/cray/switch_cray.c.orig 2019-04-12 04:20:25 UTC -+++ src/plugins/switch/cray/switch_cray.c +--- src/plugins/switch/cray_aries/switch_cray_aries.c.orig 2019-05-30 01:52:34 UTC ++++ src/plugins/switch/cray_aries/switch_cray_aries.c @@ -35,7 +35,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \*****************************************************************************/ --#if !(defined(__FreeBSD__) || defined(__NetBSD__)) +-#if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)) #include "config.h" #define _GNU_SOURCE @@ -18,7 +18,7 @@ #include <math.h> #include <sched.h> #include <signal.h> -@@ -1056,4 +1057,3 @@ extern int switch_p_job_step_post_resume(stepd_step_re +@@ -1078,4 +1079,3 @@ extern int switch_p_job_step_post_resume(stepd_step_re #endif return SLURM_SUCCESS; } diff --git a/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c b/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c index 157083a64239..644e85d0ad67 100644 --- a/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c +++ b/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c @@ -1,8 +1,8 @@ ---- src/srun/libsrun/srun_job.c.orig 2018-10-24 20:21:46 UTC +--- src/srun/libsrun/srun_job.c.orig 2019-05-28 17:23:14 UTC +++ src/srun/libsrun/srun_job.c -@@ -113,6 +113,11 @@ static int shepherd_fd = -1; - static pthread_t signal_thread = (pthread_t) 0; - static int pty_sigarray[] = { SIGWINCH, 0 }; +@@ -117,6 +117,11 @@ static int pty_sigarray[] = { SIGWINCH, 0 }; + + extern char **environ; +#ifdef __FreeBSD__ +#define __environ environ |