rpms/gridengine/EL-6 gridengine-6.2u4-ant.patch, NONE, 1.1 gridengine-6.2u4-auto.patch, NONE, 1.1 gridengine-6.2u5-rctemplates.patch, NONE, 1.1 import.log, NONE, 1.1 maketarball, NONE, 1.1 .cvsignore, 1.7, 1.8 README, 1.2, 1.3 gridengine-6.2beta-ssl.patch, 1.1, 1.2 gridengine.spec, 1.21, 1.22 gridengine.sysconfig, 1.1, 1.2 sge_execd, 1.1, 1.2 sources, 1.9, 1.10 gridengine-6.1u2-auto.patch, 1.1, NONE gridengine-6.2-import.patch, 1.1, NONE gridengine-6.2u2_1-izpack.patch, 1.1, NONE gridengine-6.2u3-rctemplates.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Mon Jul 12 18:09:46 UTC 2010
Author: orion
Update of /cvs/pkgs/rpms/gridengine/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27607/EL-6
Modified Files:
.cvsignore README gridengine-6.2beta-ssl.patch gridengine.spec
gridengine.sysconfig sge_execd sources
Added Files:
gridengine-6.2u4-ant.patch gridengine-6.2u4-auto.patch
gridengine-6.2u5-rctemplates.patch import.log maketarball
Removed Files:
gridengine-6.1u2-auto.patch gridengine-6.2-import.patch
gridengine-6.2u2_1-izpack.patch
gridengine-6.2u3-rctemplates.patch
Log Message:
Sync to 6.2u5 from devel
gridengine-6.2u4-ant.patch:
build.xml | 1 +
libs/jgdi/build.xml | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE gridengine-6.2u4-ant.patch ---
--- gridengine/source/build.xml.ant 2009-03-30 11:24:03.000000000 -0600
+++ gridengine/source/build.xml 2009-10-27 13:18:10.556842272 -0600
@@ -26,6 +26,7 @@
fork="true" failonerror="true"
dir="@{dir}">
<jvmarg value="-Djava.compiler=none"/>
+ <jvmarg value="-Dant.library.dir=/usr/share/ant/lib"/>
<classpath>
<pathelement path="${java.class.path}"/>
<pathelement location="${libs.junit.classpath}"/>
--- gridengine/source/libs/jgdi/build.xml.ant 2009-03-17 09:18:12.000000000 -0600
+++ gridengine/source/libs/jgdi/build.xml 2009-10-27 13:20:21.695842289 -0600
@@ -379,6 +379,7 @@
<java classname="org.apache.tools.ant.launch.Launcher"
fork="true" failonerror="true">
<jvmarg line="${sge.jvmargs}"/>
+ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
<classpath>
<pathelement path="${java.class.path}"/>
</classpath>
gridengine-6.2u4-auto.patch:
inst_sge | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE gridengine-6.2u4-auto.patch ---
--- gridengine/source/dist/inst_sge.auto 2009-10-27 12:37:37.884779529 -0600
+++ gridengine/source/dist/inst_sge 2009-10-27 12:41:27.569911164 -0600
@@ -142,6 +142,7 @@
AUTO="false"
$INFOTEXT "Error: File $FILE does not exist!"
ErrUsage
+ exit 1
fi
shift
ARGC=`expr $ARGC - 1`
gridengine-6.2u5-rctemplates.patch:
dist/inst_sge | 26 +--------------
dist/util/create_settings.sh | 51 +-----------------------------
dist/util/install_modules/inst_common.sh | 24 +++++++++-----
dist/util/install_modules/inst_execd.sh | 2 -
dist/util/install_modules/inst_qmaster.sh | 12 ++++---
scripts/distinst | 8 ----
6 files changed, 30 insertions(+), 93 deletions(-)
--- NEW FILE gridengine-6.2u5-rctemplates.patch ---
--- gridengine/source/dist/inst_sge.rctemplates 2009-12-07 10:11:51.000000000 -0700
+++ gridengine/source/dist/inst_sge 2009-12-28 15:11:42.372471748 -0700
@@ -695,8 +695,7 @@
AddJMXFiles
fi
RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
CreateSettingsFile
InitCA
SetupRcScriptNames master #New qmaster RC script/SMF
@@ -860,7 +859,6 @@
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
- AddSGEStartUpScript $euid "bdb"
PrepareRPCServerStart
GiveBerkelyHints
else
@@ -912,11 +910,9 @@
AddDefaultUsersets
AddCommonFiles
AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
CreateSettingsFile
InitCA
- AddSGEStartUpScript $euid master
StartQmaster
AddWindowsAdmin
AddHosts
@@ -1084,7 +1080,6 @@
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
@@ -1120,7 +1115,6 @@
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
@@ -1437,7 +1431,6 @@
if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
. $SGE_ROOT/$SGE_CELL/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
- AddSGEStartUpScript $euid shadow
$INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
$INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
if [ "$SGE_ENABLE_SMF" = "true" ]; then
@@ -1683,20 +1676,7 @@
COMMONDIR=$SGE_CELL/common
- CreateSGEStartUpScripts 0 true master
- CreateSGEStartUpScripts 0 true execd
-
- $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
- "directory:\n\n" \
- " %s\n\n" \
- "Your old startup scripts are saved in this directory as\n\n" \
- " %s\n" \
- " %s\n\n" \
- \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
-
- $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
- "file location on all qmaster, shadowd and execution hosts."
-
+ SetupDefaultUser 0
fi
exit 0
--- gridengine/source/dist/util/create_settings.sh.rctemplates 2008-02-08 04:57:29.000000000 -0700
+++ gridengine/source/dist/util/create_settings.sh 2009-12-28 15:11:42.373471069 -0700
@@ -67,8 +67,6 @@
echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH
echo "" >> $SP_CSH
echo "set ARCH = \`\$SGE_ROOT/util/arch\`" >> $SP_CSH
-echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`" >> $SP_CSH
-echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`" >> $SP_CSH
echo "" >> $SP_CSH
#if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
@@ -93,31 +91,9 @@
echo "" >> $SP_CSH
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
-echo 'if ( $?MANPATH == 1 ) then' >> $SP_CSH
-echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH' >> $SP_CSH
-echo "else" >> $SP_CSH
-echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
-echo "endif" >> $SP_CSH
-echo "" >> $SP_CSH
echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )' >> $SP_CSH
-echo 'switch ($ARCH)' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "sol*":' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "lx*":' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo 'case "hp11-64":' >> $SP_CSH
-#ENFORCE_SHLIBPATH#echo ' breaksw' >> $SP_CSH
-echo 'case "*":' >> $SP_CSH
-echo " set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`" >> $SP_CSH
-echo " if ( \`eval echo '\$?'\$shlib_path_name\` ) then" >> $SP_CSH
-echo " set old_value = \`eval echo '\$'\$shlib_path_name\`" >> $SP_CSH
-echo " setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\"" >> $SP_CSH
-echo " else" >> $SP_CSH
-echo " setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH" >> $SP_CSH
-echo " endif" >> $SP_CSH
-echo " unset shlib_path_name old_value" >> $SP_CSH
-echo "endsw" >> $SP_CSH
-echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_CSH
+echo "unset ARCH" >> $SP_CSH
#
# bourne shell settings file
@@ -126,8 +102,6 @@
echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT" > $SP_SH
echo "" >> $SP_SH
echo "ARCH=\`\$SGE_ROOT/util/arch\`" >> $SP_SH
-echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`" >> $SP_SH
-echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`" >> $SP_SH
echo "" >> $SP_SH
if [ "$SGE_CELL" != "" ]; then
@@ -151,28 +125,7 @@
echo "" >> $SP_SH
-echo "if [ \"\$MANPATH\" = \"\" ]; then" >> $SP_SH
-echo " MANPATH=\$DEFAULTMANPATH" >> $SP_SH
-echo "fi" >> $SP_SH
-echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH" >> $SP_SH
-echo "" >> $SP_SH
echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH" >> $SP_SH
-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
-echo 'case $ARCH in' >> $SP_SH
-#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)' >> $SP_SH
-#ENFORCE_SHLIBPATH#echo ' ;;' >> $SP_SH
-echo '*)' >> $SP_SH
-echo " shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`" >> $SP_SH
-echo " old_value=\`eval echo '\$'\$shlib_path_name\`" >> $SP_SH
-echo " if [ x\$old_value = "x" ]; then" >> $SP_SH
-echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH" >> $SP_SH
-echo " else" >> $SP_SH
-echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
-echo " fi" >> $SP_SH
-echo " export \$shlib_path_name" >> $SP_SH
-echo ' unset shlib_path_name old_value' >> $SP_SH
-echo ' ;;' >> $SP_SH
-echo 'esac' >> $SP_SH
-echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH
+echo "unset ARCH" >> $SP_SH
--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates 2009-12-28 15:11:42.365471215 -0700
+++ gridengine/source/dist/util/install_modules/inst_common.sh 2009-12-28 15:11:42.376471408 -0700
@@ -2367,14 +2367,6 @@
rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
- if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then
- AddDefaultManager root $ADMINUSER
- AddDefaultOperator $ADMINUSER
- elif [ $euid != 0 -a $hosttype = "master" ]; then
- AddDefaultManager $USER
- AddDefaultOperator $USER
- fi
-
$INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME
fi
@@ -2382,6 +2374,22 @@
#-------------------------------------------------------------------------
+# SetupDefaultUsers: Add the default manager and operator
+#
+SetupDefaultUsers() {
+ euid=$1
+
+ if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then
+ AddDefaultManager root $ADMINUSER
+ AddDefaultOperator $ADMINUSER
+ elif [ $euid != 0 ]; then
+ AddDefaultManager $USER
+ AddDefaultOperator $USER
+ fi
+}
+
+
+#-------------------------------------------------------------------------
# AddSGEStartUpScript: Add startup script to rc files if root installs
#
AddSGEStartUpScript()
--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates 2009-12-28 15:11:42.311470580 -0700
+++ gridengine/source/dist/util/install_modules/inst_execd.sh 2009-12-28 15:11:42.378471904 -0700
@@ -457,7 +457,7 @@
exit 1
fi
else
- $SGE_STARTUP_FILE
+ /sbin/service sge_execd start
fi
$INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
$CLEAR
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2009-12-28 15:11:42.345470618 -0700
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2009-12-28 15:12:26.129409063 -0700
@@ -208,8 +208,8 @@
"the qmaster daemon on other hosts (see the corresponding section in the\n" \
"Grid Engine Installation and Administration Manual for details) the account\n" \
"on the shadow master hosts also needs read/write access to this directory.\n\n" \
- "Enter a qmaster spool directory [%s] >> " "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"
- QMDIR=`Enter "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"`
+ "Enter a qmaster spool directory [%s] >> " "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"
+ QMDIR=`Enter "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"`
done=true
#If directory is not empty need now require a new one
if [ -d "$QMDIR" ]; then
@@ -733,6 +733,9 @@
ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
PrintBootstrap >> $COMMONDIR/bootstrap
ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
+ rm -f /etc/sysconfig/gridengine
+ echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine
+ echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine
}
#-------------------------------------------------------------------------
@@ -949,7 +952,7 @@
fi
if [ -z "$1" ]; then
- default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool
+ default_value=/var/spool/gridengine/$SGE_CELL_VAL
else
default_value="$1"
fi
@@ -1192,6 +1195,7 @@
touch /tmp/pwfile.$$
chmod 600 /tmp/pwfile.$$
echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
+ ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE`
OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
if [ $? != 0 ]; then
$INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
@@ -1263,7 +1267,7 @@
exit 1
fi
else
- $SGE_STARTUP_FILE -qmaster
+ /sbin/service sgemaster start
if [ $? -ne 0 ]; then
$INFOTEXT "sge_qmaster start problem"
$INFOTEXT -log "sge_qmaster start problem"
--- gridengine/source/scripts/distinst.rctemplates 2009-11-12 15:51:14.000000000 -0700
+++ gridengine/source/scripts/distinst 2009-12-28 15:13:42.640411877 -0700
@@ -832,15 +832,9 @@
Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
if [ $enforce_shlibpath = true ]; then
Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
else
Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
fi
@@ -869,7 +863,6 @@
Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
$DEST_SGE_ROOT/util/upgrade_modules \
- $DEST_SGE_ROOT/util/rctemplates \
$DEST_SGE_ROOT/util/resources \
$DEST_SGE_ROOT/util/sgeCA \
$DEST_SGE_ROOT/util/resources/calendars \
@@ -894,7 +887,6 @@
$DEST_SGE_ROOT/util/resources/starter_methods/*
Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
- $DEST_SGE_ROOT/util/rctemplates/* \
$DEST_SGE_ROOT/util/sgeCA/*.cnf \
$DEST_SGE_ROOT/util/sgeSMF/*.xml \
$DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
--- NEW FILE import.log ---
gridengine-6_2u5-2_fc14:EL-6:gridengine-6.2u5-2.fc14.src.rpm:1278958131
--- NEW FILE maketarball ---
#!/bin/bash
if [ -z "$1" ]
then
echo "Usage: $0 TAG"
exit 1
else
tag=$1
fi
rm -rf gridengine
cvs -d :pserver:guest at cvs.sunsource.net:/cvs -z3 export -r $tag gridengine
rm -rf gridengine/{gep,review,www}
tar cjf ge-${tag}-src.tar.bz2 gridengine
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 17 Jul 2009 20:47:04 -0000 1.7
+++ .cvsignore 12 Jul 2010 18:09:45 -0000 1.8
@@ -1,3 +1,2 @@
-ge-V62u2_1_TAG-src.tar.gz
-ge-V623_TAG-src-all_modules.tar.gz
-ge-V62u3_TAG-src.tar.gz
+gridengine-ppc.tar.gz
+ge-V62u5_TAG-src.tar.bz2
Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- README 11 Nov 2008 20:29:43 -0000 1.2
+++ README 12 Jul 2010 18:09:45 -0000 1.3
@@ -8,7 +8,7 @@ on the localhost line, like the followin
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
gridengine-6.2beta-ssl.patch:
aimk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gridengine-6.2beta-ssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/gridengine-6.2beta-ssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gridengine-6.2beta-ssl.patch 11 Aug 2008 16:41:50 -0000 1.1
+++ gridengine-6.2beta-ssl.patch 12 Jul 2010 18:09:45 -0000 1.2
@@ -5,7 +5,7 @@
set SECFLAGS = "-DSECURE -I$OPENSSL_HOME/include"
set SECLIB = ""
-set SECLIBS_STATIC = "$OPENSSL_HOME/lib/libssl.a $OPENSSL_HOME/lib/libcrypto.a"
-+set SECLIBS_STATIC = "-lssl"
++set SECLIBS_STATIC = "-lssl -lcrypto"
set KLFLAGS = "-L$OPENSSL_HOME/lib"
set CORELIB = ""
Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/gridengine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- gridengine.spec 25 Aug 2009 15:11:03 -0000 1.21
+++ gridengine.spec 12 Jul 2010 18:09:45 -0000 1.22
@@ -5,8 +5,8 @@
%define gecos Grid Engine
Name: gridengine
-Version: 6.2u3
-Release: 3%{?dist}
+Version: 6.2u5
+Release: 2%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -18,8 +18,8 @@ Group: Applications/System
# which is not used or linked by other parts of gridengine.
License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
URL: http://gridengine.sunsource.net/
-#Source0 is in Source12
-Source0: ge-V62u3_TAG-src.tar.gz
+#This is make with maketarball <TAG>
+Source0: ge-V62u5_TAG-src.tar.bz2
Source1: gridengine-ppc.tar.gz
Source2: my_configuration.conf
Source3: sge.csh
@@ -31,8 +31,7 @@ Source8: Licenses
Source9: gridengine.sysconfig
Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
Source11: README
-# This time, they packaged everything into this bundle
-Source12: http://gridengine.sunsource.net/files/documents/7/203/ge-V623_TAG-src-all_modules.tar.gz
+Source12: maketarball
# Link ssl libraries dynamically so dependencies are pulled in
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2845
Patch1: gridengine-6.2beta-ssl.patch
@@ -40,7 +39,7 @@ Patch1: gridengine-6.2beta-ssl.patch
Patch2: gridengine-6.2beta-inst.patch
# Don't need to make rc files in inst_common.sh
# Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
-Patch3: gridengine-6.2u3-rctemplates.patch
+Patch3: gridengine-6.2u5-rctemplates.patch
# Fixup sge_ca to use system openssl and java paths
Patch4: gridengine-6.2u2_1-sge_ca.patch
# Fixup jni paths
@@ -50,9 +49,9 @@ Patch6: gridengine-6.2-db.patch
# aimk sets -Werror, but there are lots of warnings
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
Patch7: gridengine-6.2u2_1-Werror.patch
-# Import specific classes to avoid pulling in other ones
-# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2924
-Patch8: gridengine-6.2-import.patch
+# Need to patch -Dant.library.dir=/usr/share/ant/lib to ant processes
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=3171
+Patch8: gridengine-6.2u4-ant.patch
# Rename getline() to sge_getline()
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2980
Patch9: gridengine-6.2u2_1-getline.patch
@@ -60,7 +59,7 @@ Patch9: gridengine-6.2u2_1-getline.patch
Patch15: gridengine-6.2beta2-lesstif.patch
# Make inst_sge exit with status 1 if usage is incorrect
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2586
-Patch19: gridengine-6.1u2-auto.patch
+Patch19: gridengine-6.2u4-auto.patch
# Don't use rpaths
Patch22: gridengine-6.2u2_1-rpath.patch
# Fix linking with proper libs
@@ -174,7 +173,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dis
%patch5 -p1 -b .jni
%patch6 -p1 -b .db
%patch7 -p1 -b .Werror
-%patch8 -p1 -b .import
+%patch8 -p1 -b .ant
%patch9 -p1 -b .getline
%if !0%{?rhel}
%patch15 -p1 -b .lesstif
@@ -228,6 +227,9 @@ cat > build_private.properties <<EOF
javacc.home=%{_javadir}
libs.junit.classpath=%{_javadir}/junit.jar
izpack.lib=/usr/share/java/izpack
+hadoop.javac.source=1.6
+hadoop.javac.target=1.6
+hadoop.home=/usr/share/java
EOF
#Build libcore.so
@@ -241,6 +243,8 @@ scripts/zerodepend
#TODO - Need IzPack for GUI Installer
./aimk -no-gui-inst
./aimk -man
+#Not build by default - going to need hadoop
+#ant herd
%install
@@ -309,6 +313,7 @@ do
done
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mv $RPM_BUILD_ROOT%{_libdir}/drmaa.jar $RPM_BUILD_ROOT%{_javadir}/drmaa.jar
+mv $RPM_BUILD_ROOT%{_libdir}/JSV.jar $RPM_BUILD_ROOT%{_javadir}/JSV.jar
# include
mv $RPM_BUILD_ROOT%{_datadir}/gridengine/include $RPM_BUILD_ROOT%{_includedir}
@@ -471,6 +476,7 @@ fi
%{_libdir}/libspoolb.so
%{_libdir}/libspoolc.so
%{_javadir}/drmaa.jar
+%{_javadir}/JSV.jar
%{_libexecdir}/gridengine/
%attr(-,%username,%username) %dir %{_datadir}/gridengine
%{_datadir}/gridengine/bin
@@ -481,6 +487,7 @@ fi
%{_datadir}/gridengine/ckpt
%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
%{_datadir}/gridengine/doc
+%{_datadir}/gridengine/hadoop
%{_datadir}/gridengine/inst_sge
%{_datadir}/gridengine/lib
%{_datadir}/gridengine/mpi
@@ -543,6 +550,18 @@ fi
%changelog
+* 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
+
+* Mon Dec 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-1
+- Update to 6.2u5
+
+* Thu Oct 29 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u4-1
+- Update to 6.2u4
+- Drop import patch fixed upstream
+- Updated rctemplates and auto patches
+- Add patch to call ant with appropriate library directory
+
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 6.2u3-3
- rebuilt with new openssl
Index: gridengine.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/gridengine.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gridengine.sysconfig 8 Feb 2008 21:57:24 -0000 1.1
+++ gridengine.sysconfig 12 Jul 2010 18:09:45 -0000 1.2
@@ -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
Index: sge_execd
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/sge_execd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sge_execd 8 Feb 2008 21:57:24 -0000 1.1
+++ sge_execd 12 Jul 2010 18:09:46 -0000 1.2
@@ -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=$?
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/EL-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 17 Jul 2009 21:26:01 -0000 1.9
+++ sources 12 Jul 2010 18:09:46 -0000 1.10
@@ -1,3 +1,2 @@
5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
-1020a8b4849a6edcfbadc723749690c8 ge-V623_TAG-src-all_modules.tar.gz
-02dbf91f91e25dcba5431c29194b5afd ge-V62u3_TAG-src.tar.gz
+1e81b2f28616ad44da5b628b1089b00c ge-V62u5_TAG-src.tar.bz2
--- gridengine-6.1u2-auto.patch DELETED ---
--- gridengine-6.2-import.patch DELETED ---
--- gridengine-6.2u2_1-izpack.patch DELETED ---
--- gridengine-6.2u3-rctemplates.patch DELETED ---
More information about the scm-commits
mailing list