rpms/gridengine/devel gridengine-6.2u2_1-Werror.patch, NONE, 1.1 gridengine-6.2u2_1-izpack.patch, NONE, 1.1 gridengine-6.2u2_1-libs.patch, NONE, 1.1 gridengine-6.2u2_1-rctemplates.patch, NONE, 1.1 gridengine-6.2u2_1-rpath.patch, NONE, 1.1 gridengine-6.2u2_1-sge_ca.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gridengine.spec, 1.13, 1.14 sources, 1.6, 1.7 gridengine-6.1pre-Werror.patch, 1.1, NONE gridengine-6.1u3-rpath.patch, 1.1, NONE gridengine-6.2-sge_ca.patch, 1.1, NONE gridengine-6.2beta2-libs.patch, 1.1, NONE gridengine-6.2u1-rctemplates.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Mon Apr 6 18:49:09 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10976
Modified Files:
.cvsignore gridengine.spec sources
Added Files:
gridengine-6.2u2_1-Werror.patch
gridengine-6.2u2_1-izpack.patch gridengine-6.2u2_1-libs.patch
gridengine-6.2u2_1-rctemplates.patch
gridengine-6.2u2_1-rpath.patch gridengine-6.2u2_1-sge_ca.patch
Removed Files:
gridengine-6.1pre-Werror.patch gridengine-6.1u3-rpath.patch
gridengine-6.2-sge_ca.patch gridengine-6.2beta2-libs.patch
gridengine-6.2u1-rctemplates.patch
Log Message:
* Mon Apr 6 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u2_1-1
- Update to 6.2u2_1
- Rebase several patches
gridengine-6.2u2_1-Werror.patch:
--- NEW FILE gridengine-6.2u2_1-Werror.patch ---
--- gridengine/source/aimk.Werror 2009-03-19 16:16:18.000000000 -0600
+++ gridengine/source/aimk 2009-03-19 16:25:58.000000000 -0600
@@ -1392,7 +1392,7 @@
set CFLAGS = "$CFLAGS -Wno-strict-aliasing"
endif
- set CFLAGS = "$OFLAG -Wall -Werror -Wstrict-prototypes -DUSE_POLL -DLINUX -D$BUILDARCH -D$COMPILE_ARCH -D_GNU_SOURCE -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
+ set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -DUSE_POLL -DLINUX -D$BUILDARCH -D$COMPILE_ARCH -D_GNU_SOURCE -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
if ("$ADOC" == 1) then
set CFLAGS = "$CFLAGS -Wno-error"
gridengine-6.2u2_1-izpack.patch:
--- NEW FILE gridengine-6.2u2_1-izpack.patch ---
--- gridengine/source/clients/gui-installer/build.xml.izpack 2009-02-16 04:15:38.000000000 -0700
+++ gridengine/source/clients/gui-installer/build.xml 2009-03-25 14:05:54.000000000 -0600
@@ -66,20 +66,20 @@
<echo message="Check IzPack"/>
<!-- Check IzPack is build, if not build it -->
<condition property="izpack.isbuild">
- <available file="${izpack.home}/_build"/>
+ <available file="${izpack.lib}/standalone-compiler.jar"/>
</condition>
<antcall target="build.izpack"/>
<!-- Check that IzPack was build and we have it on the classpath -->
<condition property="izpack.complete">
<available classpath="${javac.classpath}" classname="com.izforge.izpack.installer.IzPanel"/>
</condition>
- <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.home property in the gridengine/source/build_private.properties first!"/>
+ <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.lib property in the gridengine/source/build_private.properties first!"/>
<!-- Let's copy the stuff we need locally to our build.dir, so each user works with his own files -->
<property name="build.panels.dir" value="bin/panels"/>
<property name="compiler.path" value="${build.dir}/standalone-compiler.jar"/>
<mkdir dir="${build.panels.dir}"/>
- <copyfile src="${izpack.home}/lib/standalone-compiler.jar" dest="${compiler.path}"/>
+ <copyfile src="${izpack.lib}/standalone-compiler.jar" dest="${compiler.path}"/>
<echo message="Building prerequsities from source/3rdparty/IzPack/src ..."/>
<javac srcdir="../../3rdparty/IzPack/src"
gridengine-6.2u2_1-libs.patch:
--- NEW FILE gridengine-6.2u2_1-libs.patch ---
--- gridengine/source/3rdparty/qmon/ltree/Makefile.aimk.libs 2008-02-01 14:19:16.000000000 -0700
+++ gridengine/source/3rdparty/qmon/ltree/Makefile.aimk 2008-02-01 14:19:09.000000000 -0700
@@ -27,7 +27,7 @@
$(RANLIB) libXltree.a
libXltree$(SHAREDEXT): $(XLTREE_OBJS)
- $(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) $(XLIBS)
+ $(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) -lXm
Xltree_clean:
$(RM) $(XLTREE_OBJS) libXltree.a libXltree$(SHAREDEXT)
gridengine-6.2u2_1-rctemplates.patch:
--- NEW FILE gridengine-6.2u2_1-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
@@ -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()
--- 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/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
--- gridengine/source/dist/inst_sge.rctemplates 2009-02-16 05:01:28.000000000 -0700
+++ gridengine/source/dist/inst_sge 2009-03-19 16:04:37.000000000 -0600
@@ -591,8 +591,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
@@ -745,7 +744,6 @@
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
- AddSGEStartUpScript $euid "bdb"
PrepareRPCServerStart
GiveBerkelyHints
else
@@ -797,11 +795,9 @@
AddDefaultUsersets
AddCommonFiles
AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
+ SetupDefaultUsers $euid
CreateSettingsFile
InitCA
- AddSGEStartUpScript $euid master
StartQmaster
AddWindowsAdmin
AddHosts
@@ -975,7 +971,6 @@
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
@@ -1011,7 +1006,6 @@
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
- AddSGEStartUpScript $euid execd
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
@@ -1268,7 +1262,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"
@@ -1305,7 +1298,6 @@
. $SGE_ROOT/$CELL_NAME/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
$SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &
- AddSGEStartUpScript $euid shadow
else
echo ". $SGE_ROOT/$CELL_NAME/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
@@ -1501,20 +1493,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-6.2u2_1-rpath.patch:
--- NEW FILE gridengine-6.2u2_1-rpath.patch ---
--- gridengine/source/aimk.rpath 2009-03-19 16:30:16.000000000 -0600
+++ gridengine/source/aimk 2009-03-20 08:11:37.000000000 -0600
@@ -1454,10 +1454,8 @@
endif
set JAVA_ARCH = "linux"
- # due to -rpath relative_path the LD_LIBRARY_PATH not needed anymore
- set RUNPATH = -Wl,-rpath,'\$$ORIGIN'/../../lib/$buildarch
- set LFLAGS = "$LFLAGS $RUNPATH"
- set SHARED_LFLAGS = "$SHARED_LFLAGS $RUNPATH"
+ set LFLAGS = "$LFLAGS"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS"
if ( $COMPILE_ARCH == "ULINUX86_24" || $COMPILE_ARCH == "ULINUXAMD64_24" ) then
echo "Ignore jemalloc for unsupported architectures!"
gridengine-6.2u2_1-sge_ca.patch:
--- NEW FILE gridengine-6.2u2_1-sge_ca.patch ---
--- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca 2008-12-08 13:38:02.000000000 -0700
+++ gridengine/source/dist/util/sgeCA/sge_ca 2009-03-19 16:11:13.000000000 -0600
@@ -928,7 +928,10 @@
return 1
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`
@@ -1722,22 +1725,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
-
-shlib_path_name=`$ROOT_PATH/util/arch -lib`
-old_shlib_path_name=`eval echo '$'$shlib_path_name`
-if [ x$old_shlib_path_name = x ]; then
- eval $shlib_path_name=$ROOT_PATH/lib/$ARCH
-else
- eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}"
-fi
-export $shlib_path_name
-
#---------------------------------------
# setup INFOTEXT begin
#---------------------------------------
@@ -1776,7 +1763,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
@@ -1805,7 +1792,7 @@
CAKEY=cakey.pem
CACERT=cacert.pem
-OPENSSL=$V5UTILBIN/openssl
+OPENSSL=/usr/bin/openssl
AUTO="false"
#-----------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Dec 2008 23:37:13 -0000 1.5
+++ .cvsignore 6 Apr 2009 18:49:08 -0000 1.6
@@ -1 +1 @@
-ge-V62u1_TAG-src.tar.gz
+ge-V62u2_1_TAG-src.tar.gz
Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gridengine.spec 25 Feb 2009 01:07:24 -0000 1.13
+++ gridengine.spec 6 Apr 2009 18:49:08 -0000 1.14
@@ -5,8 +5,8 @@
%define gecos Grid Engine
Name: gridengine
-Version: 6.2u1
-Release: 4%{?dist}
+Version: 6.2u2_1
+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/190/ge-V62u1_TAG-src.tar.gz
+Source0: http://gridengine.sunsource.net/files/documents/7/197/ge-V62u2_1_TAG-src.tar.gz
Source1: gridengine-ppc.tar.gz
Source2: my_configuration.conf
Source3: sge.csh
@@ -37,16 +37,16 @@
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.2u1-rctemplates.patch
+Patch3: gridengine-6.2u2_1-rctemplates.patch
# Fixup sge_ca to use system openssl and java paths
-Patch4: gridengine-6.2-sge_ca.patch
+Patch4: gridengine-6.2u2_1-sge_ca.patch
# Fixup jni paths
Patch5: gridengine-6.2-jni.patch
# Use system db_ utils
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.1pre-Werror.patch
+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
@@ -56,12 +56,14 @@
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2586
Patch19: gridengine-6.1u2-auto.patch
# Don't use rpaths
-Patch22: gridengine-6.1u3-rpath.patch
+Patch22: gridengine-6.2u2_1-rpath.patch
# Fix linking with proper libs
# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2588
-Patch25: gridengine-6.2beta2-libs.patch
+Patch25: gridengine-6.2u2_1-libs.patch
# Handle ignoring return codes
Patch26: gridengine-6.2beta2-error.patch
+# Handle packaged izpack
+Patch27: gridengine-6.2u2_1-izpack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@ -174,6 +176,7 @@
%patch22 -p1 -b .rpath
%patch25 -p1 -b .libs
%patch26 -p1 -b .error
+%patch27 -p1 -b .izpack
sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
#Don't ship rctemplates
rm -rf source/dist/util/rctemplates
@@ -217,6 +220,7 @@
cat > build_private.properties <<EOF
javacc.home=%{_javadir}
libs.junit.classpath=%{_javadir}/junit.jar
+izpack.lib=/usr/share/java/izpack
EOF
#Build libcore.so
@@ -227,7 +231,8 @@
./aimk -only-depend
scripts/zerodepend
./aimk depend
-./aimk
+#TODO - Need IzPack for GUI Installer
+./aimk -no-gui-inst
./aimk -man
@@ -365,6 +370,9 @@
#Cleanup some patch backups that get shipped
rm $RPM_BUILD_ROOT%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
+#TODO - Ship the GUI installer
+rm $RPM_BUILD_ROOT%{_datadir}/gridengine/start_gui_installer
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -528,6 +536,10 @@
%changelog
+* Mon Apr 6 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u2_1-1
+- Update to 6.2u2_1
+- Rebase several patches
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2u1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Dec 2008 23:37:14 -0000 1.6
+++ sources 6 Apr 2009 18:49:08 -0000 1.7
@@ -1,2 +1,2 @@
-9ba9fbdfa3568bc278ba53db8b52223c ge-V62u1_TAG-src.tar.gz
5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
+5340a5f6c260a819ba224ad5fe3cba45 ge-V62u2_1_TAG-src.tar.gz
--- gridengine-6.1pre-Werror.patch DELETED ---
--- gridengine-6.1u3-rpath.patch DELETED ---
--- gridengine-6.2-sge_ca.patch DELETED ---
--- gridengine-6.2beta2-libs.patch DELETED ---
--- gridengine-6.2u1-rctemplates.patch DELETED ---
More information about the fedora-extras-commits
mailing list