rpms/gridengine/devel gridengine-6.2u1-rctemplates.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gridengine.spec, 1.8, 1.9 sources, 1.5, 1.6 gridengine-6.2-cvsutil.patch, 1.1, NONE gridengine-6.2-rctemplates.patch, 1.3, NONE
Orion Poplawski
orion at fedoraproject.org
Thu Dec 18 23:37:44 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1191
Modified Files:
.cvsignore gridengine.spec sources
Added Files:
gridengine-6.2u1-rctemplates.patch
Removed Files:
gridengine-6.2-cvsutil.patch gridengine-6.2-rctemplates.patch
Log Message:
* Thu Dec 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-1
- Update to 6.2u1
gridengine-6.2u1-rctemplates.patch:
--- NEW FILE gridengine-6.2u1-rctemplates.patch ---
--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates 2008-11-05 14:01:08.000000000 -0700
+++ gridengine/source/dist/util/install_modules/inst_common.sh 2008-11-06 08:56:03.000000000 -0700
@@ -267,8 +267,8 @@
$INFOTEXT -log "Probably a permission problem. Please check file access permissions."
$INFOTEXT -log "Check read/write permission. Check if SGE daemons are running."
- MoveLog
if [ "$ADMINRUN_NO_EXIT" != "true" ]; then
+ MoveLog
exit 1
fi
fi
@@ -2189,14 +2189,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
@@ -2204,6 +2196,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()
@@ -2488,6 +2496,7 @@
if [ "$AUTO" = "false" ]; then
return
fi
+ ADMINRUN_NO_EXIT=true # ExecuteAsAdmin should not exit and call MoveLog
GetAdminUser
--- gridengine/source/scripts/distinst.rctemplates 2008-06-04 04:04:10.000000000 -0600
+++ gridengine/source/scripts/distinst 2008-07-15 16:05:33.000000000 -0600
@@ -810,15 +810,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
Cleanup util
@@ -833,7 +827,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 \
@@ -858,7 +851,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 \
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2008-12-18 15:26:15.000000000 -0700
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2008-12-18 15:29:59.000000000 -0700
@@ -198,8 +198,8 @@
"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" \
"The following directory\n\n [%s]\n\n will be used as qmaster spool directory by default!\n" \
- $SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster
- QMDIR=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster
+ /var/spool/gridengine/$SGE_CELL_VAL/qmaster
+ QMDIR=/var/spool/gridengine/$SGE_CELL_VAL/qmaster
$INFOTEXT -auto $AUTO -ask "y" "n" -def "n" -n \
"Do you want to select another qmaster spool directory (y/n) [n] >> "
@@ -208,7 +208,7 @@
done=true
else
$INFOTEXT -n "Please enter a qmaster spool directory now! >>"
- QMDIR=`Enter $SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster`
+ QMDIR=`Enter /var/spool/gridengine/$SGE_CELL_VAL/qmaster`
done=true
fi
done
@@ -721,6 +721,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
}
#-------------------------------------------------------------------------
@@ -936,7 +939,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
@@ -1195,6 +1198,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"
@@ -1236,7 +1240,7 @@
exit 1
fi
else
- $SGE_STARTUP_FILE -qmaster
+ /sbin/service sgemaster start
fi
# wait till qmaster.pid file is written
sleep 1
@@ -1812,6 +1816,7 @@
# Extract the seperate micro and patch numbers, ignoring anything
# after the 2-digit patch.
patch=`echo $micro | awk -F_ '{print substr($2, 1, 2)}'`
+ [ "$patch" = "0" ] && patch="00"
micro=`echo $micro | awk -F_ '{print $1}'`
fi
@@ -1832,7 +1837,7 @@
if [ "$JAVA_HOME" != "" ]; then
java_home=$JAVA_HOME
else
- java_home=/usr/java
+ java_home=/usr/lib/jvm/jre
fi
# set JRE_HOME
--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates 2008-07-15 16:03:19.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_execd.sh 2008-07-15 16:09:53.000000000 -0600
@@ -430,7 +430,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/inst_sge.rctemplates 2008-07-22 09:32:03.000000000 -0600
+++ gridengine/source/dist/inst_sge 2008-11-06 08:59:24.000000000 -0700
@@ -567,8 +568,7 @@
fi
AddJMXFiles
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
@@ -713,7 +713,6 @@
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
- AddSGEStartUpScript $euid "bdb"
PrepareRPCServerStart
GiveBerkelyHints
else
@@ -763,11 +762,9 @@
AddDefaultUsersets
AddCommonFiles
AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
CreateSettingsFile
InitCA
- AddSGEStartUpScript $euid master
StartQmaster
AddWindowsAdmin
AddHosts
@@ -937,7 +934,6 @@
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
StartExecd
AddQueue
@@ -971,7 +967,6 @@
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
StartExecd
AddQueue
@@ -1221,7 +1216,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
if [ "$SGE_ENABLE_SMF" = "true" ]; then
$SVCADM enable -s "svc:/application/sge/shadowd:$SGE_CLUSTER_NAME"
@@ -1257,7 +1251,6 @@
. $SGE_ROOT/$SGE_CELL/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
$SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &
- AddSGEStartUpScript $euid shadow
else
echo ". $SGE_ROOT/$SGE_CELL/common/settings.sh; SGE_ARCH=`$SGE_ROOT/util/arch`; $SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &" | $SHELL_NAME $SHADOW /bin/sh &
#TODO: install rc script
@@ -1444,20 +1437,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 2008-11-11 11:04:20.000000000 -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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Aug 2008 16:41:50 -0000 1.4
+++ .cvsignore 18 Dec 2008 23:37:13 -0000 1.5
@@ -1,2 +1 @@
-ge-V62_TAG-src.tar.gz
-gridengine-ppc.tar.gz
+ge-V62u1_TAG-src.tar.gz
Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gridengine.spec 17 Nov 2008 16:55:37 -0000 1.8
+++ gridengine.spec 18 Dec 2008 23:37:14 -0000 1.9
@@ -5,8 +5,8 @@
%define gecos Grid Engine
Name: gridengine
-Version: 6.2
-Release: 5%{?dist}
+Version: 6.2u1
+Release: 1%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -18,7 +18,7 @@
# 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/181/ge-V62_TAG-src.tar.gz
+Source0: http://gridengine.sunsource.net/files/documents/7/190/ge-V62u1_TAG-src.tar.gz
Source1: gridengine-ppc.tar.gz
Source2: my_configuration.conf
Source3: sge.csh
@@ -30,15 +30,14 @@
Source9: gridengine.sysconfig
Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
Source11: README
-# Upstream CVS changes to util scripts
-Patch0: gridengine-6.2-cvsutil.patch
# 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
# Make inst_common.sh not look for qmon or sge_execd since they might not be installed
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.2-rctemplates.patch
+Patch3: gridengine-6.2u1-rctemplates.patch
# Fixup sge_ca to use system openssl and java paths
Patch4: gridengine-6.2-sge_ca.patch
# Fixup jni paths
@@ -72,6 +71,7 @@
BuildRequires: java-devel >= 1.6.0, javacc, ant-junit, ant-nodeps
BuildRequires: elfutils-libelf-devel, net-tools
BuildRequires: fedora-usermgmt-devel
+Requires: binutils
Requires: ncurses
Requires(posttrans): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
@@ -156,7 +156,6 @@
cp %SOURCE8 %SOURCE11 .
#Remove unneeded shbangs
sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p2 -b .cvsutil
%patch1 -p1 -b .ssl
%patch2 -p1 -b .inst
%patch3 -p1 -b .rctemplates
@@ -525,6 +524,9 @@
%changelog
+* Thu Dec 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-1
+- Update to 6.2u1
+
* Mon Nov 17 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-5
- Leave qmake-ge in %{_bindir}
- Use system db_* utils in bdb_checkpoint script
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Aug 2008 20:56:36 -0000 1.5
+++ sources 18 Dec 2008 23:37:14 -0000 1.6
@@ -1,2 +1,2 @@
-36e47fba0454d25e4126324384cec221 ge-V62_TAG-src.tar.gz
+9ba9fbdfa3568bc278ba53db8b52223c ge-V62u1_TAG-src.tar.gz
5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
--- gridengine-6.2-cvsutil.patch DELETED ---
--- gridengine-6.2-rctemplates.patch DELETED ---
More information about the fedora-extras-commits
mailing list