[gridengine/f16] Update linux 3 patch to fix installed arch script as well
Orion Poplawski
orion at fedoraproject.org
Fri Oct 14 20:26:53 UTC 2011
commit ac5eb88e28240589984ffdf46f5f8bd00af4e5ae
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Oct 14 14:26:52 2011 -0600
Update linux 3 patch to fix installed arch script as well
gridengine-linux3.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
gridengine.spec | 5 ++++-
2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/gridengine-linux3.patch b/gridengine-linux3.patch
index e249f41..59f6c58 100644
--- a/gridengine-linux3.patch
+++ b/gridengine-linux3.patch
@@ -14,3 +14,45 @@
esac
ARCH=${unsupported}lx${lxrelease}-${lxmachine}
;;
+--- SGE6.2u5p2/source/dist/util/arch.dist.linux3 2011-04-05 11:27:49.000000000 -0600
++++ SGE6.2u5p2/source/dist/util/arch.dist 2011-10-14 14:22:28.640861864 -0600
+@@ -216,24 +216,11 @@
+ esac
+
+ case $osrelease in
+- 2.[46].*)
+- # retrieve os release. We use 2.4 on kernel 2.6 machines, unless
+- # we have binaries installed that have been built for 2.6
+- case $osrelease in
+- 2.4.*)
+- lxrelease=24
+- ;;
+- 2.6.*)
+- ROOT_DIR=`dirname $0`/..
+- if [ "$SGE_ROOT" != "" -a -d "$SGE_ROOT/bin/lx26-${lxmachine}" ] ; then
+- lxrelease=26
+- elif [ "$SGE_ROOT" = "" -a -d "$ROOT_DIR/bin/lx26-${lxmachine}" ] ; then
+- lxrelease=26
+- else
+- lxrelease=24
+- fi
+- ;;
+- esac
++ 2.4.*)
++ lxrelease=24
++ ;;
++ *)
++ lxrelease=26
+
+ # verify the GNU C lib version
+ # For an alternative means to determine GNU C lib version see
+@@ -266,9 +253,6 @@
+ fi
+ fi
+ ;;
+- *)
+- unsupported="UNSUPPORTED-"
+- lxrelease=$osrelease
+ esac
+ ARCH=${unsupported}lx${lxrelease}-${lxmachine}
+ ;;
diff --git a/gridengine.spec b/gridengine.spec
index 7e2975e..80a887b 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
Name: gridengine
Version: 6.2u5p2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -610,6 +610,9 @@ fi
%changelog
+* Fri Oct 14 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5p2-6
+- Update linux 3 patch to fix installed arch script as well
+
* Thu Sep 8 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5p2-5
- Add patch to properly quote m4 macros
- Add patch to hack linux 3 support - keeps arch as lx26-*
More information about the scm-commits
mailing list