rpms/gridengine/devel gridengine-6.2u5-rctemplates.patch, NONE, 1.1 maketarball, NONE, 1.1 .cvsignore, 1.9, 1.10 gridengine.spec, 1.22, 1.23 sources, 1.11, 1.12 gridengine-6.2u4-rctemplates.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Tue Dec 29 17:03:07 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5087
Modified Files:
.cvsignore gridengine.spec sources
Added Files:
gridengine-6.2u5-rctemplates.patch maketarball
Removed Files:
gridengine-6.2u4-rctemplates.patch
Log Message:
* Mon Dec 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-1
- Update to 6.2u5
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 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/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 30 Oct 2009 15:00:31 -0000 1.9
+++ .cvsignore 29 Dec 2009 17:03:06 -0000 1.10
@@ -1,2 +1,2 @@
-ge-V62u4_TAG-src.tar.gz
+ge-V62u5_TAG-src.tar.bz2
gridengine-ppc.tar.gz
Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gridengine.spec 29 Oct 2009 21:45:48 -0000 1.22
+++ gridengine.spec 29 Dec 2009 17:03:07 -0000 1.23
@@ -5,7 +5,7 @@
%define gecos Grid Engine
Name: gridengine
-Version: 6.2u4
+Version: 6.2u5
Release: 1%{?dist}
Summary: Grid Engine - Distributed Computing Management software
@@ -18,7 +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: http://gridengine.sunsource.net/files/documents/7/212/ge-V62u4_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
@@ -30,6 +31,7 @@ Source8: Licenses
Source9: gridengine.sysconfig
Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
Source11: README
+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
@@ -37,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.2u4-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
@@ -225,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
@@ -238,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
@@ -306,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}
@@ -468,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
@@ -478,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
@@ -540,6 +550,9 @@ fi
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 30 Oct 2009 15:00:31 -0000 1.11
+++ sources 29 Dec 2009 17:03:07 -0000 1.12
@@ -1,2 +1,2 @@
-a943d1dd5c8788b63995a2304a5f860e ge-V62u4_TAG-src.tar.gz
+1e81b2f28616ad44da5b628b1089b00c ge-V62u5_TAG-src.tar.bz2
5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
--- gridengine-6.2u4-rctemplates.patch DELETED ---
More information about the scm-commits
mailing list