diff options
author | Justin Bronder <jsbronder@gentoo.org> | 2014-01-19 20:36:30 +0000 |
---|---|---|
committer | Justin Bronder <jsbronder@gentoo.org> | 2014-01-19 20:36:30 +0000 |
commit | 8c4e712d78bf4f6fcde792ac580d03263e327490 (patch) | |
tree | 955b1dfdce0d51fc3772dce382ae474ffc7e25a2 /sys-cluster/torque | |
parent | Add arm64 love. (diff) | |
download | gentoo-2-8c4e712d78bf4f6fcde792ac580d03263e327490.tar.gz gentoo-2-8c4e712d78bf4f6fcde792ac580d03263e327490.tar.bz2 gentoo-2-8c4e712d78bf4f6fcde792ac580d03263e327490.zip |
cleanup
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)
Diffstat (limited to 'sys-cluster/torque')
7 files changed, 8 insertions, 709 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index d2ebed338784..0f152dc4d0d5 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/torque # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.165 2014/01/19 13:46:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.166 2014/01/19 20:36:30 jsbronder Exp $ + + 19 Jan 2014; Justin Bronder <jsbronder@gentoo.org> -torque-2.4.16.ebuild, + -torque-2.4.16-r1.ebuild, -files/0001-fix-parallel-doc-install.patch, + -files/0002-fix-implicit-declaration-warnings.patch, + -files/0003-disable-automagic-doc-building.patch, + -files/disable-automagic-doc-building-2.4.14.patch: + cleanup 19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> torque-2.5.12-r1.ebuild, torque-4.1.5.1-r1.ebuild: diff --git a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch deleted file mode 100644 index 8505787062ab..000000000000 --- a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d29ba6daadde49d4e2325b415f2fe614bd2cbad1 Mon Sep 17 00:00:00 2001 -From: Kacper Kowalik <xarthisius@gentoo.org> -Date: Tue, 16 Nov 2010 16:23:14 -0500 -Subject: [PATCH 1/4] fix parallel doc install - -man7/pbs_resources_irix5.7 was defined twice. - -Thanks to Kacper Kowalik <xarthisius@gentoo.org> ---- - doc/Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 797b4d6..d4b474c 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -33,7 +33,6 @@ EXTRA_DIST = man1/qalter.1.in man1/qdel.1.in man1/qhold.1.in man1/qmove.1.in \ - man7/pbs_resources_fujitsu.7.in \ - man7/pbs_resources_hpux10.7.in man7/pbs_resources_irix5.7.in \ - man7/pbs_resources_hpux11.7.in \ -- man7/pbs_resources_irix5.7.in \ - man7/pbs_resources_irix6.7.in man7/pbs_resources_irix6array.7.in \ - man7/pbs_resources_linux.7.in man7/pbs_resources_netbsd.7.in \ - man7/pbs_resources_solaris5.7.in man7/pbs_resources_solaris7.7.in \ -@@ -79,7 +78,6 @@ nodist_man7_MANS = man7/pbs_job_attributes.7 man7/pbs_queue_attributes.7 \ - man7/pbs_resources_freebsd.7 man7/pbs_resources_fujitsu.7 \ - man7/pbs_resources_hpux10.7 man7/pbs_resources_irix5.7 \ - man7/pbs_resources_hpux11.7 \ -- man7/pbs_resources_irix5.7 \ - man7/pbs_resources_irix6.7 man7/pbs_resources_irix6array.7 \ - man7/pbs_resources_linux.7 man7/pbs_resources_netbsd.7 \ - man7/pbs_resources_solaris5.7 man7/pbs_resources_solaris7.7 \ --- -1.7.2.2 - diff --git a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch deleted file mode 100644 index 49bf1f9a8602..000000000000 --- a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7a60464264bafb27c4bbaab39744b267d671f41b Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Tue, 16 Nov 2010 16:31:25 -0500 -Subject: [PATCH 2/3] fix implicit declaration warnings - -vasprintf and asprintf require _GNU_SOURCE. - -Thanks to Kacper Kowalik <xarthisius@gentoo.org> ---- - src/drmaa/src/error.c | 1 + - src/drmaa/src/submit.c | 1 + - src/drmaa/src/wait.c | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/drmaa/src/error.c b/src/drmaa/src/error.c -index b848041..4a65b47 100644 ---- a/src/drmaa/src/error.c -+++ b/src/drmaa/src/error.c -@@ -23,6 +23,7 @@ - # include <pbs_config.h> - #endif - -+#define _GNU_SOURCE // asprintf - #include <unistd.h> - - #include <stdio.h> -diff --git a/src/drmaa/src/submit.c b/src/drmaa/src/submit.c -index e9b404c..9f06620 100644 ---- a/src/drmaa/src/submit.c -+++ b/src/drmaa/src/submit.c -@@ -23,6 +23,7 @@ - # include <pbs_config.h> - #endif - -+#define _GNU_SOURCE - #include <sys/stat.h> - #include <unistd.h> - #include <limits.h> -diff --git a/src/drmaa/src/wait.c b/src/drmaa/src/wait.c -index ecb2ed4..2ef7600 100644 ---- a/src/drmaa/src/wait.c -+++ b/src/drmaa/src/wait.c -@@ -23,6 +23,7 @@ - # include <pbs_config.h> - #endif - -+#define _GNU_SOURCE // vasprintf - #include <assert.h> - #include <limits.h> - #include <signal.h> --- -1.7.2.2 - diff --git a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch deleted file mode 100644 index 43632c3f2115..000000000000 --- a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7351d31442fcf324b7f7769911af8a98368506e2 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Tue, 16 Nov 2010 17:03:13 -0500 -Subject: [PATCH 3/3] disable automagic doc building - -Instead of unconditionally building docs if doxygen is found, only build -at the request of the user. ---- - configure.ac | 19 +++++++++++++------ - 1 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 480e23e..a8182cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1237,8 +1237,6 @@ dnl - if test "$build_drmaa" = "yes" ;then - AC_MSG_NOTICE([Configuring DRMAA ...]) - AC_PATH_PROG(GPERF, "gperf") --AX_PROG_DOT --AC_PATH_PROG(DOXYGEN, "doxygen", "none") - AC_C_BIGENDIAN_CROSS - ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])]) - -@@ -1282,10 +1280,19 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], - AC_MSG_RESULT([no]) - ]) - -- build_drmaa_docs=yes --else -- DOXYGEN=none -- build_drmaa_docs=no -+AC_ARG_ENABLE([apidocs], -+ AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation]) -+) -+AS_IF([test "x$enable_apidocs" = "xyes"], -+ [ AX_PROG_DOT -+ AC_PATH_PROG(DOXYGEN, "doxygen", "none") -+ build_drmaa_docs=yes ], -+ [ build_drmaa_docs=no -+ DOXYGEN=none ] -+) -+else -+ DOXYGEN="none" -+ build_drmaa_docs=no - fi - AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"]) - AC_SUBST(build_drmaa_docs) --- -1.7.2.2 - diff --git a/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch b/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch deleted file mode 100644 index 1b57fe6133b1..000000000000 --- a/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 301ac38e30138b2b337391a64d0770ca6a6eb468 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Sat, 25 Jun 2011 21:07:41 -0400 -Subject: [PATCH] disable automagic doc building - -Instead of unconditionally building docs if doxygen is found, only build -at the request of the user. ---- - configure.ac | 23 +++++++++++++++-------- - 1 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8624a5f..2999094 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1323,8 +1323,6 @@ dnl - if test "$build_drmaa" = "yes" ;then - AC_MSG_NOTICE([Configuring DRMAA ...]) - AC_PATH_PROG(GPERF, "gperf") --AX_PROG_DOT --AC_PATH_PROG(DOXYGEN, "doxygen", "none") - AC_C_BIGENDIAN_CROSS - ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])]) - -@@ -1368,12 +1366,21 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], - AC_MSG_RESULT([no]) - ]) - -- build_drmaa_docs=yes -- RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa" --else -- DOXYGEN=none -- build_drmaa_docs=no -- RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa" -+AC_ARG_ENABLE([apidocs], -+ AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation]) -+) -+AS_IF([test "x$enable_apidocs" = "xyes"], -+ [ AX_PROG_DOT -+ AC_PATH_PROG(DOXYGEN, "doxygen", "none") -+ RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa" -+ build_drmaa_docs=yes ], -+ [ build_drmaa_docs=no -+ DOXYGEN=none ] -+) -+else -+ DOXYGEN="none" -+ build_drmaa_docs=no -+ RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa" - fi - AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"]) - AC_SUBST(build_drmaa_docs) --- -1.7.3.4 - diff --git a/sys-cluster/torque/torque-2.4.16-r1.ebuild b/sys-cluster/torque/torque-2.4.16-r1.ebuild deleted file mode 100644 index 5caa85c2c44e..000000000000 --- a/sys-cluster/torque/torque-2.4.16-r1.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16-r1.ebuild,v 1.1 2013/12/23 18:01:35 jsbronder Exp $ - -EAPI=2 -WANT_AUTOMAKE="1.12" -inherit flag-o-matic eutils linux-info autotools - -DESCRIPTION="Resource manager and queuing system based on OpenPBS" -HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque" -SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz" - -LICENSE="openpbs" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="tk +crypt drmaa server +syslog doc cpusets kernel_linux" - -# ed is used by makedepend-sh -DEPEND_COMMON="sys-libs/ncurses - sys-libs/readline - tk? ( dev-lang/tk ) - syslog? ( virtual/logger ) - !games-util/qstat" - -DEPEND="${DEPEND_COMMON} - doc? ( drmaa? ( - || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) - ) ) - sys-apps/ed" - -RDEPEND="${DEPEND_COMMON} - crypt? ( net-misc/openssh ) - !crypt? ( net-misc/netkit-rsh )" - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}" - - # Find a Torque server to use. Check environment, then - # current setup (if any), and fall back on current hostname. - if [ -z "${PBS_SERVER_NAME}" ]; then - if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then - PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)" - else - PBS_SERVER_NAME=$(hostname -f) - fi - fi - - USE_CPUSETS="--disable-cpuset" - if use cpusets; then - if ! use kernel_linux; then - einfo - elog " Torque currently only has support for cpusets in linux." - elog "Assuming you didn't really want this USE flag." - einfo - else - linux-info_pkg_setup - einfo - elog " Torque support for cpusets is still in development, you may" - elog "wish to disable it for production use." - einfo - if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then - einfo - elog " Torque support for cpusets will require that you recompile" - elog "your kernel with CONFIG_CPUSETS enabled." - einfo - fi - USE_CPUSETS="--enable-cpuset" - fi - fi -} - -src_prepare() { - # Unused and causes breakage when switching from glibc to tirpc. - # https://github.com/adaptivecomputing/torque/pull/148 - sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die - - epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch - epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch - epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch - - sed -i \ - -e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \ - -e 's,\(GENERATE_MAN *=\).*,\1 NO,' \ - src/drmaa/Doxyfile.in || die - sed -i \ - -e '/INSTALL_DATA/d' \ - src/drmaa/Makefile.am || die - eautoreconf -} - -src_configure() { - local myconf="--with-rcp=mom_rcp" - - use crypt && myconf="--with-rcp=scp" - - if use drmaa && use doc; then - myconf="${myconf} --enable-apidocs" - else - myconf="${myconf} --disable-apidocs" - fi - - econf \ - $(use_enable tk gui) \ - $(use_enable syslog) \ - $(use_enable server) \ - $(use_enable drmaa) \ - --with-server-home=${PBS_SERVER_HOME} \ - --with-environ=/etc/pbs_environment \ - --with-default-server=${PBS_SERVER_NAME} \ - --disable-gcc-warnings \ - ${USE_CPUSETS} \ - ${myconf} -} - -# WARNING -# OpenPBS is extremely stubborn about directory permissions. Sometimes it will -# just fall over with the error message, but in some spots it will just ignore -# you and fail strangely. Likewise it also barfs on our .keep files! -pbs_createspool() { - local root="$1" - local s="$(dirname "${PBS_SERVER_HOME}")" - local h="${PBS_SERVER_HOME}" - local sp="${h}/server_priv" - einfo "Building spool directory under ${D}${h}" - local a d m - local dir_spec=" - 0755:${h}/aux 0700:${h}/checkpoint - 0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs - 1777:${h}/spool 1777:${h}/undelivered" - - if use server; then - dir_spec="${dir_spec} 0755:${h}/sched_logs - 0755:${h}/sched_priv/accounting 0755:${h}/server_logs - 0750:${h}/server_priv 0755:${h}/server_priv/accounting - 0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts - 0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users - 0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues" - fi - - for a in ${dir_spec}; do - d="${a/*:}" - m="${a/:*}" - if [[ ! -d "${root}${d}" ]]; then - install -d -m${m} "${root}${d}" - else - chmod ${m} "${root}${d}" - fi - # (#149226) If we're running in src_*, then keepdir - if [[ "${root}" = "${D}" ]]; then - keepdir ${d} - fi - done -} - -src_install() { - # Make directories first - pbs_createspool "${D}" - - emake DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGELOG README.* Release_Notes || die "dodoc failed" - if use doc; then - dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed" - if use drmaa; then - dohtml -r src/drmaa/doc/html/* || die - dodoc src/drmaa/drmaa.pdf || die - fi - fi - - # The build script isn't alternative install location friendly, - # So we have to fix some hard-coded paths in tclIndex for xpbs* to work - for file in `find "${D}" -iname tclIndex`; do - sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" || die - mv "${file}.new" "${file}" || die - done - - if use server; then - newinitd "${FILESDIR}"/pbs_server-init.d pbs_server - newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched - fi - newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom - newconfd "${FILESDIR}"/torque-conf.d torque - newenvd "${FILESDIR}"/torque-env.d 25torque - - [ -d "${D}"/usr/share/doc/torque-drmaa ] && \ - rm -rf "${D}"/usr/share/doc/torque-drmaa -} - -pkg_preinst() { - if [[ -f "${ROOT}etc/pbs_environment" ]]; then - cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment - fi - - echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" - - # Fix up the env.d file to use our set server home. - sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" \ - "${D}"/etc/env.d/25torque || die -} - -pkg_postinst() { - pbs_createspool "${ROOT}" - elog " If this is the first time torque has been installed, then you are not" - elog "ready to start the server. Please refer to the documentation located at:" - elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki" - - elog " For a basic setup, you may use emerge --config ${PN}" -} - -# root will be setup as the primary operator/manager, the local machine -# will be added as a node and we'll create a simple queue, batch. -pkg_config() { - local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')" - local rc=0 - - ebegin "Configuring Torque" - einfo "Using ${h} as the pbs homedir" - einfo "Using ${PBS_SERVER_NAME} as the pbs_server" - - # Check for previous configuration and bail if found. - if [ -e "${h}/server_priv/acl_svr/operators" ] \ - || [ -e "${h}/server_priv/nodes" ] \ - || [ -e "${h}/mom_priv/config" ]; then - ewarn "Previous Torque configuration detected. Press any key to" - ewarn "continue or press Control-C to abort now" - read - fi - - # pbs_mom configuration. - echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" - echo "\$logevent 255" >> "${h}/mom_priv/config" - - if use server; then - local qmgr="${ROOT}/usr/bin/qmgr -c" - # pbs_server bails on repeated backslashes. - if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -d "${h}" -t create; then - eerror "Failed to start pbs_server" - rc=1 - else - ${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} - ${qmgr} "create queue batch" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} - ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} - ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} - ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} - - "${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1 - - # Add the local machine as a node. - echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" - fi - fi - eend ${rc} -} diff --git a/sys-cluster/torque/torque-2.4.16.ebuild b/sys-cluster/torque/torque-2.4.16.ebuild deleted file mode 100644 index 15435b5fb5d1..000000000000 --- a/sys-cluster/torque/torque-2.4.16.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.16.ebuild,v 1.14 2013/12/23 18:01:35 jsbronder Exp $ - -EAPI=2 -WANT_AUTOMAKE="1.12" -inherit flag-o-matic eutils linux-info autotools - -DESCRIPTION="Resource manager and queuing system based on OpenPBS" -HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque" -SRC_URI="http://www.adaptivecomputing.com/resources/downloads/${PN}/${P}.tar.gz" - -LICENSE="openpbs" - -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="tk +crypt drmaa server +syslog doc cpusets kernel_linux" - -# ed is used by makedepend-sh -DEPEND_COMMON="sys-libs/ncurses - sys-libs/readline - tk? ( dev-lang/tk ) - syslog? ( virtual/logger ) - !games-util/qstat" - -DEPEND="${DEPEND_COMMON} - doc? ( drmaa? ( - || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) - ) ) - sys-apps/ed" - -RDEPEND="${DEPEND_COMMON} - crypt? ( net-misc/openssh ) - !crypt? ( net-misc/netkit-rsh )" - -pkg_setup() { - PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}" - - # Find a Torque server to use. Check environment, then - # current setup (if any), and fall back on current hostname. - if [ -z "${PBS_SERVER_NAME}" ]; then - if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then - PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)" - else - PBS_SERVER_NAME=$(hostname -f) - fi - fi - - USE_CPUSETS="--disable-cpuset" - if use cpusets; then - if ! use kernel_linux; then - einfo - elog " Torque currently only has support for cpusets in linux." - elog "Assuming you didn't really want this USE flag." - einfo - else - linux-info_pkg_setup - einfo - elog " Torque support for cpusets is still in development, you may" - elog "wish to disable it for production use." - einfo - if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then - einfo - elog " Torque support for cpusets will require that you recompile" - elog "your kernel with CONFIG_CPUSETS enabled." - einfo - fi - USE_CPUSETS="--enable-cpuset" - fi - fi -} - -src_prepare() { - # Unused and causes breakage when switching from glibc to tirpc. - # https://github.com/adaptivecomputing/torque/pull/148 - sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die - - epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch - epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch - epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch - - sed -i \ - -e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \ - -e 's,\(GENERATE_MAN *=\).*,\1 NO,' \ - src/drmaa/Doxyfile.in || die - sed -i \ - -e '/INSTALL_DATA/d' \ - src/drmaa/Makefile.am || die - eautoreconf -} - -src_configure() { - local myconf="--with-rcp=mom_rcp" - - use crypt && myconf="--with-rcp=scp" - - if use drmaa && use doc; then - myconf="${myconf} --enable-apidocs" - else - myconf="${myconf} --disable-apidocs" - fi - - econf \ - $(use_enable tk gui) \ - $(use_enable syslog) \ - $(use_enable server) \ - $(use_enable drmaa) \ - --with-server-home=${PBS_SERVER_HOME} \ - --with-environ=/etc/pbs_environment \ - --with-default-server=${PBS_SERVER_NAME} \ - --disable-gcc-warnings \ - ${USE_CPUSETS} \ - ${myconf} -} - -# WARNING -# OpenPBS is extremely stubborn about directory permissions. Sometimes it will -# just fall over with the error message, but in some spots it will just ignore -# you and fail strangely. Likewise it also barfs on our .keep files! -pbs_createspool() { - local root="$1" - local s="$(dirname "${PBS_SERVER_HOME}")" - local h="${PBS_SERVER_HOME}" - local sp="${h}/server_priv" - einfo "Building spool directory under ${D}${h}" - local a d m - local dir_spec=" - 0755:${h}/aux 0700:${h}/checkpoint - 0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs - 1777:${h}/spool 1777:${h}/undelivered" - - if use server; then - dir_spec="${dir_spec} 0755:${h}/sched_logs - 0755:${h}/sched_priv/accounting 0755:${h}/server_logs - 0750:${h}/server_priv 0755:${h}/server_priv/accounting - 0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts - 0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users - 0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues" - fi - - for a in ${dir_spec}; do - d="${a/*:}" - m="${a/:*}" - if [[ ! -d "${root}${d}" ]]; then - install -d -m${m} "${root}${d}" - else - chmod ${m} "${root}${d}" - fi - # (#149226) If we're running in src_*, then keepdir - if [[ "${root}" = "${D}" ]]; then - keepdir ${d} - fi - done -} - -src_install() { - # Make directories first - pbs_createspool "${D}" - - emake DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGELOG README.* Release_Notes || die "dodoc failed" - if use doc; then - dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed" - if use drmaa; then - dohtml -r src/drmaa/doc/html/* || die - dodoc src/drmaa/drmaa.pdf || die - fi - fi - - # The build script isn't alternative install location friendly, - # So we have to fix some hard-coded paths in tclIndex for xpbs* to work - for file in `find "${D}" -iname tclIndex`; do - sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" || die - mv "${file}.new" "${file}" || die - done - - if use server; then - newinitd "${FILESDIR}"/pbs_server-init.d pbs_server - newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched - fi - newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom - newconfd "${FILESDIR}"/torque-conf.d torque - newenvd "${FILESDIR}"/torque-env.d 25torque - - [ -d "${D}"/usr/share/doc/torque-drmaa ] && \ - rm -rf "${D}"/usr/share/doc/torque-drmaa -} - -pkg_preinst() { - if [[ -f "${ROOT}etc/pbs_environment" ]]; then - cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment - fi - - echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" - - # Fix up the env.d file to use our set server home. - sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" \ - "${D}"/etc/env.d/25torque || die -} - -pkg_postinst() { - pbs_createspool "${ROOT}" - elog " If this is the first time torque has been installed, then you are not" - elog "ready to start the server. Please refer to the documentation located at:" - elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki" - - elog " For a basic setup, you may use emerge --config ${PN}" -} - -# root will be setup as the primary operator/manager, the local machine -# will be added as a node and we'll create a simple queue, batch. -pkg_config() { - local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')" - local rc=0 - - ebegin "Configuring Torque" - einfo "Using ${h} as the pbs homedir" - einfo "Using ${PBS_SERVER_NAME} as the pbs_server" - - # Check for previous configuration and bail if found. - if [ -e "${h}/server_priv/acl_svr/operators" ] \ - || [ -e "${h}/server_priv/nodes" ] \ - || [ -e "${h}/mom_priv/config" ]; then - ewarn "Previous Torque configuration detected. Press any key to" - ewarn "continue or press Control-C to abort now" - read - fi - - # pbs_mom configuration. - echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" - echo "\$logevent 255" >> "${h}/mom_priv/config" - - if use server; then - local qmgr="${ROOT}/usr/bin/qmgr -c" - # pbs_server bails on repeated backslashes. - if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -d "${h}" -t create; then - eerror "Failed to start pbs_server" - rc=1 - else - ${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} - ${qmgr} "create queue batch" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} - ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} - ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} - ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} - ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} - - "${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1 - - # Add the local machine as a node. - echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" - fi - fi - eend ${rc} -} |