diff options
author | Justin Bronder <jsbronder@gentoo.org> | 2012-03-07 02:26:43 +0000 |
---|---|---|
committer | Justin Bronder <jsbronder@gentoo.org> | 2012-03-07 02:26:43 +0000 |
commit | 514a46789bec8641789d82de4e959f0cf2a901db (patch) | |
tree | 5da1cdefe46983d299a913b2a84633816c9cc5a9 /sys-cluster | |
parent | Correctly update src_uri (diff) | |
download | historical-514a46789bec8641789d82de4e959f0cf2a901db.tar.gz historical-514a46789bec8641789d82de4e959f0cf2a901db.tar.bz2 historical-514a46789bec8641789d82de4e959f0cf2a901db.zip |
version bump
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/torque/ChangeLog | 7 | ||||
-rw-r--r-- | sys-cluster/torque/Manifest | 10 | ||||
-rw-r--r-- | sys-cluster/torque/torque-3.0.4.ebuild | 248 |
3 files changed, 260 insertions, 5 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 57084a3292d1..a5197cdf4601 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/torque # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.137 2012/03/07 02:21:39 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.138 2012/03/07 02:26:43 jsbronder Exp $ + +*torque-3.0.4 (07 Mar 2012) + + 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> +torque-3.0.4.ebuild: + version bump 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild, torque-2.4.16.ebuild, torque-2.5.9.ebuild, torque-3.0.3.ebuild: diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index b5432f2cb784..04285bd2e27f 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -17,16 +17,18 @@ DIST torque-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d9 DIST torque-2.4.16.tar.gz 5705768 RMD160 cd08cc44e9f5c9ce7202d50ee11cb2801ac3a8ab SHA1 11cec0cd980ab0652876e37ece607ff120b383e8 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d DIST torque-2.5.9.tar.gz 5853931 RMD160 87ebf548d9a5cf6e56b7bdd9ec8d6c9082e1de99 SHA1 d0375b739854a545782f358d59029046066a59a2 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9 DIST torque-3.0.3.tar.gz 5882061 RMD160 ee89a38039f9387deb0e8ecd815a886ecdb5c883 SHA1 031d118f213112d7dcf66c7c083ce5aa10608285 SHA256 76c9d672704fd6cf7742a32187e86a64034178411cbe011060e2fe3855604a2a +DIST torque-3.0.4.tar.gz 5885721 RMD160 8679da928c00c7cf569a35cf7cce83e994626329 SHA1 074329b17b46eac3991bddbfeca4d646a5383d11 SHA256 f73780adf897a18b6e45a17bace3d4ad0091a20de51275c2ef770f1ce1243852 EBUILD torque-2.3.13.ebuild 7792 RMD160 01c7e49b7c55fcad2505a29005b88a343a214455 SHA1 f14608ee84bd41aa2df68ce2858f6ced5e5d288a SHA256 39685a289a0cb231f492f937733b541aa85aca34b9a2a39824aeb003820a63ed EBUILD torque-2.4.16.ebuild 7724 RMD160 796939235ae75e7476fe16efdfb5758a3dd2f1c1 SHA1 b1ae1187a0234a859b100225c88ba09573800f55 SHA256 5074c7f9f8e4c4fa414352d30dfc69188aa5bd2767dd34e0f90c979c493b232d EBUILD torque-2.5.9.ebuild 7361 RMD160 6db18b500d263bcc8934a270deb2d4b63c33a44f SHA1 a1140389dec248678ba67ba3732acd9f7d34e15c SHA256 5b5475de517fe28b8648f2e08d3f99639c33449561d0ec7789e83a1a096e63d0 EBUILD torque-3.0.3.ebuild 8010 RMD160 7277259ef428bb687844407782fa897bf31c4163 SHA1 c6209d81b129fd4bb23a875d1d8f77d5b7bab267 SHA256 d78ea1864b57141b461c036089452958b4ba9789d9df851ae3552f94dce8631d -MISC ChangeLog 22827 RMD160 af43f76a5866f9d6a22317e057b9e6a06d949202 SHA1 44026cbea9539e16794daf2ed9436fb45b591e27 SHA256 5ed4ee6d5734d0770de5be1f60d2ff1d4ce9915e91d01e23222514732d1477f7 +EBUILD torque-3.0.4.ebuild 8010 RMD160 51816d9309ff532ed25e1fa7fdc1e56e0b5be63a SHA1 5867475dd0da22a5848fa0f6b150204fc61bdcb1 SHA256 3ea581fcde235e51e0a6d79578c0191a0564da124cea7ff66fb818441d6a5649 +MISC ChangeLog 22947 RMD160 e7ae36c1ed598a89168de47eb7d81cd11dbd2435 SHA1 d29bb8410945cdd4994542f39028156a3430fb12 SHA256 61b59727be1be29b459abe53e671916cf9d033c12068e06f405f6841086acbbe MISC metadata.xml 549 RMD160 9fb7dd9648470fa355b59cb855da7a1abbbc92d4 SHA1 3ce3726e415cf3e0a7aabb9bd71adee605d5cb5d SHA256 64bc2bf6a305af729513a2223a96b4255ce8e15391e4d22fda15d7b346baba4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9WxjkACgkQ4MrvBE1wQ8lmtgCgjqWiTWTfnWJEQQFhWanVKOKP -QQIAnRqU/JSyji97aeR7QqJqQHkZ4t8D -=gqMC +iEYEARECAAYFAk9Wx2kACgkQ4MrvBE1wQ8kMJgCeJRwe09TK+d/vh1drrNF8pLHB +4AAAniP6CK/wS5lN6Q1cZqW+GUlvMrMs +=oZRH -----END PGP SIGNATURE----- diff --git a/sys-cluster/torque/torque-3.0.4.ebuild b/sys-cluster/torque/torque-3.0.4.ebuild new file mode 100644 index 000000000000..292f71c7bbe4 --- /dev/null +++ b/sys-cluster/torque/torque-3.0.4.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.4.ebuild,v 1.1 2012/03/07 02:26:43 jsbronder Exp $ + +EAPI=2 +inherit flag-o-matic eutils linux-info autotools + +DESCRIPTION="Resource manager and queuing system based on OpenPBS" +HOMEPAGE="http://www.adaptivecomputing.com/products/torque.php" +SRC_URI="http://www.adaptivecomputing.com/resources/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" + +# 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 + !sys-cluster/slurm" + +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() { + # as-needed fix, libutils.a needs librt. + sed -i 's,^\(LDADD = .*\)$(MOMLIBS) $(PBS_LIBS),\1$(PBS_LIBS) $(MOMLIBS),' \ + src/resmom/Makefile.am || die + eautoreconf || die +} + +src_configure() { + local myconf="--with-rcp=mom_rcp" + + use crypt && myconf="--with-rcp=scp" + + # Note: Nvidia GPU support is currently disabled pending user + # interest and ability to test. + econf \ + $(use_enable tk gui) \ + $(use_enable syslog) \ + $(use_enable server) \ + $(use_enable drmaa) \ + $(use_enable threads high-availability) \ + $(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} +} + +# 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}" || die + else + chmod ${m} "${root}${d}" || die + fi + # (#149226) If we're running in src_*, then keepdir + if [[ "${root}" = "${D}" ]]; then + keepdir ${d} || die + 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" + 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}" || die + done + + if use server; then + newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server || die + newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched || die + fi + newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom || die + newconfd "${FILESDIR}"/torque-conf.d-munge torque || die + newenvd "${FILESDIR}"/torque-env.d 25torque || die +} + +pkg_preinst() { + if [[ -f "${ROOT}etc/pbs_environment" ]]; then + cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die + fi + + echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die + + # 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 + + 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}" + if use server; then + elog " The format for the serverdb is now xml only. If you do not want" + elog "this, reverting to 2.4.x is your only option. The upgrade will" + elog "happen automatically when pbs_server is restarted" + fi + elog " The on-wire protocol version has been bumped from 1 to 2." + elog "Versions of Torque before 3.0.0 are no longer able to communicate." +} + +# 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 Enter to" + ewarn "continue or Control-C to abort now" + read + fi + + # pbs_mom configuration. + echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die + echo "\$logevent 255" >> "${h}/mom_priv/config" || die + + if use server; then + local qmgr="${ROOT}/usr/bin/qmgr -c" + # pbs_server bails on repeated backslashes. + if ! "${ROOT}"/usr/sbin/pbs_server -f -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} \ + || die + + "${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" || die + fi + fi + eend ${rc} +} |