* [gentoo-commits] gentoo-x86 commit in sys-cluster/torque: torque-2.5.6.ebuild ChangeLog metadata.xml
@ 2011-06-26 0:47 Justin Bronder (jsbronder)
0 siblings, 0 replies; only message in thread
From: Justin Bronder (jsbronder) @ 2011-06-26 0:47 UTC (permalink / raw
To: gentoo-commits
jsbronder 11/06/26 00:47:16
Modified: ChangeLog metadata.xml
Added: torque-2.5.6.ebuild
Log:
Version bump, add munge support
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Revision Changes Path
1.110 sys-cluster/torque/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/ChangeLog?r1=1.109&r2=1.110
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog 14 Mar 2011 20:30:21 -0000 1.109
+++ ChangeLog 26 Jun 2011 00:47:16 -0000 1.110
@@ -1,6 +1,13 @@
# ChangeLog for sys-cluster/torque
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.109 2011/03/14 20:30:21 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.110 2011/06/26 00:47:16 jsbronder Exp $
+
+*torque-2.5.6 (26 Jun 2011)
+
+ 26 Jun 2011; Justin Bronder <jsbronder@gentoo.org> +torque-2.5.6.ebuild,
+ +files/pbs_mom-init.d-munge, +files/pbs_server-init.d-munge,
+ +files/torque-conf.d-munge, metadata.xml:
+ Version bump, add munge support
*torque-2.4.12 (14 Mar 2011)
1.7 sys-cluster/torque/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/metadata.xml?r1=1.6&r2=1.7
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/torque/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml 10 Sep 2010 19:49:24 -0000 1.6
+++ metadata.xml 26 Jun 2011 00:47:16 -0000 1.7
@@ -8,6 +8,7 @@
<use>
<flag name='cpusets'>Enable pbs_mom to utilize linux cpusets if available.</flag>
<flag name='drmaa'>Enable the Distributed Resource Management Application API.</flag>
+ <flag name='munge'>Enable authentication via munge.</flag>
<flag name='server'>Enable compilation of pbs_server and pbs_sched.</flag>
</use>
</pkgmetadata>
1.1 sys-cluster/torque/torque-2.5.6.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/torque-2.5.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/torque/torque-2.5.6.ebuild?rev=1.1&content-type=text/plain
Index: torque-2.5.6.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.6.ebuild,v 1.1 2011/06/26 00:47:16 jsbronder Exp $
EAPI=2
inherit flag-o-matic eutils linux-info
DESCRIPTION="Resource manager and queuing system based on OpenPBS"
HOMEPAGE="http://www.clusterresources.com/products/torque/"
SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="cpusets +crypt doc drmaa kernel_linux munge server +syslog threads tk xml"
# ed is used by makedepend-sh
DEPEND_COMMON="sys-libs/ncurses
sys-libs/readline
munge? ( sys-auth/munge )
tk? ( dev-lang/tk )
syslog? ( virtual/logger )
!games-util/qstat"
DEPEND="${DEPEND_COMMON}
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-cpusets"
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-cpusets"
fi
fi
}
src_configure() {
local myconf="--with-rcp=mom_rcp"
use crypt && myconf="--with-rcp=scp"
econf \
$(use_enable tk gui) \
$(use_enable syslog) \
$(use_enable server) \
$(use_enable drmaa) \
$(use_enable threads high-availability) \
$(use_enable xml server-xml) \
$(use_enable munge munge-auth) \
--with-server-home=${PBS_SERVER_HOME} \
--with-environ=/etc/pbs_environment \
--with-default-server=${PBS_SERVER_NAME} \
--disable-gcc-warnings \
--with-tcp-retry-limit=2 \
${USE_CPUSETS} \
${myconf} \
|| die "econf failed"
}
# 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}"
make 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"
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"
mv "${file}.new" "${file}"
done
if use server; then
newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
fi
newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
newconfd "${FILESDIR}"/torque-conf.d-munge torque
newenvd "${FILESDIR}"/torque-env.d 25torque
}
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
if use munge; then
sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
fi
}
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}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-26 0:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-26 0:47 [gentoo-commits] gentoo-x86 commit in sys-cluster/torque: torque-2.5.6.ebuild ChangeLog metadata.xml Justin Bronder (jsbronder)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox