Bug 196260 - [maintainer update] sysutils/slurm-hpc: Update to 14.11.2 (version scheme changed)
Summary: [maintainer update] sysutils/slurm-hpc: Update to 14.11.2 (version scheme cha...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Steven Kreuzer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-12-25 00:27 UTC by Jason W. Bacon
Modified: 2015-01-28 18:41 UTC (History)
2 users (show)

See Also:


Attachments
Unified diff (33.31 KB, text/plain)
2014-12-25 00:27 UTC, Jason W. Bacon
no flags Details
Diff to update sysutils/slurm-hpc to 14.11.2 (22.90 KB, patch)
2015-01-06 21:52 UTC, Joseph Mingrone
no flags Details | Diff
patch to update sysutils/slurm-hpc to 14.11.3 (37.21 KB, patch)
2015-01-18 05:29 UTC, Joseph Mingrone
no flags Details | Diff
Patch to upgrade sysutils/slurm to 14.11.3 (38.78 KB, patch)
2015-01-19 05:59 UTC, Joseph Mingrone
no flags Details | Diff
Patch to upgrade sysutils/slurm to 14.11.3 (38.78 KB, patch)
2015-01-28 00:39 UTC, Joseph Mingrone
no flags Details | Diff
New patch to 14.11.3 (33.86 KB, patch)
2015-01-28 01:42 UTC, Jason W. Bacon
jwb: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason W. Bacon freebsd_committer freebsd_triage 2014-12-25 00:27:00 UTC
Created attachment 150946 [details]
Unified diff

Update to latest stable version 14.11.2 (2014-Nov-rev2).

Fix pty issue that prevented interactive jobs from working.

Generate example configuration file from included example.

Clean up port Makefile.
Comment 1 Joseph Mingrone freebsd_committer freebsd_triage 2015-01-06 21:52:45 UTC
Created attachment 151430 [details]
Diff to update sysutils/slurm-hpc to 14.11.2

I foolishly didn't check here before attempting this as well.  I've attached what I came up with in case it's helpful.

Two lines in the Makefile and changes to pkg-plists might be helpful.  This way, you don't have to specify %%PORTDOCS%%%%DOCSDIR%%-14.11.2 in pkg-plist.

In the Makefile:

DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
PLIST_SUB=	SLURM_VERSION=${PORTVERSION}

Then in pkg-plist just use, e.g., %%DOCSDIR%%/html/Slurm_Entity.pdf.

It passes all the tests in the porter's handbook, but I see two warnings with portlint.

WARN: Makefile: [50]: You may remove pkg-plist if you use PLIST_FILES and/or PLIST_DIRS.
WARN: Makefile: [62]: the options to USES are not sorted.  Please consider sorting them.

Please note that I haven't fully tested this since I saw this before I was finished and I'm still new to slurm.  Both daemons start and seem to be working, but /var/spool/slurmd must be created manually and the appropriate permissions must be set.
Comment 2 Jason W. Bacon freebsd_committer freebsd_triage 2015-01-07 00:38:51 UTC
I'm not sure there's anything we can do about the plist warning.  PLIST_FILES is modified based on OPTIONS.

I somehow overlooked the USES warning: Thanks for pointing that out.

pkg-plist is generated by make makeplist (or using ports-mgmt/genplist), so the DOCSDIR and PLIST_SUB variables won't really save any work.

Thanks for pointing out the /var/spool/slurmd issue.  I'll fix this in the next update, probably using pkg-install.
Comment 3 Joseph Mingrone freebsd_committer freebsd_triage 2015-01-18 05:29:13 UTC
Created attachment 151783 [details]
patch to update sysutils/slurm-hpc to 14.11.3
Comment 4 Joseph Mingrone freebsd_committer freebsd_triage 2015-01-18 15:26:09 UTC
There was some confusion about maintaintership.  If my patch for 14.11.3 is accepted, can you please return jwbacon@tds.net as the the maintainer.
Comment 5 Joseph Mingrone freebsd_committer freebsd_triage 2015-01-19 05:59:06 UTC
Created attachment 151828 [details]
Patch to upgrade sysutils/slurm to 14.11.3

Use default tab width, provide a better example configuration file, and set the maintainer back to jwbacon@tds.net (confirmed through email).
Comment 6 Joseph Mingrone freebsd_committer freebsd_triage 2015-01-28 00:39:18 UTC
Created attachment 152287 [details]
Patch to upgrade sysutils/slurm to 14.11.3

Fix the hunk at the top of the Makefile that wasn't applying cleanly.
Comment 7 Jason W. Bacon freebsd_committer freebsd_triage 2015-01-28 01:42:25 UTC
Created attachment 152290 [details]
New patch to 14.11.3

I don't have time right now to thoroughly test the significant changes in Joseph's 14.11.3 patch, so I added a new one that's more incremental and addresses some of Joseph's suggestions.  This also adds a pkg-install script to create /var/log/slurm and /var/spool/slurmd.
Comment 8 commit-hook freebsd_committer freebsd_triage 2015-01-28 14:05:43 UTC
A commit references this bug:

Author: skreuzer
Date: Wed Jan 28 14:04:55 UTC 2015
New revision: 378061
URL: https://svnweb.freebsd.org/changeset/ports/378061

Log:
  Update to version 14.11.3

  PR:		196260

Changes:
  head/sysutils/slurm-hpc/Makefile
  head/sysutils/slurm-hpc/distinfo
  head/sysutils/slurm-hpc/files/patch-configure
  head/sysutils/slurm-hpc/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
  head/sysutils/slurm-hpc/files/patch-src-plugins-select-cons_res-dist_tasks.c
  head/sysutils/slurm-hpc/files/patch-src-plugins-task-cgroup-task_cgroup_cpuset.c
  head/sysutils/slurm-hpc/files/pty.h
  head/sysutils/slurm-hpc/files/slurm.conf.example
  head/sysutils/slurm-hpc/files/slurm.conf.in
  head/sysutils/slurm-hpc/pkg-descr
  head/sysutils/slurm-hpc/pkg-plist