From ceedca7b5438190b0b65a05eb062e9cd30561b62 Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Tue, 12 Jul 2011 19:49:24 +0000 Subject: [PATCH] - Update to 3.0.2 PR: ports/158699 Submitted by: Jason Bacon (maintainer) --- sysutils/torque/Makefile | 11 +- sysutils/torque/distinfo | 4 +- .../patch-src-resmom-freebsd5-mom_mach.c | 11 ++ .../patch-src-resmom-freebsd5-mom_start.c | 10 ++ .../files/patch-src-server-node_manager.c | 10 ++ .../torque/files/patch-src-server-pbsd_main.c | 10 ++ sysutils/torque/files/pkg-message.in | 12 +- sysutils/torque/pkg-plist | 111 ++++++++++-------- 8 files changed, 115 insertions(+), 64 deletions(-) create mode 100644 sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c create mode 100644 sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c create mode 100644 sysutils/torque/files/patch-src-server-node_manager.c create mode 100644 sysutils/torque/files/patch-src-server-pbsd_main.c diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile index 2ccdfc6eaa51..48b244b7d13a 100644 --- a/sysutils/torque/Makefile +++ b/sysutils/torque/Makefile @@ -6,12 +6,12 @@ # PORTNAME= torque -PORTVERSION= 2.4.6 +PORTVERSION= 3.0.2 CATEGORIES= sysutils parallel MASTER_SITES= http://www.clusterresources.com/downloads/torque/ MAINTAINER= jwbacon@tds.net -COMMENT= Open source resource manager +COMMENT= Open source distributed computing resource manager based on PBS USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes @@ -19,11 +19,13 @@ CONFIGURE_ARGS= --with-rcp=scp USE_GMAKE= yes USE_RC_SUBR= pbs_server.sh pbs_sched.sh pbs_mom.sh SUB_FILES= pkg-message +USE_PERL5= yes USE_LDCONFIG= yes MAN1= qalter.1 qdel.1 qhold.1 qmove.1 qmsg.1 qorder.1 qrerun.1 \ qrls.1 qselect.1 qsig.1 qstat.1 qsub.1 pbs.1 pbsdsh.1 \ - nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 + nqs2pbs.1 basl2c.1 xpbs.1 xpbsmon.1 qmgr.1 qchkpt.1 \ + qgpumode.1 qgpureset.1 MAN3= rpp.3 tm.3 pbs_alterjob.3 pbs_connect.3 pbs_default.3 \ pbs_deljob.3 pbs_disconnect.3 pbs_geterrmsg.3 pbs_holdjob.3 \ @@ -32,7 +34,8 @@ MAN3= rpp.3 tm.3 pbs_alterjob.3 pbs_connect.3 pbs_default.3 \ pbs_rescreserve.3 pbs_rlsjob.3 pbs_runjob.3 pbs_selectjob.3 \ pbs_selstat.3 pbs_sigjob.3 pbs_stagein.3 pbs_statjob.3 \ pbs_statnode.3 pbs_statque.3 pbs_statserver.3 pbs_submit.3 \ - pbs_terminate.3 + pbs_terminate.3 pbs_checkpointjob.3 pbs_fbserver.3 \ + pbs_get_server_list.3 pbs_gpumode.3 pbs_gpureset.3 MAN7= pbs_job_attributes.7 pbs_queue_attributes.7 \ pbs_server_attributes.7 pbs_resources_aix4.7 \ diff --git a/sysutils/torque/distinfo b/sysutils/torque/distinfo index 21acc6112b5b..841b8a8ed20d 100644 --- a/sysutils/torque/distinfo +++ b/sysutils/torque/distinfo @@ -1,2 +1,2 @@ -SHA256 (torque-2.4.6.tar.gz) = 84c6f96bd034dc8766fc28a1e0f641c6c01d3c00712f05adb81c37b2be988975 -SIZE (torque-2.4.6.tar.gz) = 5537109 +SHA256 (torque-3.0.2.tar.gz) = a82c6a269a78ace25a7b60bfe1204db34855ddc56c1af29ca73f165999cb24a1 +SIZE (torque-3.0.2.tar.gz) = 5864771 diff --git a/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c new file mode 100644 index 000000000000..d43da3d3f30a --- /dev/null +++ b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_mach.c @@ -0,0 +1,11 @@ +--- src/resmom/freebsd5/mom_mach.c.orig 2011-06-24 13:50:59.000000000 -0500 ++++ src/resmom/freebsd5/mom_mach.c 2011-06-24 13:51:19.000000000 -0500 +@@ -166,7 +166,7 @@ + extern int ignmem; + + extern int LOGLEVEL; +-extern void checkret(char **, int); ++// extern void checkret(char **, int); + + + /* diff --git a/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c new file mode 100644 index 000000000000..419d7a4040ed --- /dev/null +++ b/sysutils/torque/files/patch-src-resmom-freebsd5-mom_start.c @@ -0,0 +1,10 @@ +--- src/resmom/freebsd5/mom_start.c.orig 2011-06-24 13:40:31.000000000 -0500 ++++ src/resmom/freebsd5/mom_start.c 2011-06-24 13:41:15.000000000 -0500 +@@ -214,6 +214,7 @@ + task *ptask = 0; + int statloc; + unsigned int momport = 0; ++ extern unsigned int pbs_rm_port; + + if (LOGLEVEL >= 7) + { diff --git a/sysutils/torque/files/patch-src-server-node_manager.c b/sysutils/torque/files/patch-src-server-node_manager.c new file mode 100644 index 000000000000..faac6bdf4c24 --- /dev/null +++ b/sysutils/torque/files/patch-src-server-node_manager.c @@ -0,0 +1,10 @@ +--- src/server/node_manager.c.orig 2011-06-24 13:21:21.000000000 -0500 ++++ src/server/node_manager.c 2011-06-24 13:21:47.000000000 -0500 +@@ -88,6 +88,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/sysutils/torque/files/patch-src-server-pbsd_main.c b/sysutils/torque/files/patch-src-server-pbsd_main.c new file mode 100644 index 000000000000..f4d9aa898e27 --- /dev/null +++ b/sysutils/torque/files/patch-src-server-pbsd_main.c @@ -0,0 +1,10 @@ +--- src/server/pbsd_main.c.orig 2011-06-24 13:24:45.000000000 -0500 ++++ src/server/pbsd_main.c 2011-06-24 13:25:15.000000000 -0500 +@@ -94,6 +94,7 @@ + #include + #endif /* PLOCK_DAEMONS */ + #include ++#include + #include "pbs_ifl.h" + #include + #include diff --git a/sysutils/torque/files/pkg-message.in b/sysutils/torque/files/pkg-message.in index fb5dd4c16b30..abefcbd82985 100644 --- a/sysutils/torque/files/pkg-message.in +++ b/sysutils/torque/files/pkg-message.in @@ -3,7 +3,7 @@ You can find an example configuration in %%PREFIX%%/share/examples/torque/var/spool/torque -On all machines, both server and computing nodes: +On all machines, both server and compute nodes: 1. Run @@ -15,7 +15,7 @@ On all machines, both server and computing nodes: /var/spool/torque/server_name ****************************************************************************** -On computing nodes: +On compute nodes: 1. Put '$pbsserver ip.address.of.server' into @@ -26,12 +26,12 @@ On computing nodes: pbs_mom_enable="YES" This may include the server if you allow it to be used - as a computing node as well. + as a compute node as well. ****************************************************************************** On the server: - 1. Put hostnames of computing nodes, one per line, into + 1. Put hostnames of compute nodes, one per line, into /var/spool/torque/server_priv/nodes @@ -50,9 +50,9 @@ On the server: The recommended user is root. ****************************************************************************** -After installation is complete on the server and computing nodes: +After installation is complete on the server and compute nodes: - 1. Start node services on all computing nodes with: + 1. Start node services on all compute nodes with: %%PREFIX%%/etc/rc.d/pbs_mom restart diff --git a/sysutils/torque/pkg-plist b/sysutils/torque/pkg-plist index 9c412ff0369f..ecb5680c5912 100644 --- a/sysutils/torque/pkg-plist +++ b/sysutils/torque/pkg-plist @@ -13,6 +13,8 @@ bin/qchkpt bin/qdel bin/qdisable bin/qenable +bin/qgpumode +bin/qgpureset bin/qhold bin/qmgr bin/qmove @@ -50,55 +52,60 @@ sbin/pbs_server sbin/qnoded sbin/qschedd sbin/qserverd -%%EXAMPLESDIR%%/torque.setup -%%EXAMPLESDIR%%/var/spool/torque/pbs_environment -%%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time -%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays -%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group -%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config -%%EXAMPLESDIR%%/var/spool/torque/server_name -@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered -@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv -@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs -@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting -@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv -@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs -@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs -@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv -@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs -@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint -@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux -@dirrm %%EXAMPLESDIR%%/var/spool/torque -@dirrm %%EXAMPLESDIR%%/var/spool -@dirrm %%EXAMPLESDIR%%/var -@dirrm %%EXAMPLESDIR%% -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint -@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/torque.setup +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/pbs_environment +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/dedicated_time +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/holidays +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/resource_group +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/sched_priv/sched_config +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_name +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/var/spool/torque/server_priv/nodes +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/undelivered +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/spool +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/queues +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_priv +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/server_logs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_priv +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/sched_logs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_priv +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/mom_logs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/job_logs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/checkpoint +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque/aux +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool/torque +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var/spool +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/var +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/undelivered +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/spool +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/queues +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/jobs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/hostlist +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/disallowed_types +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/credentials +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/arrays +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_users +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_svr +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_hosts +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/acl_groups +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_priv/accounting +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/server_logs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_priv/accounting +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/sched_logs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_priv/jobs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/mom_logs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/job_logs +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/checkpoint +%%PORTEXAMPLES%%@exec mkdir -p %D/%%EXAMPLESDIR%%/var/spool/torque/aux