Attachment 168160 Details for Bug 207967 – patch to upgrade sysutils/slurm-wlm to the latest supported version

[patch] patch to upgrade sysutils/slurm-wlm to the latest supported version

slurm-wlm-15.08.8.diff (text/plain), 9.28 KB, created by Joseph Mingrone on 2016-03-14 17:29:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2016-03-14 17:29:15 UTC

Size: 9.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 411045)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	slurm
>-PORTVERSION=	14.11.9
>+PORTVERSION=	15.08.8
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.schedmd.com/download/latest/ \
> 		http://www.schedmd.com/download/archive/ \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 411045)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (slurm-14.11.9.tar.bz2) = a39c74964b5ce3c20f79fd858561d724b09cbcf1b3406cf5c2aba9d087307dd2
>-SIZE (slurm-14.11.9.tar.bz2) = 6364170
>+SHA256 (slurm-15.08.8.tar.bz2) = 9381db4eb452ce1bb660f46dfcbe61975aaf31dde05847afd8fb05c089d1449f
>+SIZE (slurm-15.08.8.tar.bz2) = 6775616
>Index: files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
>===================================================================
>--- files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c	(revision 411045)
>+++ files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c	(working copy)
>@@ -1,11 +0,0 @@
>---- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig	2015-04-23 22:50:47 UTC
>-+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
>-@@ -57,6 +57,8 @@
>- 
>- #include "src/slurmd/slurmd/slurmd.h"
>- 
>-+#include <limits.h>
>-+
>- 
>- /***************************************************************/
>- 
>Index: files/pty.h
>===================================================================
>--- files/pty.h	(revision 411045)
>+++ files/pty.h	(working copy)
>@@ -1,4 +0,0 @@
>-#include <sys/types.h>
>-#include <sys/ioctl.h>
>-#include <termios.h>
>-#include <libutil.h>
>Index: files/slurm.conf.example
>===================================================================
>--- files/slurm.conf.example	(revision 411045)
>+++ files/slurm.conf.example	(working copy)
>@@ -6,6 +6,15 @@
> # See the slurm.conf man page for more information.
> #
> 
>+# NOTE: The parent directories for Slurm's log files, process ID
>+# files, state save directories, etc. are not created by Slurm. They
>+# must be created and made writable by the slurm user as needed prior to
>+# starting Slurm daemons.
>+#
>+# If you keep the configuration directives below, you should create
>+# the directories /var/log/slurm/, /var/run/slurm/, and
>+# /var/spool/slurmd and make them owned and writable by the slurm user. 
>+
> AuthType=auth/munge
> #BackupAddr=
> #BackupController=
>@@ -75,9 +84,9 @@
> #JobCompLoc=
> JobCompType=jobcomp/none
> SlurmctldDebug=3
>-SlurmctldLogFile=/var/log/slurmctld.log
>+SlurmctldLogFile=/var/log/slurm/slurmctld.log
> SlurmdDebug=3
>-SlurmdLogFile=/var/log/slurmd.log
>+SlurmdLogFile=/var/log/slurm/slurmd.log
> 
> # ACCOUNTING
> #AccountingStorageHost=
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 411045)
>+++ pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
>-Slurm is an open-source workload manager designed for *nux clusters of all
>+Slurm is an open-source workload manager designed for *nix clusters of all
> sizes. It provides three key functions. First it allocates exclusive and/or
> non-exclusive access to resources (computer nodes) to users for some duration of
> time so they can perform work. Second, it provides a framework for starting,
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 411045)
>+++ pkg-plist	(working copy)
>@@ -31,12 +31,12 @@
> lib/libpmi.so.0.0.0
> lib/libslurm.a
> lib/libslurm.so
>-lib/libslurm.so.28
>-lib/libslurm.so.28.0.0
>+lib/libslurm.so.29
>+lib/libslurm.so.29.0.0
> lib/libslurmdb.a
> lib/libslurmdb.so
>-lib/libslurmdb.so.28
>-lib/libslurmdb.so.28.0.0
>+lib/libslurmdb.so.29
>+lib/libslurmdb.so.29.0.0
> lib/slurm/accounting_storage_filetxt.a
> lib/slurm/accounting_storage_filetxt.so
> %%MYSQL%%lib/slurm/accounting_storage_mysql.a
>@@ -45,6 +45,10 @@
> lib/slurm/accounting_storage_none.so
> lib/slurm/accounting_storage_slurmdbd.a
> lib/slurm/accounting_storage_slurmdbd.so
>+lib/slurm/acct_gather_energy_cray.a
>+lib/slurm/acct_gather_energy_cray.so
>+lib/slurm/acct_gather_energy_ibmaem.a
>+lib/slurm/acct_gather_energy_ibmaem.so
> lib/slurm/acct_gather_energy_none.a
> lib/slurm/acct_gather_energy_none.so
> lib/slurm/acct_gather_energy_rapl.a
>@@ -63,6 +67,8 @@
> lib/slurm/auth_munge.so
> lib/slurm/auth_none.a
> lib/slurm/auth_none.so
>+lib/slurm/burst_buffer_generic.a
>+lib/slurm/burst_buffer_generic.so
> lib/slurm/checkpoint_none.a
> lib/slurm/checkpoint_none.so
> lib/slurm/checkpoint_ompi.a
>@@ -125,6 +131,12 @@
> lib/slurm/jobcomp_script.so
> lib/slurm/launch_slurm.a
> lib/slurm/launch_slurm.so
>+lib/slurm/layouts_power_cpufreq.a
>+lib/slurm/layouts_power_cpufreq.so
>+lib/slurm/layouts_power_default.a
>+lib/slurm/layouts_power_default.so
>+lib/slurm/layouts_unit_default.a
>+lib/slurm/layouts_unit_default.so
> lib/slurm/mpi_lam.a
> lib/slurm/mpi_lam.so
> lib/slurm/mpi_mpich1_p4.a
>@@ -143,6 +155,8 @@
> lib/slurm/mpi_openmpi.so
> lib/slurm/mpi_pmi2.a
> lib/slurm/mpi_pmi2.so
>+lib/slurm/power_none.a
>+lib/slurm/power_none.so
> lib/slurm/preempt_job_prio.a
> lib/slurm/preempt_job_prio.so
> lib/slurm/preempt_none.a
>@@ -205,6 +219,8 @@
> lib/slurm/task_none.so
> lib/slurm/topology_3d_torus.a
> lib/slurm/topology_3d_torus.so
>+lib/slurm/topology_hypercube.a
>+lib/slurm/topology_hypercube.so
> lib/slurm/topology_node_rank.a
> lib/slurm/topology_node_rank.so
> lib/slurm/topology_none.a
>@@ -298,6 +314,7 @@
> man/man3/slurm_job_step_layout_free.3.gz
> man/man3/slurm_job_step_layout_get.3.gz
> man/man3/slurm_job_will_run.3.gz
>+man/man3/slurm_job_will_run2.3.gz
> man/man3/slurm_jobinfo_ctx_get.3.gz
> man/man3/slurm_kill_job.3.gz
> man/man3/slurm_kill_job_step.3.gz
>@@ -374,6 +391,7 @@
> man/man3/slurm_update_step.3.gz
> man/man5/acct_gather.conf.5.gz
> man/man5/bluegene.conf.5.gz
>+man/man5/burst_buffer.conf.5.gz
> man/man5/cgroup.conf.5.gz
> man/man5/cray.conf.5.gz
> man/man5/ext_sensors.conf.5.gz
>@@ -403,9 +421,11 @@
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
>@@ -425,7 +445,6 @@
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
>-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dynalloc.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
>@@ -455,7 +474,6 @@
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
>-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/lll.gif
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
>@@ -477,11 +495,12 @@
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
>-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor2.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
>@@ -518,8 +537,10 @@
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
>+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html
> %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html

Flags:

jrm: maintainer-approval+

Actions: View | Diff

Attachments on bug 207967: 168126 | 168127 | 168128 | 168160