[gridengine/f13/master] - Exclude ppc64 - no java 1.6.0

[Orion Poplawski]

commit f71bae558ca349d83a2c7317d0d94dcb77565a43
Author: Orion Poplawski <orion at fedoraproject.org>
Date:   Mon Jul 12 18:18:02 2010 +0000

    - Exclude ppc64 - no java 1.6.0

 README               |   20 +++++++++++++-------
 gridengine.spec      |    6 +++++-
 gridengine.sysconfig |    2 ++
 sge_execd            |    4 +++-
 4 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/README b/README
index 3f4fd4c..282a299 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ on the localhost line, like the following:
 
 127.0.0.1		localhost.localdomain localhost hostname
 
-On the qmaster (and any shadow hosts) install gridengine-qmaster, then:
+- On the qmaster (and any shadow hosts) install gridengine-qmaster, then:
 
  1)
   cd /usr/share/gridengine
@@ -21,17 +21,23 @@ OR
 
    ./install_qmaster -auto my_configuration.conf
 
- 3) Make sure the files act_qmaster and bootstrap from the directory
-    /usr/share/gridengine/default/common/ are shared to all clients.  If you
-    don't run with a shadow master configuration you can simply copy these
-    files to the other machines.
+ 3) Make sure the files act_qmaster, bootstrap, and settings.*sh from the
+    directory /usr/share/gridengine/default/common/ are shared to all clients.
+    If you don't run with a shadow master configuration you can simply copy
+    these files to the other machines.
 
 If you change the default SGE_ROOT or SGE_CELL values, you will need to
 edit /etc/sysconfig/gridengine and change them there as well for the startup
 scripts to work.
 
-On execution hosts install gridengine-execd, then:
+- On execution hosts install gridengine-execd, then:
+
   cd /usr/share/gridengine
   ./install_execd
 
-On submit hosts install gridengine
+OR if you have a default install, you may be able to just do:
+
+  chkconfig sge_execd on
+  service sge_execd start
+
+- On submit hosts install gridengine
diff --git a/gridengine.spec b/gridengine.spec
index f5712c7..e273adb 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -70,6 +70,7 @@ Patch26: gridengine-6.2beta2-error.patch
 # Workaround for openssl-1.0 API change
 Patch27: gridengine-6.2u3-openssl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc64
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
 BuildRequires: libXmu-devel, libXpm-devel
@@ -550,6 +551,9 @@ fi
 
 
 %changelog
+* Mon Jul 12 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-3
+- Exclude ppc64 - no java 1.6.0
+
 * Tue Feb 16 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-2
 - Update ssl patch to add -lcrypt to fix FTBFS bug #565003
 
diff --git a/gridengine.sysconfig b/gridengine.sysconfig
index f4787bf..a87a68a 100644
--- a/gridengine.sysconfig
+++ b/gridengine.sysconfig
@@ -1,2 +1,4 @@
 SGE_ROOT=/usr/share/gridengine
 SGE_CELL=default
+#Uncomment this if using infiniband to remove the locked memory limit
+#RTLIMIT_MEMLOCKED=unlimited
diff --git a/sge_execd b/sge_execd
index 1748ade..c1bdbd9 100644
--- a/sge_execd
+++ b/sge_execd
@@ -2,7 +2,7 @@
 #
 # sge_execd Gridengine execution daemon
 #
-# chkconfig:   - 98 02
+# chkconfig:   - 99 01
 # description: The Gridexecution daemon starts and manages grid jobs
 
 ### BEGIN INIT INFO
@@ -50,6 +50,8 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
     [ -x $exec ] || exit 5
+    #Set maximum locked memory, needed for infiniband support
+    [ -n "$RLIMIT_MEMLOCKED" ] && ulimit -l $RLIMIT_MEMLOCKED
     echo -n $"Starting $prog: "
     daemon --check $prog --pidfile=$pidfile $exec
     retval=$?