diff options
| -rw-r--r-- | sys-cluster/torque/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-cluster/torque/Manifest | 18 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-2.3.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-2.3.1.ebuild | 6 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-2.3.2.ebuild | 6 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-2.3.3.ebuild | 14 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-2.3.6.ebuild | 223 |
7 files changed, 258 insertions, 26 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 2fc6066c8b24..b66973bed216 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/torque -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.75 2008/08/15 19:06:40 jsbronder Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.76 2009/01/08 23:21:21 jsbronder Exp $ + +*torque-2.3.6 (08 Jan 2009) + + 08 Jan 2009; Justin Bronder <jsbronder@gentoo.org> torque-2.3.0-r1.ebuild, + torque-2.3.1.ebuild, torque-2.3.2.ebuild, torque-2.3.3.ebuild, + +torque-2.3.6.ebuild: + Bump sys-cluster/torque-2.3.6. Fix repoman warnings. *torque-2.3.3 (15 Aug 2008) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 775cc45e9905..dfedc1d43dc9 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -20,17 +20,19 @@ DIST torque-2.3.0.tar.gz 5419629 RMD160 7dd4885cda583aa8ba16dce7b9001c009f264881 DIST torque-2.3.1.tar.gz 5447820 RMD160 c4152ff383940965cd77274e4f94a0350f8fb87e SHA1 0fa5729f55fd309dde6b8163375e8968ca9cae89 SHA256 5f628c19155c2c5d2bb3cc45276637b80652304ea8c918c20b0d8591c02ac970 DIST torque-2.3.2.tar.gz 5449890 RMD160 e3008e298c2a15d4462f00cd2759eea1561aad75 SHA1 d0f310524de0bdc25b88923da1170d9829c15072 SHA256 d87ce913a3ce3b78b6938a799c41d014d8f9da3c936587014e0e310012bdfb7e DIST torque-2.3.3.tar.gz 5460551 RMD160 bacd094e468466d8560950c96bb83a0b23136d53 SHA1 383cdad21591ff710ef51f28ccb667c00ccd6466 SHA256 70b100ee3c295300fb473ca77e40146c6c54685df9c1eb841b6fcd74a5193930 +DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3 EBUILD torque-2.2.1-r2.ebuild 7202 RMD160 1bf67f7e5a7d2bd813ceca38739a873ac36c35d4 SHA1 37e2c5bd0c6bb3fcc90f8869a6eae0b299448dd5 SHA256 113a0e6629f1e7208b55edb7760f3ae8127f5ca4f3d8dea24cd10188a222e363 -EBUILD torque-2.3.0-r1.ebuild 7304 RMD160 b7efed57577bf9f1ed063d743b083d1f5bfb3c3f SHA1 1301f8bdbd6144303e744e0768016da80c9ff141 SHA256 5d3b1df074eea6db5bb5f259f988b9530908e8be2a0371c88a60f23c3f0b317a -EBUILD torque-2.3.1.ebuild 7372 RMD160 ac7109801868b04268577a66437a01e59d1dffd4 SHA1 15e4de5c13a299abf4dde6cd1d2b6527f085b563 SHA256 01635436345748dbdc32778d6bb05e6af3f701261eedaa19bb52b7fee45c98a1 -EBUILD torque-2.3.2.ebuild 7104 RMD160 5f68c29cbd3406b75801480042c617d89acb4a0a SHA1 c6defac30064277a2713b659f3bfb6a206bac607 SHA256 4f51d80451661b483cfae9cb2e52dce018d6f79c6a378c7c5c99fd4809f35d53 -EBUILD torque-2.3.3.ebuild 7104 RMD160 1f873f37b3b4b8342df79e29e701c4fee48d9c50 SHA1 48721a5adbf596759c473cec709c431231f818a0 SHA256 691adcd9b85df4a3e73e8cf058ce3205e128ef383a1529933d55ea402a7326a7 -MISC ChangeLog 13111 RMD160 27cbc727351ccdc8db8abbdb2c9d365ed501c56a SHA1 9fffce1a2fec8b62d2636b6cb616fe207fe5466d SHA256 3cb52361cbd074fa0b4a5ec131f5ab7bd8e3dd229466e374e34ef06a8656c2a3 +EBUILD torque-2.3.0-r1.ebuild 7297 RMD160 15b48329b60b13a98162667dce535aa16a3ff432 SHA1 6246b748f2186676152dcd7d207ec774741d5d22 SHA256 250027357f887beedcfe26300d615ba49289b7fb2ce55834ca9b091a25a41b70 +EBUILD torque-2.3.1.ebuild 7366 RMD160 ef298bcbd05f92af2ff81ec0b9773bcace74347f SHA1 076151dd206f6b716b53647978e979f7f41218db SHA256 a37911c5d9d2b3e3407165f1cc3fbee400dee9b3424c6bde66b552bd0547bb39 +EBUILD torque-2.3.2.ebuild 7094 RMD160 41a306bba393544de9894749e7875a7cd7799b2b SHA1 adca84d1d0fdebf81858fae5b0cd41326433c7f7 SHA256 aa7fd02cfd38cfc131de441c5ae768f6fe5d119b32b4081657ecfd307698c008 +EBUILD torque-2.3.3.ebuild 7117 RMD160 87e25bd3ee3b57ccd009186dabfafbe44f25791a SHA1 dd43455831cf1ad6e294d6fa68dd170f87205ffb SHA256 667f96a9d46ed9fe7b1434d498cebfd8f5a22b16fc71dd66b723678908802f06 +EBUILD torque-2.3.6.ebuild 7117 RMD160 5d6f026db2e23ade21d3dab79992a1fec2bb81c4 SHA1 24445bb02e4c5df76311dc4a1428c2faad028d60 SHA256 0660f499b9e25da5dcce8b5e6f22332d85f8a1c0469d56c40b1813bd88124ff6 +MISC ChangeLog 13363 RMD160 f466e150ad307d55c1165bd7fc4a8541a3289a80 SHA1 afad622fdf0389c69d8d1d5f01f78d2cfa3ce5a6 SHA256 df1885e3cedf927491880cb7548c0d95db303f402ed31ddb65a1e8b8341f4cb3 MISC metadata.xml 408 RMD160 2e54db44d11d613a63e03b54fcf813e78a3a82ab SHA1 fa42ab203f728c413b11f5011b5023b81e8c1d6f SHA256 ab9c6a8648593628730cff1018cdb2e5a898f68a1df9902d68ca6fafb771b960 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkil08YACgkQ4MrvBE1wQ8me5ACcDKbDvFVnHEWe/eK7gDQl5J1k -7dQAn0ekltIYU0ACnNGbNKvBLcTmWHOz -=n2wY +iEYEARECAAYFAklminwACgkQ4MrvBE1wQ8kzigCgspUsV7QgHbSp5z/g6xskG1kp +E2EAnjJSUn6t59BeTy/thj9VOWQYCLVI +=h1s5 -----END PGP SIGNATURE----- diff --git a/sys-cluster/torque/torque-2.3.0-r1.ebuild b/sys-cluster/torque/torque-2.3.0-r1.ebuild index 351fc831fe9d..b2a2d7db1cd6 100644 --- a/sys-cluster/torque/torque-2.3.0-r1.ebuild +++ b/sys-cluster/torque/torque-2.3.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0-r1.ebuild,v 1.5 2008/06/18 13:04:11 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0-r1.ebuild,v 1.6 2009/01/08 23:21:21 jsbronder Exp $ -inherit autotools flag-o-matic eutils linux-info +inherit flag-o-matic eutils linux-info DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.clusterresources.com/products/torque/" diff --git a/sys-cluster/torque/torque-2.3.1.ebuild b/sys-cluster/torque/torque-2.3.1.ebuild index e690a44bcdcc..5dc0f721ab67 100644 --- a/sys-cluster/torque/torque-2.3.1.ebuild +++ b/sys-cluster/torque/torque-2.3.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.1.ebuild,v 1.2 2008/08/11 17:12:05 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.1.ebuild,v 1.3 2009/01/08 23:21:21 jsbronder Exp $ -inherit autotools flag-o-matic eutils linux-info +inherit flag-o-matic eutils linux-info DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.clusterresources.com/products/torque/" diff --git a/sys-cluster/torque/torque-2.3.2.ebuild b/sys-cluster/torque/torque-2.3.2.ebuild index a59595604d86..9998f739b3fb 100644 --- a/sys-cluster/torque/torque-2.3.2.ebuild +++ b/sys-cluster/torque/torque-2.3.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.2.ebuild,v 1.1 2008/08/12 00:16:08 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.2.ebuild,v 1.2 2009/01/08 23:21:21 jsbronder Exp $ -inherit autotools flag-o-matic eutils linux-info +inherit flag-o-matic eutils linux-info DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.clusterresources.com/products/torque/" diff --git a/sys-cluster/torque/torque-2.3.3.ebuild b/sys-cluster/torque/torque-2.3.3.ebuild index 2c750c8638e3..6a8e8da250b1 100644 --- a/sys-cluster/torque/torque-2.3.3.ebuild +++ b/sys-cluster/torque/torque-2.3.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.3.ebuild,v 1.1 2008/08/15 19:06:40 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.3.ebuild,v 1.2 2009/01/08 23:21:21 jsbronder Exp $ -inherit autotools flag-o-matic eutils linux-info +inherit flag-o-matic eutils linux-info DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.clusterresources.com/products/torque/" @@ -176,12 +176,12 @@ pkg_postinst() { # 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="${ROOT}/${PBS_SERVER_HOME}" + local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')" local rc=0 ebegin "Configuring Torque" [ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f) - einfo "Using ${PBS_SERVER_HOME} as the pbs homedir" + einfo "Using ${h} as the pbs homedir" einfo "Using ${PBS_SERVER_NAME} as the pbs_server" # Check for previous configuration and bail if found. @@ -199,8 +199,8 @@ pkg_config() { if use server; then local qmgr="${ROOT}/usr/bin/qmgr -c" - if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \ - -d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; then + # 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 diff --git a/sys-cluster/torque/torque-2.3.6.ebuild b/sys-cluster/torque/torque-2.3.6.ebuild new file mode 100644 index 000000000000..05869a103653 --- /dev/null +++ b/sys-cluster/torque/torque-2.3.6.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.6.ebuild,v 1.1 2009/01/08 23:21:21 jsbronder Exp $ + +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="openpbs" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="tk crypt server syslog doc cpusets kernel_linux" +PROVIDE="virtual/pbs" + +# ed is used by makedepend-sh +DEPEND_COMMON="virtual/libc + sys-libs/ncurses + sys-libs/readline + tk? ( dev-lang/tk ) + syslog? ( virtual/logger ) + !virtual/pbs + !sys-cluster/openpbs-common + !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}" + + 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_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_compile() { + local myconf="--with-rcp=mom_rcp" + + use crypt && myconf="--with-rcp=scp" + + [ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f) + + econf \ + $(use_enable tk gui) \ + $(use_enable syslog) \ + $(use_enable server) \ + --with-server-home=${PBS_SERVER_HOME} \ + --with-environ=/etc/pbs_environment \ + --with-default-server=${PBS_SERVER_NAME} \ + --disable-gcc-warnings \ + ${USE_CPUSETS} \ + ${myconf} \ + || die "econf failed" + emake || die "emake 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 DEVELOPMENT 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-2.2.1-r1 pbs_server + newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched + fi + newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom + newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque + newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque +} + +pkg_preinst() { + if [[ -f "${ROOT}etc/pbs_environment" ]]; then + cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment + fi + + if [ -n "${PBS_SERVER_NAME}" ]; then + echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" + elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then + cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name" + fi + + # 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 +} + +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}" +} + +# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set +# or we use the default HOME and the localhost as the server. +# 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" + [ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f) + 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} +} |