Hi, I've tryed upgrade sge to 6.1U3 stable and the package builds but some files are missing. I also did not touch opkg-sge for now. (don't know where to lok at yet)
the problem is the aimk file (make wrapper that fails and thus some items are
not built).
Attached are (work so far):
svn diff from directory: pkgsrc/opkg/sge/trunk/rpm
a tar that contains the modified files (spec and 2 patches)
To do that I did:
downloaded ge-V61u3_TAG-src.tar.gz
renamed to sge-V61u3_TAG-src.tar.gz (added the leading "s")
renamed the spec file to sge-6.1u3.spec (and updated it)
- removed patch 5 (useless, now 64bit is correctly handled)
=> renamed patch5 to qmon_geometryp_h.patch.obsolete (can be removed
completely)
updated 2 patches (inst_execd.sh and aimk.patch)
I did not checked:
- sge*scripts.ta.gz archives.
- oscar_cluster.conf
Best regards.
--
Olivier LAHAYE
CEAEA Saclay
DRT-LIST-DCSI-DIR
sge_trunk_61u3.tar.bz2
Description: application/bzip-compressed-tar
Index: aimk.patch
===================================================================
--- aimk.patch (révision 9194)
+++ aimk.patch (copie de travail)
@@ -1,110 +1,55 @@
-*** source/aimk.orig 2006-04-11 13:58:41.000000000 -0500
---- source/aimk 2006-04-11 13:59:36.000000000 -0500
-***************
-*** 1115,1124 ****
- set REL = `/usr/bin/uname -r`
- switch ($REL)
- case "6.*":
-! set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Werror -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN6 -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- breaksw
- case "7.*":
-! set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Werror -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN7 -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- breaksw
- default:
- echo DARWIN release \"$REL\" not supported!
---- 1115,1124 ----
- set REL = `/usr/bin/uname -r`
- switch ($REL)
- case "6.*":
-! set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN6 -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- breaksw
- case "7.*":
-! set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN7 -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- breaksw
- default:
- echo DARWIN release \"$REL\" not supported!
-***************
-*** 1252,1258 ****
- set COMPILE_DC = 1
- set MAKE = gmake
-
-! set CFLAGS = "$OFLAG -Werror -woff 3201,3496 -n32 -mips3 -mp -DFD_SETSIZE=8192 -DIRIX -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- set NOERR_CFLAG = "-woff 1110,1174,1209"
- set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
- set LFLAGS = "-n32 -mips3 $DEBUG_FLAG $LFLAGS"
---- 1252,1258 ----
- set COMPILE_DC = 1
- set MAKE = gmake
-
-! set CFLAGS = "$OFLAG -woff 3201,3496 -n32 -mips3 -mp -DFD_SETSIZE=8192 -DIRIX -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
- set NOERR_CFLAG = "-woff 1110,1174,1209"
- set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
- set LFLAGS = "-n32 -mips3 $DEBUG_FLAG $LFLAGS"
-***************
-*** 1385,1391 ****
- endif
- endif
-
-! set CFLAGS = "$OFLAG -Wall -Werror -Wstrict-prototypes -D__GRIDENGINE_FD_SETSIZE=8192 -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"
- endif
---- 1385,1391 ----
- endif
- endif
-
-! set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -D__GRIDENGINE_FD_SETSIZE=8192 -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"
- endif
-***************
-*** 1483,1489 ****
- set CFLAGS = "$DEBUG_FLAG $CFLAGS"
- set CFLAGS = "-DGETHOSTBYADDR_M -D_ALL_SOURCE -D_REENTRANT $CFLAGS"
- set CFLAGS = "-DINTERIX -D$COMPILE_ARCH -DGETHOSTBYNAME_M $CFLAGS"
-! set CFLAGS = "-Wall -Werror -O0 -pipe $CFLAGS"
- #set LFLAGS = "-Wl,-EL,-b=pe-i1386 $LFLAGS"
- else
- set CC = cc
---- 1483,1489 ----
- set CFLAGS = "$DEBUG_FLAG $CFLAGS"
- set CFLAGS = "-DGETHOSTBYADDR_M -D_ALL_SOURCE -D_REENTRANT $CFLAGS"
- set CFLAGS = "-DINTERIX -D$COMPILE_ARCH -DGETHOSTBYNAME_M $CFLAGS"
-! set CFLAGS = "-Wall -O0 -pipe $CFLAGS"
- #set LFLAGS = "-Wl,-EL,-b=pe-i1386 $LFLAGS"
- else
- set CC = cc
-***************
-*** 1602,1608 ****
- set DEBUG_FLAG = "$DEBUG_FLAG -pg -DSGE_LOCK_DEBUG"
- endif
-
-! set CFLAGS = "$OFLAG -Wall -Werror -Wstrict-prototypes -DLINUX -DSLINUX -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
- set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
- set LFLAGS = "$DEBUG_FLAG $LFLAGS"
-
---- 1602,1608 ----
- set DEBUG_FLAG = "$DEBUG_FLAG -pg -DSGE_LOCK_DEBUG"
- endif
-
-! set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -DLINUX -DSLINUX -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
- set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
- set LFLAGS = "$DEBUG_FLAG $LFLAGS"
-
-***************
-*** 1706,1712 ****
- endif
- set CFLAGS = "-Xc -v $OFLAG $MEMFLAG -ftrap=division $CFLAGS $DEBUG_FLAG"
- else if ( $CC == gcc) then
-! #set CFLAGS = "-Wall -Werror -Wstrict-prototypes $CFLAGS"
- set CFLAGS = "-Wall -Wstrict-prototypes $CFLAGS"
- set SHARED_CFLAGS = "-fPIC"
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
---- 1706,1712 ----
- endif
- set CFLAGS = "-Xc -v $OFLAG $MEMFLAG -ftrap=division $CFLAGS $DEBUG_FLAG"
- else if ( $CC == gcc) then
-! #set CFLAGS = "-Wall -Wstrict-prototypes $CFLAGS"
- set CFLAGS = "-Wall -Wstrict-prototypes $CFLAGS"
- set SHARED_CFLAGS = "-fPIC"
- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
+--- source/aimk.orig 2007-08-29 12:27:51.000000000 +0200
++++ source/aimk 2010-02-23 15:52:25.000000000 +0100
+@@ -989,13 +989,13 @@
+ set REL = `/usr/bin/uname -r`
+ switch ($REL)
+ case "6.*":
+- set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Werror -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN6 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
++ set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN6 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
+ breaksw
+ case "7.*":
+- set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Werror -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN7 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
++ set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall-Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN7 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
+ breaksw
+ case "8.*":
+- set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Werror -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN8 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
++ set CFLAGS = "$OFLAG -no-cpp-precomp -flat_namespace -Wall -Wstrict-prototypes -DFD_SETSIZE=8192 -DDARWIN -DDARWIN8 -D$BUILDARCH -DGETHOSTBYNAME -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS"
+ breaksw
+ default:
+ echo DARWIN release \"$REL\" not supported!
+@@ -1140,7 +1140,7 @@
+ set COMPILE_DC = 1
+ set MAKE = gmake
+
+- set CFLAGS = "$OFLAG -Werror -woff 1035,3201,3496 -n32 -mips3 -mp -DFD_SETSIZE=8192 -DIRIX -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG -DUSE_SGE_UNSETENV $CFLAGS"
++ set CFLAGS = "$OFLAG -woff 1035,3201,3496 -n32 -mips3 -mp -DFD_SETSIZE=8192 -DIRIX -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG -DUSE_SGE_UNSETENV $CFLAGS"
+ set NOERR_CFLAG = "-woff 47,1110,1174,1209"
+ set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
+ set LFLAGS = "-n32 -mips3 $DEBUG_FLAG $LFLAGS"
+@@ -1326,7 +1326,7 @@
+ set CFLAGS = "$CFLAGS -Wno-strict-aliasing"
+ endif
+
+- set CFLAGS = "$OFLAG -Wall -Werror -Wstrict-prototypes -D__GRIDENGINE_FD_SETSIZE=8192 -DLINUX -D$BUILDARCH -D$COMPILE_ARCH -D_GNU_SOURCE -DGETHOSTBYNAME_R6 -DGETHOSTBYADDR_R8 $DEBUG_FLAG $CFLAGS"
++ set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -D__GRIDENGINE_FD_SETSIZE=8192 -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"
+@@ -1415,7 +1415,7 @@
+ set CFLAGS = "$DEBUG_FLAG $CFLAGS"
+ set CFLAGS = "-DGETHOSTBYADDR_M -D_ALL_SOURCE -D_REENTRANT $CFLAGS"
+ set CFLAGS = "-DINTERIX -D$COMPILE_ARCH -DGETHOSTBYNAME_M -DUSE_SGE_UNSETENV $CFLAGS"
+- set CFLAGS = "-Wall -Werror -O0 -pipe $CFLAGS"
++ set CFLAGS = "-Wall -O0 -pipe $CFLAGS"
+ #set LFLAGS = "-Wl,-EL,-b=pe-i1386 $LFLAGS"
+ else
+ set CC = cc
+@@ -1624,7 +1624,7 @@
+ endif
+ set CFLAGS = "-Xc -v $OFLAG $MEMFLAG -ftrap=division $CFLAGS $DEBUG_FLAG"
+ else if ( $CC == gcc) then
+- #set CFLAGS = "-Wall -Werror -Wstrict-prototypes $CFLAGS"
++ #set CFLAGS = "-Wall -Wstrict-prototypes $CFLAGS"
+ set CFLAGS = "-Wall -Wstrict-prototypes $CFLAGS"
+ set SHARED_CFLAGS = "-fPIC"
+ set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
Index: inst_execd.sh.patch
===================================================================
--- inst_execd.sh.patch (révision 9194)
+++ inst_execd.sh.patch (copie de travail)
@@ -1,5 +1,5 @@
---- source/dist/util/install_modules/inst_execd.sh 2005-04-22 11:55:19.000000000 -0500
-+++ source/dist/util/install_modules/inst_execd.sh.new 2005-08-24 12:01:25.030398984 -0500
+--- source/dist/util/install_modules/inst_execd.sh.orig 2007-07-23 14:45:02.000000000 +0200
++++ source/dist/util/install_modules/inst_execd.sh 2010-02-23 15:38:52.000000000 +0100
@@ -48,19 +48,25 @@
return
fi
@@ -38,7 +38,7 @@
$CLEAR
}
-@@ -93,7 +99,7 @@
+@@ -105,7 +111,7 @@
fi
$INFOTEXT -n "\nPlease enter cell name which you used for the qmaster\n" \
"installation or press <RETURN> to use [%s] >> " $SGE_CELL
@@ -47,7 +47,7 @@
if [ "$INP" = "" ]; then
SGE_CELL=default
else
-@@ -120,7 +126,11 @@
+@@ -132,7 +138,11 @@
$INFOTEXT -log "\nUsing cell: >%s<\n" $SGE_CELL_VAL
fi
@@ -60,7 +60,7 @@
$CLEAR
GetAdminUser
-@@ -366,7 +376,8 @@
+@@ -401,7 +411,8 @@
exit 1
fi
else
@@ -70,7 +70,7 @@
"Hit <RETURN> to continue >>"
$CLEAR
done=true
-@@ -403,7 +414,12 @@
+@@ -438,7 +449,12 @@
$INFOTEXT "Local configuration for host >%s< created." $HOST
$INFOTEXT -log "Local configuration for host >%s< created." $HOST
fi
@@ -84,7 +84,7 @@
}
-@@ -415,7 +431,11 @@
+@@ -450,7 +466,11 @@
$INFOTEXT -u "\nGrid Engine execution daemon startup"
$INFOTEXT "\nStarting execution daemon. Please wait ..."
$SGE_STARTUP_FILE
@@ -97,7 +97,7 @@
$CLEAR
}
-@@ -466,15 +486,22 @@
+@@ -506,15 +526,22 @@
"You do not need to add this host now, but before running jobs on this host\n" \
"it must be added to at least one queue.\n" $slots
@@ -126,19 +126,19 @@
}
GetLocalExecdSpoolDir()
-@@ -484,8 +511,9 @@
- "a global\nexecd spool directory. This is used, if no local " \
- "spool directory is configured.\n\n Now you can enter a local spool " \
- "directory for this host.\n"
+@@ -531,8 +558,9 @@
+ "local spool directory MUST be set\nto a local harddisk directory.\nInstalling " \
+ "an execd without local spool directory makes the host unuseable.\nLocal " \
+ "spooling on local harddisk is mandatory for Windows systems.\n"
- $INFOTEXT -n -auto $AUTO -ask "y" "n" -def "n" "Do you want to configure a local spool directory\n for this host (y/n) [n] >> "
- ret=$?
+ #$INFOTEXT -n -auto $AUTO -ask "y" "n" -def "n" "Do you want to configure a local spool directory\n for this host (y/n) [n] >> "
+ # I edited this to always circumvent creating local spool dirs -- >ret=$?
-+ # ret=$?
++ #ret=$?
while [ $ret = 0 ]; do
$INFOTEXT -n "Please enter the local spool directory now! >> "
-@@ -496,7 +524,11 @@
+@@ -543,7 +571,11 @@
LOCAL_EXECD_SPOOL="undef"
else
$INFOTEXT "Using local execd spool directory [%s]" $LOCAL_EXECD_SPOOL
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
_______________________________________________ Oscar-devel mailing list Oscar-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/oscar-devel
