diff options
21 files changed, 248 insertions, 50 deletions
diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile index 74cb6b466ae..8557c0ed62f 100644 --- a/parallel/slurm/Makefile +++ b/parallel/slurm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2013/07/12 10:45:01 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2013/12/06 06:05:30 asau Exp $ -DISTNAME= slurm-2.4.1 -PKGREVISION= 4 +DISTNAME= slurm-2.6.4 CATEGORIES= parallel MASTER_SITES= http://www.schedmd.com/download/archive/ \ http://www.schedmd.com/download/latest/ \ @@ -18,6 +17,7 @@ GNU_CONFIGURE= yes USE_TOOLS= perl pkg-config USE_LIBTOOL= yes +CONFIGURE_ARGS+= --with-hdf5=no # Fix installation: CONFIGURE_ARGS+= --htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html diff --git a/parallel/slurm/PLIST b/parallel/slurm/PLIST index 47ea3247cb6..fa100c6cf33 100644 --- a/parallel/slurm/PLIST +++ b/parallel/slurm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2012/07/03 22:00:41 asau Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/12/06 06:05:30 asau Exp $ bin/sacct bin/sacctmgr bin/salloc @@ -28,18 +28,29 @@ lib/libslurmdb.la lib/slurm/accounting_storage_filetxt.la lib/slurm/accounting_storage_none.la lib/slurm/accounting_storage_slurmdbd.la +lib/slurm/acct_gather_energy_none.la +lib/slurm/acct_gather_energy_rapl.la +lib/slurm/acct_gather_filesystem_lustre.la +lib/slurm/acct_gather_filesystem_none.la +lib/slurm/acct_gather_infiniband_none.la +lib/slurm/acct_gather_profile_none.la lib/slurm/auth_munge.la lib/slurm/auth_none.la lib/slurm/checkpoint_none.la lib/slurm/checkpoint_ompi.la lib/slurm/crypto_munge.la lib/slurm/crypto_openssl.la +lib/slurm/ext_sensors_none.la lib/slurm/gres_gpu.la +lib/slurm/gres_mic.la lib/slurm/gres_nic.la +lib/slurm/job_submit_all_partitions.la lib/slurm/job_submit_cnode.la lib/slurm/job_submit_defaults.la lib/slurm/job_submit_logging.la lib/slurm/job_submit_partition.la +lib/slurm/job_submit_pbs.la +lib/slurm/job_submit_require_timelimit.la lib/slurm/jobacct_gather_aix.la lib/slurm/jobacct_gather_cgroup.la lib/slurm/jobacct_gather_linux.la @@ -47,6 +58,7 @@ lib/slurm/jobacct_gather_none.la lib/slurm/jobcomp_filetxt.la lib/slurm/jobcomp_none.la lib/slurm/jobcomp_script.la +lib/slurm/launch_slurm.la lib/slurm/mpi_lam.la lib/slurm/mpi_mpich1_p4.la lib/slurm/mpi_mpich1_shmem.la @@ -72,6 +84,8 @@ lib/slurm/sched_wiki2.la lib/slurm/select_cons_res.la lib/slurm/select_cray.la lib/slurm/select_linear.la +lib/slurm/select_serial.la +lib/slurm/spank_pbs.la lib/slurm/src/sattach/sattach.wrapper.c lib/slurm/src/srun/srun.wrapper.c lib/slurm/switch_none.la @@ -90,6 +104,7 @@ man/man1/sbcast.1 man/man1/scancel.1 man/man1/scontrol.1 man/man1/sdiag.1 +man/man1/sh5util.1 man/man1/sinfo.1 man/man1/slurm.1 man/man1/smap.1 @@ -155,6 +170,7 @@ man/man3/slurm_hostlist_shift.3 man/man3/slurm_init_job_desc_msg.3 man/man3/slurm_init_part_desc_msg.3 man/man3/slurm_init_resv_desc_msg.3 +man/man3/slurm_init_trigger_msg.3 man/man3/slurm_init_update_front_end_msg.3 man/man3/slurm_init_update_node_msg.3 man/man3/slurm_init_update_step_msg.3 @@ -171,8 +187,10 @@ man/man3/slurm_kill_job_step.3 man/man3/slurm_load_ctl_conf.3 man/man3/slurm_load_front_end.3 man/man3/slurm_load_job.3 +man/man3/slurm_load_job_user.3 man/man3/slurm_load_jobs.3 man/man3/slurm_load_node.3 +man/man3/slurm_load_node_single.3 man/man3/slurm_load_partitions.3 man/man3/slurm_load_reservations.3 man/man3/slurm_load_slurmd_status.3 @@ -233,9 +251,11 @@ man/man3/slurm_update_node.3 man/man3/slurm_update_partition.3 man/man3/slurm_update_reservation.3 man/man3/slurm_update_step.3 +man/man5/acct_gather.conf.5 man/man5/bluegene.conf.5 man/man5/cgroup.conf.5 man/man5/cray.conf.5 +man/man5/ext_sensors.conf.5 man/man5/gres.conf.5 man/man5/slurm.conf.5 man/man5/slurmdbd.conf.5 @@ -250,8 +270,13 @@ sbin/slurmctld sbin/slurmd sbin/slurmdbd sbin/slurmstepd +share/doc/${PKGNAME}/html/Slurm_Entity.pdf +share/doc/${PKGNAME}/html/Slurm_Individual.pdf share/doc/${PKGNAME}/html/accounting.html share/doc/${PKGNAME}/html/accounting_storageplugins.html +share/doc/${PKGNAME}/html/acct_gather_energy_plugins.html +share/doc/${PKGNAME}/html/acct_gather_profile_plugins.html +share/doc/${PKGNAME}/html/add.html share/doc/${PKGNAME}/html/allocation_pies.gif share/doc/${PKGNAME}/html/api.html share/doc/${PKGNAME}/html/arch.gif @@ -267,6 +292,7 @@ share/doc/${PKGNAME}/html/configurator.easy.html share/doc/${PKGNAME}/html/configurator.html share/doc/${PKGNAME}/html/cons_res.html share/doc/${PKGNAME}/html/cons_res_share.html +share/doc/${PKGNAME}/html/contributor.html share/doc/${PKGNAME}/html/cpu_management.html share/doc/${PKGNAME}/html/cray.html share/doc/${PKGNAME}/html/crypto_plugins.html @@ -274,22 +300,32 @@ share/doc/${PKGNAME}/html/disclaimer.html share/doc/${PKGNAME}/html/dist_plane.html share/doc/${PKGNAME}/html/documentation.html share/doc/${PKGNAME}/html/download.html +share/doc/${PKGNAME}/html/dynalloc.html share/doc/${PKGNAME}/html/elastic_computing.html share/doc/${PKGNAME}/html/entities.gif share/doc/${PKGNAME}/html/example_usage.gif +share/doc/${PKGNAME}/html/ext_sensorsplugins.html share/doc/${PKGNAME}/html/faq.html share/doc/${PKGNAME}/html/gang_scheduling.html share/doc/${PKGNAME}/html/gres.html share/doc/${PKGNAME}/html/gres_design.html share/doc/${PKGNAME}/html/gres_plugins.html +share/doc/${PKGNAME}/html/hdf5_job_outline.png +share/doc/${PKGNAME}/html/hdf5_profile_user_guide.html +share/doc/${PKGNAME}/html/hdf5_task_attr.png share/doc/${PKGNAME}/html/help.html share/doc/${PKGNAME}/html/high_throughput.html +share/doc/${PKGNAME}/html/ibm-pe.html share/doc/${PKGNAME}/html/ibm.html +share/doc/${PKGNAME}/html/ibm_pe_fig1.png +share/doc/${PKGNAME}/html/ibm_pe_fig2.png +share/doc/${PKGNAME}/html/job_array.html share/doc/${PKGNAME}/html/job_exit_code.html share/doc/${PKGNAME}/html/job_launch.html share/doc/${PKGNAME}/html/job_submit_plugins.html share/doc/${PKGNAME}/html/jobacct_gatherplugins.html share/doc/${PKGNAME}/html/jobcompplugins.html +share/doc/${PKGNAME}/html/launch_plugins.html share/doc/${PKGNAME}/html/linuxstyles.css share/doc/${PKGNAME}/html/lll.gif share/doc/${PKGNAME}/html/mail.html @@ -317,24 +353,29 @@ share/doc/${PKGNAME}/html/power_save.html share/doc/${PKGNAME}/html/preempt.html share/doc/${PKGNAME}/html/preemption_plugins.html share/doc/${PKGNAME}/html/priority_multifactor.html +share/doc/${PKGNAME}/html/priority_multifactor2.html share/doc/${PKGNAME}/html/priority_plugins.html share/doc/${PKGNAME}/html/proctrack_plugins.html share/doc/${PKGNAME}/html/programmer_guide.html +share/doc/${PKGNAME}/html/prolog_epilog.html share/doc/${PKGNAME}/html/publications.html share/doc/${PKGNAME}/html/qos.html share/doc/${PKGNAME}/html/quickstart.html share/doc/${PKGNAME}/html/quickstart_admin.html share/doc/${PKGNAME}/html/reservations.html share/doc/${PKGNAME}/html/resource_limits.html +share/doc/${PKGNAME}/html/rosetta.html +share/doc/${PKGNAME}/html/schedmd.png share/doc/${PKGNAME}/html/schedplugins.html share/doc/${PKGNAME}/html/select_design.html share/doc/${PKGNAME}/html/selectplugins.html share/doc/${PKGNAME}/html/slurm.html -share/doc/${PKGNAME}/html/slurm_banner.gif share/doc/${PKGNAME}/html/slurm_design.pdf +share/doc/${PKGNAME}/html/slurm_logo.png share/doc/${PKGNAME}/html/slurm_ug_agenda.html share/doc/${PKGNAME}/html/slurm_ug_cfp.html share/doc/${PKGNAME}/html/slurm_ug_registration.html +share/doc/${PKGNAME}/html/slurmctld_plugstack.html share/doc/${PKGNAME}/html/slurmstyles.css share/doc/${PKGNAME}/html/sponsors.gif share/doc/${PKGNAME}/html/sun_const.html @@ -347,15 +388,17 @@ share/doc/${PKGNAME}/html/topo_ex2.gif share/doc/${PKGNAME}/html/topology.html share/doc/${PKGNAME}/html/topology_plugin.html share/doc/${PKGNAME}/html/troubleshoot.html +share/doc/${PKGNAME}/html/tutorial_intro_files.tar +share/doc/${PKGNAME}/html/tutorials.html share/doc/${PKGNAME}/html/usage_pies.gif share/examples/slurm/bluegene.conf.example share/examples/slurm/cgroup.conf.example share/examples/slurm/cgroup.release_common.example share/examples/slurm/cgroup_allowed_devices_file.conf.example -share/examples/slurm/federation.conf.example share/examples/slurm/init.d.slurm +share/examples/slurm/init.d.slurm.in share/examples/slurm/init.d.slurmdbd +share/examples/slurm/init.d.slurmdbd.in share/examples/slurm/slurm.conf.example share/examples/slurm/slurm.epilog.clean share/examples/slurm/slurmdbd.conf.example -@pkgdir libexec/slurm diff --git a/parallel/slurm/distinfo b/parallel/slurm/distinfo index f03c7343cfd..7fa25bad19a 100644 --- a/parallel/slurm/distinfo +++ b/parallel/slurm/distinfo @@ -1,13 +1,23 @@ -$NetBSD: distinfo,v 1.2 2012/07/03 22:00:41 asau Exp $ +$NetBSD: distinfo,v 1.3 2013/12/06 06:05:30 asau Exp $ -SHA1 (slurm-2.4.1.tar.bz2) = 76b1eccad48d74ad9254d79d1252f3097e719f57 -RMD160 (slurm-2.4.1.tar.bz2) = 82b15dc29dc4297cb62298650f10881694b6e224 -Size (slurm-2.4.1.tar.bz2) = 5212382 bytes -SHA1 (patch-doc_html_Makefile.am) = 92a1942ed7c532fee6597f4d8a3adf81352f6d98 -SHA1 (patch-doc_html_Makefile.in) = 65f05532ae7701c8d33fd46b7c5f853c9bd6a1b0 -SHA1 (patch-doc_man_man1_Makefile.am) = c21d927d0d4949d1b82c57e865ee7a79ed8b99ed -SHA1 (patch-doc_man_man1_Makefile.in) = 9c568214983defe06627c701e96267f568597d50 -SHA1 (patch-doc_man_man5_Makefile.am) = b8473964ad03e95c8416fe623e198f50dd557a08 -SHA1 (patch-doc_man_man5_Makefile.in) = c1ea74633a8c59eaa6aaca3041c48770d7705432 -SHA1 (patch-doc_man_man8_Makefile.am) = 46fb6837dc31e6f7ca926ffff1ddda1bdefeb83a -SHA1 (patch-doc_man_man8_Makefile.in) = e7c66557680c550f1d87147dad4107ad00c4c713 +SHA1 (slurm-2.6.4.tar.bz2) = 6a5850b53201d506a86ab23d13318be34395d237 +RMD160 (slurm-2.6.4.tar.bz2) = a6b4ab6782b0db0822acb2fd7efe6c1464b8a87c +Size (slurm-2.6.4.tar.bz2) = 5954130 bytes +SHA1 (patch-doc_html_Makefile.am) = 9152b1c6d735fbd106a5b2841b09b0c0d5fdbf9e +SHA1 (patch-doc_html_Makefile.in) = 237da04742791877d42d4b68805b2a513aab8f40 +SHA1 (patch-doc_man_man1_Makefile.am) = a131bb9ac16f2683dd0756fff4538a3213043503 +SHA1 (patch-doc_man_man1_Makefile.in) = 262ea869552b7ebd44b63e3df11a40b7172d2425 +SHA1 (patch-doc_man_man5_Makefile.am) = b6918b7bf767b203841c8450bb6ab05b3339b08c +SHA1 (patch-doc_man_man5_Makefile.in) = 6a6d6370c915041096a8b1784dc290f76cac6f1b +SHA1 (patch-doc_man_man8_Makefile.am) = 1a5e7a1139688b0ce127a020deab04402599485e +SHA1 (patch-doc_man_man8_Makefile.in) = 01efd7282aa9d1d011c283358cb4aa566f7c72d6 +SHA1 (patch-src_common_net.c) = 6a53ef7ef94afa1e48d929c635e900c9999e381b +SHA1 (patch-src_common_slurm__jobacct__gather.c) = abcb7c117c3efa95509d047ff7243fc98cfc00b7 +SHA1 (patch-src_common_xcgroup.c) = fd49ee490fc663635b0b5a3ce54ede7e6166b897 +SHA1 (patch-src_common_xcgroup.h) = 78e9021a725692c8a980556c000c4501c8009a75 +SHA1 (patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c) = 3544b07d4266476b2038a39a91166a6a1c802e18 +SHA1 (patch-src_slurmctld_reservation.c) = c02eb31c2b9dee32e1b68bb9ecf63acd34a987ca +SHA1 (patch-src_slurmd_common_setproctitle.c) = 1ac0cccd1f889a8a3e3d998bdb6392cfbca932e5 +SHA1 (patch-src_slurmd_slurmstepd_task.c) = b7afd7c2ed58b8423490e1117d6e82d7b0f3294b +SHA1 (patch-src_srun_libsrun_debugger.c) = 1d10d883c2f9931af3166980c70730ab9fa1df96 +SHA1 (patch-src_srun_libsrun_launch.c) = ff3cbfced383206f86f33c3a511334b95da9edc7 diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.am b/parallel/slurm/patches/patch-doc_html_Makefile.am index bd7b06853dc..dfd6b0289d3 100644 --- a/parallel/slurm/patches/patch-doc_html_Makefile.am +++ b/parallel/slurm/patches/patch-doc_html_Makefile.am @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_html_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_html_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/html/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/html/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/html/Makefile.am @@ -1,6 +1,3 @@ - --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html - generated_html = \ accounting.html \ diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.in b/parallel/slurm/patches/patch-doc_html_Makefile.in index e844bff255f..335e9e1c73f 100644 --- a/parallel/slurm/patches/patch-doc_html_Makefile.in +++ b/parallel/slurm/patches/patch-doc_html_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-doc_html_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_html_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/html/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/html/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/html/Makefile.in -@@ -282,7 +282,7 @@ host_alias = @host_alias@ +@@ -341,7 +341,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am b/parallel/slurm/patches/patch-doc_man_man1_Makefile.am index edd368c0351..ce9d18c54bd 100644 --- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am +++ b/parallel/slurm/patches/patch-doc_man_man1_Makefile.am @@ -1,9 +1,9 @@ -$NetBSD: patch-doc_man_man1_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man1_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man1/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man1/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man1/Makefile.am @@ -1,5 +1,3 @@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html - man1_MANS = \ sacct.1 \ diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in b/parallel/slurm/patches/patch-doc_man_man1_Makefile.in index 7d03ad960b2..32a542af2bf 100644 --- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in +++ b/parallel/slurm/patches/patch-doc_man_man1_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-doc_man_man1_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man1_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man1/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man1/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man1/Makefile.in -@@ -284,7 +284,7 @@ host_alias = @host_alias@ +@@ -343,7 +343,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am b/parallel/slurm/patches/patch-doc_man_man5_Makefile.am index b6a4256accd..e09c0aa9648 100644 --- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am +++ b/parallel/slurm/patches/patch-doc_man_man5_Makefile.am @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_man_man5_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man5_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man5/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man5/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man5/Makefile.am @@ -1,5 +1,3 @@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html - - man5_MANS = bluegene.conf.5 \ - cgroup.conf.5 \ - cray.conf.5 \ + man5_MANS = \ + acct_gather.conf.5 \ + bluegene.conf.5 \ diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in b/parallel/slurm/patches/patch-doc_man_man5_Makefile.in index fc40b1b9956..32cc2885c37 100644 --- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in +++ b/parallel/slurm/patches/patch-doc_man_man5_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-doc_man_man5_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man5_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man5/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man5/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man5/Makefile.in -@@ -284,7 +284,7 @@ host_alias = @host_alias@ +@@ -343,7 +343,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am b/parallel/slurm/patches/patch-doc_man_man8_Makefile.am index dab3450da31..c7547823cc6 100644 --- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am +++ b/parallel/slurm/patches/patch-doc_man_man8_Makefile.am @@ -1,9 +1,9 @@ -$NetBSD: patch-doc_man_man8_Makefile.am,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man8_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man8/Makefile.am.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man8/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man8/Makefile.am @@ -1,5 +1,3 @@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html - man8_MANS = slurmctld.8 \ slurmd.8 \ diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in b/parallel/slurm/patches/patch-doc_man_man8_Makefile.in index b21bf6a438b..216ce67f93f 100644 --- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in +++ b/parallel/slurm/patches/patch-doc_man_man8_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-doc_man_man8_Makefile.in,v 1.1.1.1 2012/03/20 14:52:15 asau Exp $ +$NetBSD: patch-doc_man_man8_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ ---- doc/man/man8/Makefile.in.orig 2012-03-16 22:14:30.000000000 +0000 +--- doc/man/man8/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 +++ doc/man/man8/Makefile.in -@@ -284,7 +284,7 @@ host_alias = @host_alias@ +@@ -343,7 +343,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ --htmldir = ${prefix}/share/doc/@PACKAGE@-@VERSION@/html +-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ diff --git a/parallel/slurm/patches/patch-src_common_net.c b/parallel/slurm/patches/patch-src_common_net.c new file mode 100644 index 00000000000..f473503843b --- /dev/null +++ b/parallel/slurm/patches/patch-src_common_net.c @@ -0,0 +1,22 @@ +$NetBSD: patch-src_common_net.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/common/net.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/common/net.c +@@ -52,7 +52,7 @@ + #include <errno.h> + #include <stdint.h> + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #define SOL_TCP IPPROTO_TCP + #endif + +@@ -216,7 +216,7 @@ extern int net_set_keep_alive(int sock) + * Removing this call might decrease the robustness of communications, + * but will probably have no noticable effect. + */ +-#if ! defined(__FreeBSD__) || (__FreeBSD_version > 900000) ++#if (! defined(__FreeBSD__) || (__FreeBSD_version > 900000)) && ! defined(__APPLE__) + opt_int = keep_alive_time; + if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &opt_int, opt_len) < 0) { + error("Unable to set keep alive socket time: %m"); diff --git a/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c b/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c new file mode 100644 index 00000000000..68a1a5b3e55 --- /dev/null +++ b/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_common_slurm__jobacct__gather.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/common/slurm_jobacct_gather.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/common/slurm_jobacct_gather.c +@@ -47,7 +47,7 @@ + * Morris Jette, et al. + \*****************************************************************************/ + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <signal.h> + #endif + #include <pthread.h> diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.c b/parallel/slurm/patches/patch-src_common_xcgroup.c new file mode 100644 index 00000000000..35ca0581bbc --- /dev/null +++ b/parallel/slurm/patches/patch-src_common_xcgroup.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_common_xcgroup.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/common/xcgroup.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/common/xcgroup.c +@@ -217,7 +217,7 @@ int xcgroup_ns_mount(xcgroup_ns_t* cgns) + options = opt_combined; + } + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__APPLE__) + if (mount("cgroup", cgns->mnt_point, + MS_NOSUID|MS_NOEXEC|MS_NODEV, options)) + #else diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.h b/parallel/slurm/patches/patch-src_common_xcgroup.h new file mode 100644 index 00000000000..1841bacf729 --- /dev/null +++ b/parallel/slurm/patches/patch-src_common_xcgroup.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_common_xcgroup.h,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/common/xcgroup.h.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/common/xcgroup.h +@@ -49,7 +49,7 @@ + #define XCGROUP_SUCCESS 0 + + // http://lists.debian.org/debian-boot/2012/04/msg00047.html +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #define MS_NOSUID MNT_NOSUID + #define MS_NOEXEC MNT_NOEXEC + #define MS_NODEV 0 diff --git a/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c b/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c new file mode 100644 index 00000000000..13bc24ace0a --- /dev/null +++ b/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c +@@ -49,6 +49,9 @@ + #include <getopt.h> + #include <netinet/in.h> + ++#if defined(__NetBSD__) ++#include <limits.h> /* PATH_MAX */ ++#endif + + #include "src/common/slurm_xlator.h" + #include "src/common/slurm_acct_gather_filesystem.h" diff --git a/parallel/slurm/patches/patch-src_slurmctld_reservation.c b/parallel/slurm/patches/patch-src_slurmctld_reservation.c new file mode 100644 index 00000000000..3a89e6db136 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmctld_reservation.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_slurmctld_reservation.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/slurmctld/reservation.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/slurmctld/reservation.c +@@ -44,7 +44,7 @@ + # include <pthread.h> + #endif /* WITH_PTHREADS */ + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <signal.h> + #endif + diff --git a/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c b/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c new file mode 100644 index 00000000000..a00562a7c02 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_slurmd_common_setproctitle.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/slurmd/common/setproctitle.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/slurmd/common/setproctitle.c +@@ -90,7 +90,7 @@ + #include <stdlib.h> + #include <string.h> + #endif +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <stdio.h> + #endif + #ifndef HAVE_SETPROCTITLE diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c new file mode 100644 index 00000000000..2da1694adf5 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/slurmd/slurmstepd/task.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/slurmd/slurmstepd/task.c +@@ -501,7 +501,12 @@ _make_tmpdir(slurmd_job_t *job) + * still work with older systems we include this check. + */ + +-#if defined(__FreeBSD__) ++/* FIXME: Come up with a real solution for EUID instead of substituting RUID */ ++#if defined(__NetBSD__) ++#define eaccess(p,m) (access((p),(m))) ++#endif ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #define __GLIBC__ (1) + #define __GLIBC_PREREQ(a,b) (1) + #endif diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c b/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c new file mode 100644 index 00000000000..0f8aae3da6c --- /dev/null +++ b/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_srun_libsrun_debugger.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/srun/libsrun/debugger.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/srun/libsrun/debugger.c +@@ -38,7 +38,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + \*****************************************************************************/ + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <signal.h> + #endif + diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_launch.c b/parallel/slurm/patches/patch-src_srun_libsrun_launch.c new file mode 100644 index 00000000000..0bfde117062 --- /dev/null +++ b/parallel/slurm/patches/patch-src_srun_libsrun_launch.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_srun_libsrun_launch.c,v 1.1 2013/12/06 06:05:30 asau Exp $ + +--- src/srun/libsrun/launch.c.orig 2013-11-04 21:19:15.000000000 +0000 ++++ src/srun/libsrun/launch.c +@@ -36,7 +36,7 @@ + #include <stdlib.h> + #include <fcntl.h> + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <signal.h> + #endif + |