View | Details | Raw Unified | Return to bug 207967 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	slurm
4
PORTNAME=	slurm
5
PORTVERSION=	14.11.9
5
PORTVERSION=	15.08.8
6
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
7
MASTER_SITES=	http://www.schedmd.com/download/latest/ \
7
MASTER_SITES=	http://www.schedmd.com/download/latest/ \
8
		http://www.schedmd.com/download/archive/ \
8
		http://www.schedmd.com/download/archive/ \
Lines 40-50 Link Here
40
40
41
GTK2_DESC=	Build GUI config tool sview
41
GTK2_DESC=	Build GUI config tool sview
42
42
43
# SLURM's configure enables interactive jobs if pty.h exists.  Replacing
44
# #include <pty.h> with appropriate headers will therefore not work, so instead
45
# add a pty.h for the build.
46
post-patch:
43
post-patch:
47
	${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
48
	${REINPLACE_CMD} \
44
	${REINPLACE_CMD} \
49
		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
45
		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
50
		${WRKSRC}/doc/html/shtml2html.py \
46
		${WRKSRC}/doc/html/shtml2html.py \
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (slurm-14.11.9.tar.bz2) = a39c74964b5ce3c20f79fd858561d724b09cbcf1b3406cf5c2aba9d087307dd2
1
SHA256 (slurm-15.08.8.tar.bz2) = 9381db4eb452ce1bb660f46dfcbe61975aaf31dde05847afd8fb05c089d1449f
2
SIZE (slurm-14.11.9.tar.bz2) = 6364170
2
SIZE (slurm-15.08.8.tar.bz2) = 6775616
(-)files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c (-11 lines)
Lines 1-11 Link Here
1
--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig	2015-04-23 22:50:47 UTC
2
+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
3
@@ -57,6 +57,8 @@
4
 
5
 #include "src/slurmd/slurmd/slurmd.h"
6
 
7
+#include <limits.h>
8
+
9
 
10
 /***************************************************************/
11
 
(-)files/pty.h (-4 lines)
Lines 1-4 Link Here
1
#include <sys/types.h>
2
#include <sys/ioctl.h>
3
#include <termios.h>
4
#include <libutil.h>
(-)files/slurm.conf.example (-2 / +11 lines)
Lines 6-11 Link Here
6
# See the slurm.conf man page for more information.
6
# See the slurm.conf man page for more information.
7
#
7
#
8
8
9
# NOTE: The parent directories for Slurm's log files, process ID
10
# files, state save directories, etc. are not created by Slurm. They
11
# must be created and made writable by the slurm user as needed prior to
12
# starting Slurm daemons.
13
#
14
# If you keep the configuration directives below, you should create
15
# the directories /var/log/slurm/, /var/run/slurm/, and
16
# /var/spool/slurmd and make them owned and writable by the slurm user. 
17
9
AuthType=auth/munge
18
AuthType=auth/munge
10
#BackupAddr=
19
#BackupAddr=
11
#BackupController=
20
#BackupController=
Lines 75-83 Link Here
75
#JobCompLoc=
84
#JobCompLoc=
76
JobCompType=jobcomp/none
85
JobCompType=jobcomp/none
77
SlurmctldDebug=3
86
SlurmctldDebug=3
78
SlurmctldLogFile=/var/log/slurmctld.log
87
SlurmctldLogFile=/var/log/slurm/slurmctld.log
79
SlurmdDebug=3
88
SlurmdDebug=3
80
SlurmdLogFile=/var/log/slurmd.log
89
SlurmdLogFile=/var/log/slurm/slurmd.log
81
90
82
# ACCOUNTING
91
# ACCOUNTING
83
#AccountingStorageHost=
92
#AccountingStorageHost=
(-)pkg-descr (-1 / +1 lines)
Lines 1-4 Link Here
1
Slurm is an open-source workload manager designed for *nux clusters of all
1
Slurm is an open-source workload manager designed for *nix clusters of all
2
sizes. It provides three key functions. First it allocates exclusive and/or
2
sizes. It provides three key functions. First it allocates exclusive and/or
3
non-exclusive access to resources (computer nodes) to users for some duration of
3
non-exclusive access to resources (computer nodes) to users for some duration of
4
time so they can perform work. Second, it provides a framework for starting,
4
time so they can perform work. Second, it provides a framework for starting,
(-)pkg-plist (-7 / +28 lines)
Lines 31-42 Link Here
31
lib/libpmi.so.0.0.0
31
lib/libpmi.so.0.0.0
32
lib/libslurm.a
32
lib/libslurm.a
33
lib/libslurm.so
33
lib/libslurm.so
34
lib/libslurm.so.28
34
lib/libslurm.so.29
35
lib/libslurm.so.28.0.0
35
lib/libslurm.so.29.0.0
36
lib/libslurmdb.a
36
lib/libslurmdb.a
37
lib/libslurmdb.so
37
lib/libslurmdb.so
38
lib/libslurmdb.so.28
38
lib/libslurmdb.so.29
39
lib/libslurmdb.so.28.0.0
39
lib/libslurmdb.so.29.0.0
40
lib/slurm/accounting_storage_filetxt.a
40
lib/slurm/accounting_storage_filetxt.a
41
lib/slurm/accounting_storage_filetxt.so
41
lib/slurm/accounting_storage_filetxt.so
42
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
42
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
Lines 45-50 Link Here
45
lib/slurm/accounting_storage_none.so
45
lib/slurm/accounting_storage_none.so
46
lib/slurm/accounting_storage_slurmdbd.a
46
lib/slurm/accounting_storage_slurmdbd.a
47
lib/slurm/accounting_storage_slurmdbd.so
47
lib/slurm/accounting_storage_slurmdbd.so
48
lib/slurm/acct_gather_energy_cray.a
49
lib/slurm/acct_gather_energy_cray.so
50
lib/slurm/acct_gather_energy_ibmaem.a
51
lib/slurm/acct_gather_energy_ibmaem.so
48
lib/slurm/acct_gather_energy_none.a
52
lib/slurm/acct_gather_energy_none.a
49
lib/slurm/acct_gather_energy_none.so
53
lib/slurm/acct_gather_energy_none.so
50
lib/slurm/acct_gather_energy_rapl.a
54
lib/slurm/acct_gather_energy_rapl.a
Lines 63-68 Link Here
63
lib/slurm/auth_munge.so
67
lib/slurm/auth_munge.so
64
lib/slurm/auth_none.a
68
lib/slurm/auth_none.a
65
lib/slurm/auth_none.so
69
lib/slurm/auth_none.so
70
lib/slurm/burst_buffer_generic.a
71
lib/slurm/burst_buffer_generic.so
66
lib/slurm/checkpoint_none.a
72
lib/slurm/checkpoint_none.a
67
lib/slurm/checkpoint_none.so
73
lib/slurm/checkpoint_none.so
68
lib/slurm/checkpoint_ompi.a
74
lib/slurm/checkpoint_ompi.a
Lines 125-130 Link Here
125
lib/slurm/jobcomp_script.so
131
lib/slurm/jobcomp_script.so
126
lib/slurm/launch_slurm.a
132
lib/slurm/launch_slurm.a
127
lib/slurm/launch_slurm.so
133
lib/slurm/launch_slurm.so
134
lib/slurm/layouts_power_cpufreq.a
135
lib/slurm/layouts_power_cpufreq.so
136
lib/slurm/layouts_power_default.a
137
lib/slurm/layouts_power_default.so
138
lib/slurm/layouts_unit_default.a
139
lib/slurm/layouts_unit_default.so
128
lib/slurm/mpi_lam.a
140
lib/slurm/mpi_lam.a
129
lib/slurm/mpi_lam.so
141
lib/slurm/mpi_lam.so
130
lib/slurm/mpi_mpich1_p4.a
142
lib/slurm/mpi_mpich1_p4.a
Lines 143-148 Link Here
143
lib/slurm/mpi_openmpi.so
155
lib/slurm/mpi_openmpi.so
144
lib/slurm/mpi_pmi2.a
156
lib/slurm/mpi_pmi2.a
145
lib/slurm/mpi_pmi2.so
157
lib/slurm/mpi_pmi2.so
158
lib/slurm/power_none.a
159
lib/slurm/power_none.so
146
lib/slurm/preempt_job_prio.a
160
lib/slurm/preempt_job_prio.a
147
lib/slurm/preempt_job_prio.so
161
lib/slurm/preempt_job_prio.so
148
lib/slurm/preempt_none.a
162
lib/slurm/preempt_none.a
Lines 205-210 Link Here
205
lib/slurm/task_none.so
219
lib/slurm/task_none.so
206
lib/slurm/topology_3d_torus.a
220
lib/slurm/topology_3d_torus.a
207
lib/slurm/topology_3d_torus.so
221
lib/slurm/topology_3d_torus.so
222
lib/slurm/topology_hypercube.a
223
lib/slurm/topology_hypercube.so
208
lib/slurm/topology_node_rank.a
224
lib/slurm/topology_node_rank.a
209
lib/slurm/topology_node_rank.so
225
lib/slurm/topology_node_rank.so
210
lib/slurm/topology_none.a
226
lib/slurm/topology_none.a
Lines 298-303 Link Here
298
man/man3/slurm_job_step_layout_free.3.gz
314
man/man3/slurm_job_step_layout_free.3.gz
299
man/man3/slurm_job_step_layout_get.3.gz
315
man/man3/slurm_job_step_layout_get.3.gz
300
man/man3/slurm_job_will_run.3.gz
316
man/man3/slurm_job_will_run.3.gz
317
man/man3/slurm_job_will_run2.3.gz
301
man/man3/slurm_jobinfo_ctx_get.3.gz
318
man/man3/slurm_jobinfo_ctx_get.3.gz
302
man/man3/slurm_kill_job.3.gz
319
man/man3/slurm_kill_job.3.gz
303
man/man3/slurm_kill_job_step.3.gz
320
man/man3/slurm_kill_job_step.3.gz
Lines 374-379 Link Here
374
man/man3/slurm_update_step.3.gz
391
man/man3/slurm_update_step.3.gz
375
man/man5/acct_gather.conf.5.gz
392
man/man5/acct_gather.conf.5.gz
376
man/man5/bluegene.conf.5.gz
393
man/man5/bluegene.conf.5.gz
394
man/man5/burst_buffer.conf.5.gz
377
man/man5/cgroup.conf.5.gz
395
man/man5/cgroup.conf.5.gz
378
man/man5/cray.conf.5.gz
396
man/man5/cray.conf.5.gz
379
man/man5/ext_sensors.conf.5.gz
397
man/man5/ext_sensors.conf.5.gz
Lines 403-411 Link Here
403
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
421
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
404
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
422
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
405
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
423
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
424
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html
406
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
425
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
407
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
426
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
408
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg
427
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg
428
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html
409
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
429
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
410
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
430
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
411
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
431
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
Lines 425-431 Link Here
425
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
445
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
426
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
446
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
427
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
447
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
428
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dynalloc.html
429
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
448
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
430
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
449
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
431
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
450
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
Lines 455-461 Link Here
455
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
474
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
456
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
475
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
457
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
476
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
458
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/lll.gif
459
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
477
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
460
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
478
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
461
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
479
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
Lines 477-487 Link Here
477
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
495
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
478
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
496
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
479
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
497
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
498
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html
499
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html
480
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
500
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
481
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
501
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
482
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
502
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
483
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
503
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
484
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor2.html
485
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
504
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
486
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
505
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
487
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
506
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
Lines 518-525 Link Here
518
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
537
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
519
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
538
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
520
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
539
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
540
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html
521
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
541
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
522
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
542
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
523
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
543
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
524
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
544
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
545
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html
525
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html
546
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html

Return to bug 207967