rpms/gridengine/F-10 gridengine-6.2-cvsutil.patch, NONE, 1.1 gridengine-6.2-jni.patch, NONE, 1.1 gridengine-6.2-sge_ca.patch, NONE, 1.1 import.log, NONE, 1.1 gridengine-6.2-rctemplates.patch, 1.1, 1.2 gridengine.spec, 1.5, 1.6 sgemaster, 1.2, 1.3
Orion Poplawski
orion at fedoraproject.org
Tue Nov 11 17:10:18 UTC 2008
- Previous message (by thread): rpms/pyke/devel .cvsignore, 1.3, 1.4 pyke.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/kernel/F-10 linux-2.6-alsa-revo51-headphone.patch, NONE, 1.1 kernel.spec, 1.1132, 1.1133
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/gridengine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9071/F-10
Modified Files:
gridengine-6.2-rctemplates.patch gridengine.spec sgemaster
Added Files:
gridengine-6.2-cvsutil.patch gridengine-6.2-jni.patch
gridengine-6.2-sge_ca.patch import.log
Log Message:
Sync to devel
gridengine-6.2-cvsutil.patch:
--- NEW FILE gridengine-6.2-cvsutil.patch ---
diff -ru --exclude CVS gridengine/source/dist/util/install_modules/inst_common.sh cvs/gridengine/source/dist/util/install_modules/inst_common.sh
--- gridengine/source/dist/util/install_modules/inst_common.sh 2008-07-23 04:34:15.000000000 -0600
+++ cvs/gridengine/source/dist/util/install_modules/inst_common.sh 2008-11-04 12:53:50.000000000 -0700
@@ -174,24 +174,66 @@
#-------------------------------------------------------------------------
# Makedir: make directory, chown/chgrp/chmod it. Exit if failure
-#
+#
Makedir()
{
dir=$1
+ tmp_dir=$1
if [ ! -d $dir ]; then
- $INFOTEXT "creating directory: %s" "$dir"
- ExecuteAsAdmin $MKDIR -p $dir
+ while [ ! -d $tmp_dir ]; do
+ chown_dir=$tmp_dir
+ tmp_dir2=`dirname $tmp_dir`
+ tmp_dir=$tmp_dir2
+ done
+
+ $INFOTEXT "creating directory: %s" "$dir"
+ if [ "`$SGE_UTILBIN/filestat -owner $tmp_dir`" != "$ADMINUSER" ]; then
+ Execute $MKDIR -p $dir
+ if [ "$ADMINUSER" = "default" ]; then
+ Execute $CHOWN -R root $chown_dir
+ else
+ group=`$SGE_UTILBIN/checkuser -gid $ADMINUSER`
+ Execute $CHOWN -R $ADMINUSER:$group $chown_dir
+ fi
+ Execute $CHMOD -R $DIRPERM $chown_dir
+ else
+ ExecuteAsAdmin $MKDIR -p $dir
+ ExecuteAsAdmin $CHMOD -R $DIRPERM $chown_dir
+ fi
fi
- ExecuteAsAdmin $CHMOD $DIRPERM $dir
+ if [ "`$SGE_UTILBIN/filestat -owner $dir`" != "$ADMINUSER" ]; then
+ Execute $CHMOD $DIRPERM $dir
+ else
+ ExecuteAsAdmin $CHMOD $DIRPERM $dir
+ fi
+}
+
+#-------------------------------------------------------------------------
+# Removedir: remove directory, chown/chgrp/chmod it. Exit if failure
+#
+Removedir()
+{
+ dir=$1
+ tmp_dir=`dirname $dir`
+
+ if [ -d $dir ]; then
+ #We could be more clever and even check tmp_dir permissions
+ if [ "`$SGE_UTILBIN/filestat -owner $tmp_dir`" != "$ADMINUSER" ]; then
+ Execute $RM -rf $dir
+ else
+ ExecuteAsAdmin $RM -rf $dir
+ fi
+ fi
}
+
#-------------------------------------------------------------------------
# Execute command as user $ADMINUSER and exit if exit status != 0
# if ADMINUSER = default then execute command unchanged
#
-# uses binary "adminrun" form SGE distribution
+# uses binary "adminrun" from SGE distribution
#
# USES: variables "$verbose" (if set to "true" print arguments)
# $ADMINUSER (if set to "default" do not use "adminrun)
@@ -824,7 +866,9 @@
fi
if [ "$QMASTER" = "install" ]; then
- if [ -d "$SGE_ROOT/$SGE_CELL" -a ! -z "$DB_SPOOLING_SERVER" -a "$DB_SPOOLING_SERVER" != "none" ]; then
+ # if we have a bdb server, the cell directory already exists - this is OK.
+ # if we have no bdb server, and the cell directory exists, stop the installation.
+ if [ -d "$SGE_ROOT/$SGE_CELL" -a \( -z "$DB_SPOOLING_SERVER" -o "$DB_SPOOLING_SERVER" = "none" \) ]; then
$INFOTEXT -e "Your >CELL_NAME< directory %s already exist!" $SGE_ROOT/$SGE_CELL
$INFOTEXT -e "The automatic installation stops, if the >SGE_CELL< directory already exists"
$INFOTEXT -e "to ensure, that existing installations are not overwritten!"
@@ -1896,9 +1940,7 @@
#Only BDB or qmaster installation can create cluster_name file
if [ \( "$1" = "bdb" -o "$1" = "qmaster" -o "$UPDATE" = "true" \) -a ! -f $SGE_ROOT/$SGE_CELL/common/cluster_name ]; then
- if [ ! -d "$SGE_ROOT/$SGE_CELL/common" ]; then
- ExecuteAsAdmin $MKDIR -p "$SGE_ROOT/$SGE_CELL/common"
- fi
+ Makedir "$SGE_ROOT/$SGE_CELL/common"
SafelyCreateFile $SGE_ROOT/$SGE_CELL/common/cluster_name 644 "$SGE_CLUSTER_NAME"
fi
@@ -4012,12 +4054,7 @@
local_dir=$global_dir
fi
if [ -d "$local_dir/$HOST" ]; then
- #Try as root
- rm -rf "$local_dir/$HOST" > /dev/null 2&>1
- if [ $? -ne 0 ]; then
- #Try as admin
- ExecuteAsAdmin rm -rf "$local_dir/$HOST"
- fi
+ Removedir "$local_dir/$HOST"
elif [ ! -d "$local_dir" ]; then
LOCAL_EXECD_SPOOL=$local_dir
. $SGE_ROOT/util/install_modules/inst_execd.sh
diff -ru --exclude CVS gridengine/source/dist/util/install_modules/inst_execd.sh cvs/gridengine/source/dist/util/install_modules/inst_execd.sh
--- gridengine/source/dist/util/install_modules/inst_execd.sh 2008-07-18 10:08:56.000000000 -0600
+++ cvs/gridengine/source/dist/util/install_modules/inst_execd.sh 2008-11-04 12:53:50.000000000 -0700
@@ -377,7 +377,7 @@
loop_counter=`expr $loop_counter + 1`
if [ $loop_counter -ge $loop_max ]; then
$INFOTEXT -e "$MODE failed after %s retries" $loop_max
- exit
+ exit 1
fi
done
}
@@ -399,7 +399,12 @@
else
$INFOTEXT -log "\nCreating local configuration for host >%s<" $HOST
PrintLocalConf 0 > $TMPL
- ExecuteAsAdmin $SGE_BIN/qconf -Aconf $TMPL
+ $SGE_BIN/qconf -sconf $HOST > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ ExecuteAsAdmin $SGE_BIN/qconf -Mconf $TMPL
+ else
+ ExecuteAsAdmin $SGE_BIN/qconf -Aconf $TMPL
+ fi
rm -rf /tmp/$$
$INFOTEXT "Local configuration for host >%s< created." $HOST
$INFOTEXT -log "Local configuration for host >%s< created." $HOST
@@ -570,45 +575,16 @@
spool_dir=`qconf -sconf | grep "execd_spool_dir" | awk '{ print $2 }' 2>/dev/null`
host_dir=`$SGE_UTILBIN/gethostname -aname | cut -d"." -f1`
- $MKDIR $spool_dir/$host_dir
- ret=$?
-
- if [ $ret = 0 ]; then
- group=`$SGE_UTILBIN/checkuser -gid $ADMINUSER`
- chown -R $ADMINUSER:$group $spool_dir/$host_dir
- else
- ExecuteAsAdmin $MKDIR $spool_dir/$host_dir
- fi
+ Makedir $spool_dir/$host_dir
}
MakeLocalSpoolDir()
{
- tmp_dir=$LOCAL_EXECD_SPOOL
- end_loop=0
-
- while [ "$end_loop" = "0" ]; do
- base_name=`basename $tmp_dir`
- tmp_dir=`dirname $tmp_dir`
-
- if [ -d $tmp_dir ]; then
- dir_exists=$tmp_dir
- end_loop=1
- fi
- done
-
- #try as root
- mkdir -p $LOCAL_EXECD_SPOOL
-
- if [ $? = 0 ]; then
- group=`$SGE_UTILBIN/checkuser -gid $ADMINUSER`
- chown -R $ADMINUSER:$group $dir_exists/$base_name
- else
- #try as adminuser
- ExecuteAsAdmin mkdir -p $LOCAL_EXECD_SPOOL
- fi
+ Makedir $LOCAL_EXECD_SPOOL
}
+
#-------------------------------------------------------------------------
# AddSubmitHostIfNotExisting
# Param 1: host to add
diff -ru --exclude CVS gridengine/source/dist/util/install_modules/inst_execd_uninst.sh cvs/gridengine/source/dist/util/install_modules/inst_execd_uninst.sh
--- gridengine/source/dist/util/install_modules/inst_execd_uninst.sh 2008-03-17 08:14:05.000000000 -0600
+++ cvs/gridengine/source/dist/util/install_modules/inst_execd_uninst.sh 2008-11-04 12:53:50.000000000 -0700
@@ -276,7 +276,7 @@
ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
- ExecuteAsAdmin rm -R $SPOOL_DIR
+ Removedir $SPOOL_DIR
fi
fi
@@ -316,7 +316,10 @@
RemoveSpoolDir $uhost
RemoveReferences $uhost
RemoveExecd $uhost
- RemoveRcScript $uhost execd $euid
+ #Detect execd service/rc script
+ CheckIfClusterNameAlreadyExists execd
+ #And remove either or both
+ RemoveRC_SMF execd $?
else
$INFOTEXT "%s is not an execution host" $uhost
$INFOTEXT -log "%s is not an execution host" $uhost
diff -ru --exclude CVS gridengine/source/dist/util/install_modules/inst_qmaster.sh cvs/gridengine/source/dist/util/install_modules/inst_qmaster.sh
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh 2008-07-18 05:31:23.000000000 -0600
+++ cvs/gridengine/source/dist/util/install_modules/inst_qmaster.sh 2008-11-04 12:53:50.000000000 -0700
@@ -64,6 +64,7 @@
GetCell()
{
is_done="false"
+ Overwrite="false"
if [ $AUTO = true ]; then
SGE_CELL=$CELL_NAME
@@ -125,10 +126,13 @@
if [ $sel_ret = 0 -a $with_bdb = 0 ]; then
$INFOTEXT "Deleting bootstrap and cluster_name files!"
ExecuteAsAdmin rm -f $SGE_ROOT/$SGE_CELL_VAL/common/bootstrap
- ExecuteAsAdmin rm -f $SGE_ROOT/$SGE_CELL_VAL/common/cluster_name
+ ExecuteAsAdmin rm -f $SGE_ROOT/$SGE_CELL_VAL/common/cluster_name
elif [ $sel_ret -ne 0 ]; then
$INFOTEXT "Deleting directory \"%s\" now!" $SGE_ROOT/$SGE_CELL_VAL
- ExecuteAsAdmin rm -rf $SGE_ROOT/$SGE_CELL_VAL
+ Removedir $SGE_ROOT/$SGE_CELL_VAL
+ fi
+ if [ $sel_ret = 0 ]; then
+ Overwrite="true"
fi
is_done="true"
fi
@@ -324,7 +328,7 @@
#SetSpoolingOptionsBerkeleyDB()
-# $1 - new default spool_dir or BDBD server
+# $1 - new default spool_dir or BDB server
SetSpoolingOptionsBerkeleyDB()
{
SPOOLING_METHOD=berkeleydb
@@ -414,8 +418,7 @@
fi
if [ $ret = 0 ]; then
- RM="rm -r"
- ExecuteAsAdmin $RM $SPOOLING_DIR
+ Removedir $SPOOLING_DIR
if [ -d $SPOOLING_DIR ]; then
$INFOTEXT "You are not the owner of this directory. You can't delete it!"
else
@@ -460,7 +463,7 @@
if [ "$AUTO" = "true" ]; then
if [ $SPOOLING_SERVER = "none" ]; then
$ECHO
- ExecuteAsAdmin $MKDIR $SPOOLING_DIR
+ Makedir $SPOOLING_DIR
SPOOLING_ARGS="$SPOOLING_DIR"
else
$INFOTEXT -log "We found a running berkeley db server on this host!"
@@ -517,7 +520,7 @@
if [ "$SPOOLING_SERVER" = "none" ]; then
$ECHO
- ExecuteAsAdmin $MKDIR $SPOOLING_DIR
+ Makedir $SPOOLING_DIR
SPOOLING_ARGS="$SPOOLING_DIR"
else
SPOOLING_ARGS="$SPOOLING_SERVER:`basename $SPOOLING_DIR`"
@@ -531,9 +534,14 @@
SPOOLING_ARGS="$SGE_ROOT_VAL/$COMMONDIR;$QMDIR"
}
-# $1 - suggested spooling params form the backup
+# $1 - spooling method
+# $2 - suggested spooling params from the backup
SetSpoolingOptionsDynamic()
{
+ suggested_method=$1
+ if [ -z "$suggested_method" ]; then
+ suggested_method=berkeleydb
+ fi
if [ "$AUTO" = "true" ]; then
if [ "$SPOOLING_METHOD" != "berkeleydb" -a "$SPOOLING_METHOD" != "classic" ]; then
SPOOLING_METHOD="berkeleydb"
@@ -545,8 +553,8 @@
$INFOTEXT -n "Your SGE binaries are compiled to link the spooling libraries\n" \
"during runtime (dynamically). So you can choose between Berkeley DB \n" \
"spooling and Classic spooling method."
- $INFOTEXT -n "\nPlease choose a spooling method (berkeleydb|classic) [berkeleydb] >> "
- SPOOLING_METHOD=`Enter berkeleydb`
+ $INFOTEXT -n "\nPlease choose a spooling method (berkeleydb|classic) [%s] >> " "$suggested_method"
+ SPOOLING_METHOD=`Enter $suggested_method`
fi
fi
@@ -557,7 +565,7 @@
SetSpoolingOptionsClassic
;;
berkeleydb)
- SetSpoolingOptionsBerkeleyDB $1
+ SetSpoolingOptionsBerkeleyDB $2
;;
*)
$INFOTEXT "\nUnknown spooling method. Exit."
@@ -862,6 +870,7 @@
$ECHO "auto_user_delete_time 86400"
$ECHO "delegated_file_staging false"
$ECHO "reprioritize 0"
+ $ECHO "jsv_url none"
if [ "$SGE_JVM_LIB_PATH" != "" ]; then
$ECHO "libjvm_path $SGE_JVM_LIB_PATH"
fi
@@ -1358,28 +1367,31 @@
fi
- $INFOTEXT -u "\nCreating the default <all.q> queue and <allhosts> hostgroup"
- echo
- $INFOTEXT -log "Creating the default <all.q> queue and <allhosts> hostgroup"
- TMPL=/tmp/hostqueue$$
- TMPL2=${TMPL}.q
- rm -f $TMPL $TMPL2
- if [ -f $TMPL -o -f $TMPL2 ]; then
- $INFOTEXT "\nCan't delete template files >%s< or >%s<" "$TMPL" "$TMPL2"
- else
- PrintHostGroup @allhosts > $TMPL
- Execute $SGE_BIN/qconf -Ahgrp $TMPL
- Execute $SGE_BIN/qconf -sq > $TMPL
- Execute sed -e "/qname/s/template/all.q/" \
- -e "/hostlist/s/NONE/@allhosts/" \
- -e "/pe_list/s/NONE/make/" $TMPL > $TMPL2
- Execute $SGE_BIN/qconf -Aq $TMPL2
- rm -f $TMPL $TMPL2
- fi
-
- $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
- $CLEAR
+ if [ "$Overwrite" = "true" -a "$SPOOLING_METHOD" = "classic" ]; then
+ $INFOTEXT -u "\nSkipping creation of the default <all.q> queue and <allhosts> hostgroup"
+ else
+ $INFOTEXT -u "\nCreating the default <all.q> queue and <allhosts> hostgroup"
+ echo
+ $INFOTEXT -log "Creating the default <all.q> queue and <allhosts> hostgroup"
+ TMPL=/tmp/hostqueue$$
+ TMPL2=${TMPL}.q
+ rm -f $TMPL $TMPL2
+ if [ -f $TMPL -o -f $TMPL2 ]; then
+ $INFOTEXT "\nCan't delete template files >%s< or >%s<" "$TMPL" "$TMPL2"
+ else
+ PrintHostGroup @allhosts > $TMPL
+ Execute $SGE_BIN/qconf -Ahgrp $TMPL
+ Execute $SGE_BIN/qconf -sq > $TMPL
+ Execute sed -e "/qname/s/template/all.q/" \
+ -e "/hostlist/s/NONE/@allhosts/" \
+ -e "/pe_list/s/NONE/make/" $TMPL > $TMPL2
+ Execute $SGE_BIN/qconf -Aq $TMPL2
+ rm -f $TMPL $TMPL2
+ fi
+ $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
+ $CLEAR
+ fi
}
@@ -1705,24 +1717,30 @@
{
$INFOTEXT -u "\nGrid Engine TCP/IP service >%s<\n" $service_name
$INFOTEXT -n "\n"
- $INFOTEXT -n "Please enter an unused port number >> "
+
+ port_ok="false"
if [ "$1" = "sge_qmaster" ]; then
+ $INFOTEXT -n "Please enter an unused port number >> "
INP=`Enter $SGE_QMASTER_PORT`
else
- INP=`Enter $SGE_EXECD_PORT`
-
- if [ "$INP" = "$SGE_QMASTER_PORT" -a $service_name = "sge_execd" ]; then
- $INFOTEXT "Please use any other port number!!!"
- $INFOTEXT "This %s port number is used by sge_qmaster" $SGE_QMASTER_PORT
- if [ $AUTO = "true" ]; then
- $INFOTEXT -log "Please use any other port number!!!"
- $INFOTEXT -log "This %s port number is used by sge_qmaster" $SGE_QMASTER_PORT
- $INFOTEXT -log "Installation failed!!!"
- MoveLog
- exit 1
+ while [ $port_ok = "false" ]; do
+ $INFOTEXT -n "Please enter an unused port number >> "
+ INP=`Enter $SGE_EXECD_PORT`
+ port_ok="true"
+ if [ "$INP" = "$SGE_QMASTER_PORT" -a $1 = "sge_execd" ]; then
+ $INFOTEXT "\nPlease use any other port number!"
+ $INFOTEXT "Port number %s is already used by sge_qmaster\n" $SGE_QMASTER_PORT
+ port_ok="false"
+ if [ $AUTO = "true" ]; then
+ $INFOTEXT -log "Please use any other port number!"
+ $INFOTEXT -log "Port number %s is already used by sge_qmaster" $SGE_QMASTER_PORT
+ $INFOTEXT -log "Installation failed!!!"
+ MoveLog
+ exit 1
+ fi
fi
- fi
+ done
fi
chars=`echo $INP | wc -c`
diff -ru --exclude CVS gridengine/source/dist/util/rctemplates/sgemaster_template cvs/gridengine/source/dist/util/rctemplates/sgemaster_template
--- gridengine/source/dist/util/rctemplates/sgemaster_template 2008-07-22 09:32:04.000000000 -0600
+++ cvs/gridengine/source/dist/util/rctemplates/sgemaster_template 2008-11-04 12:53:50.000000000 -0700
@@ -456,7 +456,7 @@
# if service tags are enabled
st_enabled=`sh $SGE_ROOT/util/sgeST/sge_st "enabled"`
if [ "$st_enabled" = "true" -a "$qmaster" = "true" ]; then
- sh $SGE_ROOT/util/sgeST/sge_st "register"
+ sh $SGE_ROOT/util/sgeST/sge_st "register" > /dev/null 2>&1
fi
# qmaster_host=true if qmaster was running on this host the last time
Only in cvs/gridengine/source/dist/util/resources: jsv
diff -ru --exclude CVS gridengine/source/dist/util/resources/loadsensors/ibm-loadsensor cvs/gridengine/source/dist/util/resources/loadsensors/ibm-loadsensor
--- gridengine/source/dist/util/resources/loadsensors/ibm-loadsensor 2008-06-23 02:54:27.000000000 -0600
+++ cvs/gridengine/source/dist/util/resources/loadsensors/ibm-loadsensor 2008-11-04 12:53:51.000000000 -0700
@@ -158,6 +158,11 @@
cat /tmp/svmon-$$.out | grep "pg space" | read f1 f2 swap_total swap_used
fi
+ if [ $VERSION = "5.3.0" ]; then
+ cat /tmp/svmon.out | grep memory | read f1 mem_total mem_used mem_free f5 f6
+ cat /tmp/svmon.out | grep "pg space" | read f1 f2 swap_total swap_used
+ fi
+
# delete output file
rm -f /tmp/svmon-$$.out
diff -ru --exclude CVS gridengine/source/dist/util/sgeCA/sge_ca cvs/gridengine/source/dist/util/sgeCA/sge_ca
--- gridengine/source/dist/util/sgeCA/sge_ca 2008-07-10 10:05:24.000000000 -0600
+++ cvs/gridengine/source/dist/util/sgeCA/sge_ca 2008-11-04 12:53:51.000000000 -0700
@@ -686,31 +686,37 @@
fi
# $INFOTEXT "Creating RANDFILE from '%s' in '%s'" $rfile $1
+ if [ "$2" = "default" ]; then
+ myuser=root
+ else
+ myuser=$2
+ fi
+
RANDFILE=/tmp/.rand.$$; export RANDFILE;
- $V5UTILBIN/adminrun $2 dd if=$rfile of=$RANDFILE count=2048 > /dev/null 2>&1
+ $V5UTILBIN/adminrun $myuser dd if=$rfile of=$RANDFILE count=2048 > /dev/null 2>&1
if [ $? -lt 0 ]; then
PrintError "Could not create random number for (%s -> %s)" $rfile $RANDFILE
return 1
fi
- $V5UTILBIN/adminrun $2 $OPENSSL rand -rand $RANDFILE -out $1 2048 > /dev/null 2>&1
+ $V5UTILBIN/adminrun $myuser $OPENSSL rand -rand $RANDFILE -out $1 2048 > /dev/null 2>&1
if [ $? -ne 0 ]; then
PrintError "bootstraping of rand command as user %s failed (%s -> %s)" $2 $RANDFILE $1
return 1
fi
- $V5UTILBIN/adminrun $2 $OPENSSL rand -rand $rfile -out $1 2048 > /dev/null 2>&1
+ $V5UTILBIN/adminrun $myuser $OPENSSL rand -rand $rfile -out $1 2048 > /dev/null 2>&1
if [ $? -ne 0 ]; then
PrintError "openssl rand command as user %s failed (%s -> %s)" $2 $rfile $1
return 1
fi
- $V5UTILBIN/adminrun $2 $RM $RANDFILE > /dev/null 2>&1
+ $V5UTILBIN/adminrun $myuser $RM $RANDFILE > /dev/null 2>&1
if [ $? -ne 0 ]; then
PrintError "Could not delete file %s as user %s" $RANDFILE $2
return 1
fi
- $V5UTILBIN/adminrun $2 $CHMOD 644 $1 > /dev/null 2>&1
+ $V5UTILBIN/adminrun $myuser $CHMOD 644 $1 > /dev/null 2>&1
if [ $? -ne 0 ]; then
PrintError "chmod as user %s on file %s failed" $2 $1
return 1
diff -ru --exclude CVS gridengine/source/dist/util/sgeSMF/sge_smf_support.sh cvs/gridengine/source/dist/util/sgeSMF/sge_smf_support.sh
--- gridengine/source/dist/util/sgeSMF/sge_smf_support.sh 2008-07-04 14:11:19.000000000 -0600
+++ cvs/gridengine/source/dist/util/sgeSMF/sge_smf_support.sh 2008-11-04 12:53:51.000000000 -0700
@@ -202,7 +202,7 @@
fi
template_file="$prefix/util/sgeSMF/$1_template.xml"
suffix="${SGE_CLUSTER_NAME}"
- service_file="$SGE_ROOT/$SGE_CELL/tmp_$1_$suffix.xml"
+ service_file="$SGE_ROOT/$SGE_CELL/tmp$$_$1_$suffix.xml"
if [ ! -f $template_file ]; then
$INFOTEXT "%s is missing!" $template_file
return 1
diff -ru --exclude CVS gridengine/source/dist/util/upgrade_modules/inst_upgrade.sh cvs/gridengine/source/dist/util/upgrade_modules/inst_upgrade.sh
--- gridengine/source/dist/util/upgrade_modules/inst_upgrade.sh 2008-07-22 09:32:01.000000000 -0600
+++ cvs/gridengine/source/dist/util/upgrade_modules/inst_upgrade.sh 2008-11-04 12:53:51.000000000 -0700
@@ -156,7 +156,7 @@
{
old_cell=$1
if [ ! -d "$SGE_ROOT/$SGE_CELL/common" ]; then
- ExecuteAsAdmin mkdir -p "$SGE_ROOT/$SGE_CELL/common"
+ Makedir "$SGE_ROOT/$SGE_CELL/common"
fi
FILE_LIST="bootstrap
@@ -355,9 +355,14 @@
done
fi
else
+ if [ "$backup_spooling_method" = "classic" ]; then
+ suggested_spooling_method=berkeley
+ else
+ suggested_spooling_method=classic
+ fi
#Selecting new spooling method
suggested_spoooling_params=`BootstrapGetValue ${UPGRADE_BACKUP_DIR}/$SGE_CELL/common "spooling_params"`
- SetSpoolingOptions "$suggested_spooling_params"
+ SetSpoolingOptions "$suggested_spooling_method" "$suggested_spooling_params"
fi
if [ "$keep" = false ]; then
gridengine-6.2-jni.patch:
--- NEW FILE gridengine-6.2-jni.patch ---
--- gridengine/source/daemons/qmaster/sge_thread_jvm.c.jni 2008-07-10 10:05:22.000000000 -0600
+++ gridengine/source/daemons/qmaster/sge_thread_jvm.c 2008-11-04 15:14:53.000000000 -0700
@@ -766,11 +766,17 @@
jvm_argv[2] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.caTop=%s", ctx->get_ca_root(ctx)));
jvm_argv[3] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.serverKeystore=%s", keystore_path));
jvm_argv[4] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.sgeQmasterSpoolDir=%s", ctx->get_qmaster_spool_dir(ctx)));
- jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=%s/lib/jgdi.jar:%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
+ char *libdir;
+ if (strstr(sge_get_arch(),"64") != NULL) {
+ libdir = "lib64";
+ } else {
+ libdir = "lib";
+ }
+ jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=/usr/%s/gridengine/jgdi.jar:/usr/%s/gridengine/juti.jar", libdir, libdir));
jvm_argv[6] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.policy=%s/common/jmx/java.policy", ctx->get_cell_root(ctx)));
jvm_argv[7] = strdup("-Djava.security.manager=com.sun.grid.jgdi.management.JGDISecurityManager");
- jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file://%s/lib/jgdi.jar file://%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
- jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=%s/lib/%s", ctx->get_sge_root(ctx), sge_get_arch()));
+ jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file:///usr/%s/gridengine/jgdi.jar file:///usr/%s/gridengine/juti.jar", libdir, libdir));
+ jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=/usr/%s/gridengine", libdir));
jvm_argv[10] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.access.file=%s/common/jmx/jmxremote.access", ctx->get_cell_root(ctx)));
jvm_argv[11] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.password.file=%s/common/jmx/jmxremote.password", ctx->get_cell_root(ctx)));
jvm_argv[12] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.auth.login.config=%s/common/jmx/jaas.config", ctx->get_cell_root(ctx)));
--- gridengine/source/libs/jgdi/util/java.policy.template.jni 2008-02-13 07:35:11.000000000 -0700
+++ gridengine/source/libs/jgdi/util/java.policy.template 2008-11-06 09:32:31.000000000 -0700
@@ -39,7 +39,7 @@
** grant principal javax.management.remote.JMXPrincipal "controlRole"
**
*/
-grant codeBase "file:${com.sun.grid.jgdi.sgeRoot}/lib/jgdi.jar" {
+grant codeBase "file:${java.library.path}/jgdi.jar" {
permission java.net.SocketPermission "*:1024-", "accept,connect";
permission java.net.SocketPermission "localhost:1024-", "listen,resolve";
permission java.lang.RuntimePermission "loadLibrary.jgdi";
gridengine-6.2-sge_ca.patch:
--- NEW FILE gridengine-6.2-sge_ca.patch ---
--- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca 2008-07-10 10:05:24.000000000 -0600
+++ gridengine/source/dist/util/sgeCA/sge_ca 2008-11-04 14:28:35.000000000 -0700
@@ -919,7 +919,10 @@
JAVA=$JAVA_HOME/bin/java
fi
- JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar"
+ case "$ARCH" in
+ *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";;
+ *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";;
+ esac
JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties"
OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1`
@@ -1713,20 +1716,6 @@
exit 1
fi
-if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then
- echo
- echo "Error: The lib directory \"$ROOT_PATH/lib/$ARCH\" does not exist"
- echo "Please verify your setup and restart this script. Exit."
- exit 1
-fi
-
-if [ "$LD_LIBRARY_PATH" = "" ]; then
- LD_LIBRARY_PATH=$ROOT_PATH/lib/$ARCH
-else
- LD_LIBRARY_PATH="$ROOT_PATH/lib/${ARCH}:${LD_LIBRARY_PATH}"
-fi
-export LD_LIBRARY_PATH
-
#---------------------------------------
# setup INFOTEXT begin
#---------------------------------------
@@ -1765,7 +1754,7 @@
#
# Check wether all needed binaries are exists
#
-for i in adminrun openssl uidgid; do
+for i in adminrun uidgid; do
if [ ! -x $V5UTILBIN/$i ]; then
PrintErrorAndExit 1 "Error: Can't find binary \"%s\"" $V5UTILBIN/$i
fi
@@ -1794,7 +1783,7 @@
CAKEY=cakey.pem
CACERT=cacert.pem
-OPENSSL=$V5UTILBIN/openssl
+OPENSSL=/usr/bin/openssl
AUTO="false"
#-----------------------------
--- NEW FILE import.log ---
gridengine-6_2-3_fc11:F-10:gridengine-6.2-3.fc11.src.rpm:1226423392
gridengine-6.2-rctemplates.patch:
Index: gridengine-6.2-rctemplates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/F-10/gridengine-6.2-rctemplates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gridengine-6.2-rctemplates.patch 11 Aug 2008 16:41:50 -0000 1.1
+++ gridengine-6.2-rctemplates.patch 11 Nov 2008 17:10:17 -0000 1.2
@@ -1,6 +1,6 @@
---- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates 2008-07-14 17:04:51.000000000 -0600
-+++ gridengine/source/dist/util/install_modules/inst_common.sh 2008-07-15 14:51:07.000000000 -0600
-@@ -285,8 +285,8 @@
+--- 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."
@@ -10,7 +10,45 @@
exit 1
fi
fi
-@@ -1463,6 +1453,7 @@
+@@ -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
@@ -52,9 +90,56 @@
$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-07-15 16:03:19.000000000 -0600
-+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2008-07-15 16:09:03.000000000 -0600
-@@ -1216,7 +1216,7 @@
+--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2008-11-04 15:21:51.000000000 -0700
++++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2008-11-04 15:34:35.000000000 -0700
+@@ -194,8 +194,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] >> "
+@@ -204,7 +204,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
+@@ -713,6 +713,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
+ }
+
+ #-------------------------------------------------------------------------
+@@ -928,7 +931,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
+@@ -1187,6 +1190,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"
+@@ -1228,7 +1232,7 @@
exit 1
fi
else
@@ -63,6 +148,23 @@
fi
CheckRunningDaemon sge_qmaster
run=$?
+@@ -1793,6 +1797,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
+
+@@ -1813,7 +1818,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 @@
@@ -70,22 +172,23 @@
fi
else
- $SGE_STARTUP_FILE
-+ /sbin/server sge_execd start
++ /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-08-11 09:43:32.000000000 -0600
-@@ -567,8 +567,6 @@
++++ 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 +711,6 @@
+@@ -713,7 +713,6 @@
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
@@ -93,19 +196,20 @@
PrepareRPCServerStart
GiveBerkelyHints
else
-@@ -763,11 +760,8 @@
+@@ -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 +931,6 @@
+@@ -937,7 +934,6 @@
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
@@ -113,7 +217,7 @@
SetupWinSvc execinst #service install during execd installation -> param: execinst
StartExecd
AddQueue
-@@ -971,7 +964,6 @@
+@@ -971,7 +967,6 @@
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
@@ -121,7 +225,7 @@
SetupWinSvc execinst #service install during execd installation -> param: execinst
StartExecd
AddQueue
-@@ -1221,7 +1213,6 @@
+@@ -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`
@@ -129,7 +233,7 @@
$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 +1248,6 @@
+@@ -1257,7 +1251,6 @@
. $SGE_ROOT/$SGE_CELL/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
$SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &
@@ -137,7 +241,7 @@
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 +1434,6 @@
+@@ -1444,20 +1437,7 @@
COMMONDIR=$SGE_CELL/common
@@ -155,6 +259,7 @@
- $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
Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/F-10/gridengine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gridengine.spec 26 Sep 2008 19:40:32 -0000 1.5
+++ gridengine.spec 11 Nov 2008 17:10:18 -0000 1.6
@@ -6,7 +6,7 @@
Name: gridengine
Version: 6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -30,12 +30,19 @@
Source9: gridengine.sysconfig
Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
Source11: README
-# Link ssl libraries dynamically
-Patch0: gridengine-6.2beta-ssl.patch
+# Upstream CVS changes to util scripts
+Patch0: gridengine-6.2-cvsutil.patch
+# Link ssl libraries dynamically so dependencies are pulled in
+Patch1: gridengine-6.2beta-ssl.patch
# Make inst_common.sh not look for qmon or sge_execd since they might not be installed
-Patch1: gridengine-6.2beta-inst.patch
+Patch2: gridengine-6.2beta-inst.patch
# Don't need to make rc files in inst_common.sh
-Patch2: gridengine-6.2-rctemplates.patch
+# Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
+Patch3: gridengine-6.2-rctemplates.patch
+# Fixup sge_ca to use system openssl and java paths
+Patch4: gridengine-6.2-sge_ca.patch
+# Fixup jni paths
+Patch5: gridengine-6.2-jni.patch
# aimk sets -Werror, but there are lots of warnings
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
Patch7: gridengine-6.1pre-Werror.patch
@@ -58,6 +65,7 @@
BuildRequires: java-devel >= 1:1.6.0, javacc, ant-junit, ant-nodeps
BuildRequires: elfutils-libelf-devel, net-tools
BuildRequires: fedora-usermgmt-devel
+Requires: ncurses
Requires(posttrans): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives
%{?FE_USERADD_REQ}
@@ -141,9 +149,12 @@
cp %SOURCE8 %SOURCE11 .
#Remove unneeded shbangs
sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p1 -b .ssl
-%patch1 -p1 -b .inst
-%patch2 -p1 -b .rctemplates
+%patch0 -p2 -b .cvsutil
+%patch1 -p1 -b .ssl
+%patch2 -p1 -b .inst
+%patch3 -p1 -b .rctemplates
+%patch4 -p1 -b .sge_ca
+%patch5 -p1 -b .jni
%patch7 -p1 -b .Werror
%patch15 -p1 -b .lesstif
%patch19 -p1 -b .auto
@@ -162,6 +173,9 @@
#Fix flags for qmake build
find source/3rdparty/qmake source/3rdparty/qtcsh -name Makefile |
xargs sed -i -e "/^CFLAGS *=/s/=/= $RPM_OPT_FLAGS/"
+#dlopen the runtime libssl library
+soname=$(objdump -p %{_libdir}/libssl.so | awk '/SONAME/ {print $2}')
+sed -i -e s/libssl\.so/$soname/ source/libs/comm/cl_ssl_framework.c
%build
@@ -258,6 +272,7 @@
# lib
mkdir -p $RPM_BUILD_ROOT%{_prefix}
mv $RPM_BUILD_ROOT%{_datadir}/gridengine/lib $RPM_BUILD_ROOT%{_libdir}
+ln -s ../../%{_lib}/gridengine $RPM_BUILD_ROOT%{_datadir}/gridengine/lib
# libcore.so
install -p -m755 libcore.so $RPM_BUILD_ROOT%{_libdir}
# Move the JNI libraries
@@ -309,6 +324,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -p -m644 %SOURCE9 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridengine
+#sgeCA
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/sgeCA
+
# Don't package catman files
rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/catman
@@ -436,6 +454,7 @@
%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
%{_datadir}/gridengine/doc
%{_datadir}/gridengine/inst_sge
+%{_datadir}/gridengine/lib
%{_datadir}/gridengine/mpi
%{_datadir}/gridengine/my_configuration.conf
%dir %{_datadir}/gridengine/pvm
@@ -489,12 +508,24 @@
%{_datadir}/gridengine/install_qmaster
%{_datadir}/gridengine/utilbin/db_*
%{_mandir}/man8/sge_qmaster.8*
+%attr(-,%username,%username) %dir %{_localstatedir}/sgeCA
%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/qmaster
%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spool
%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spooldb
%changelog
+* Wed Nov 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-3
+- Add Requires: ncurses for "clear"
+- Add patch from CVS to update install scripts
+- Patch sge_ca script not to use system openssl
+- Modify code to dlopen runtime ssl library
+- Patch install_qmaster to update /etc/sysconfig/gridengine
+- Point install scripts to proper JAVA_HOME
+- Have sgemaster init script use /etc/sysconfig/gridengine
+- Add patch to point to jni library locations
+- Make sure install_qmaster sets up default managers/operators
+
* Fri Sep 26 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-2
- No more sge_schedd in 6.2, remove from startup script
Index: sgemaster
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/F-10/sgemaster,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sgemaster 26 Sep 2008 19:40:32 -0000 1.2
+++ sgemaster 11 Nov 2008 17:10:18 -0000 1.3
@@ -22,10 +22,19 @@
master_exec="/usr/bin/sge_qmaster"
master_prog="sge_qmaster"
+
+#Defaults
SGE_ROOT=/usr/share/gridengine; export SGE_ROOT
SGE_CELL=default; export SGE_CELL
+
+#Configuration
+config=/etc/sysconfig/gridengine
+[ -e $config ] && . $config
+
qmaster_spool_dir=`awk '$1 == "qmaster_spool_dir" { print $2 }' $SGE_ROOT/$SGE_CELL/common/bootstrap`
master_pidfile=$qmaster_spool_dir/qmaster.pid
+retval=0
+
#---------------------------------------------------------------------------
# CheckIfQmasterHost
- Previous message (by thread): rpms/pyke/devel .cvsignore, 1.3, 1.4 pyke.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/kernel/F-10 linux-2.6-alsa-revo51-headphone.patch, NONE, 1.1 kernel.spec, 1.1132, 1.1133
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list