Changeset 55 for trunk

Timestamp:

07/03/12 11:42:05 (12 years ago)

Author:

bas

Message:

Preparing for TORQUE 4.X release

Location:

trunk

Files:

• changelog (modified) (1 diff)
• conf_torque (modified) (2 diffs)
• init.d (modified) (5 diffs)
• patches/apply (modified) (1 diff)
• rules (modified) (3 diffs)

trunk/changelog

@@ +1 @@
+torque (4.1.0-1) unstable; urgency=low
+
+  * New torque release to test
+
+ -- Bas van der Vlies <basv@sara.nl>  Tue, 03 Jul 2012 09:06:02 +0200
+
 torque (2.4.16-2) unstable; urgency=low
 

trunk/conf_torque

@@ -9 +9 @@
 set -x
 
-
-if [ -f torque_oldconfigure ]
-then
-  LIBS="-lutil" ./configure --prefix=/usr \
-        --libdir=/usr/lib/torque \
-        --includedir=/usr/include/torque \
-        --set-server-home=/var/spool/torque \
-        --set-tmpdir=/var/tmp \
-        --enable-syslog \
-        --set-sched=c \
-        --set-sched-code=fifo \
-        --set-default-server=localhost \
-        --disable-gui \
-        --set-cflags=" -g -D__PNEWTTY" \
-        --enable-docs \
-        --with-scp
-else
- CFLAGS=" -D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr \
+CFLAGS=" -D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr \
         --includedir=/usr/include/torque \
         --with-server-home=/var/spool/torque \
@@ -41 +24 @@
         --enable-docs \
         --with-rcp=scp
-fi
-
-#--libdir=/usr/lib \

trunk/init.d

@@ -32 +32 @@
 PBS_SCHED_OPTS=''
 PBS_SERVER_OPTS='-a t'
+PBS_TRQAUTH_OPTS=""
 
 if [ ! -f $DEFAULT ]
@@ -56 +57 @@
 }
 
+start_trqauth() {
+        start-stop-daemon --start --quiet --exec $TORQUE_DIR/trqauthd -- $PBS_TRQAUTH_OPTS
+        echo " pbs trqauth"
+}
+
 start_daemons() {
-    check_perms
-
-        if [ "$PBS_SERVER" = "1" ]
-        then
-                start_server
-        fi 
-        
-        if [ "$PBS_SCHED" = "1" ]
-        then
-                start_sched
-        fi 
-        
-        if [ "$PBS_MOM" = "1" ]
-        then
-                start_mom
-        fi
+    check_perms 
+
+    ## Always start trqauth daemon
+    #
+    start_trqauth
+
+    if [ "$PBS_SERVER" = "1" ] 
+    then
+        start_server
+    fi 
+        
+    if [ "$PBS_SCHED" = "1" ]
+    then
+        start_sched
+    fi 
+        
+   if [ "$PBS_MOM" = "1" ]
+   then
+        start_mom
+   fi
 }
 
@@ -94 +104 @@
 }
 
+stop_trqauth() {
+        start-stop-daemon --retry 5 --stop --quiet --exec $TORQUE_DIR/trqauthd
+        echo " pbs trqauth"
+}
+
 stop_daemons() {
         if [ "$PBS_SERVER" = "1" ]
@@ -110 +125 @@
         fi
 }
-
 
 ## Check permissions and directories
@@ -171 +185 @@
         ;;
 
+        restart-server)
+                echo "Restarting pbs trqauthr: "
+                stop_trqauth
+                sleep 1
+                start_trqauth
+        ;;
+
         *)
-                echo "Usage: $0 {restart|start|stop|restart-mom|restart-server|restart-sched}\n" >&2
+                echo "Usage: $0 {restart|start|stop|restart-mom|restart-server|restart-sched|restart-trqauth}\n" >&2
                 exit 1
         ;;

trunk/patches/apply

@@ -13 +13 @@
 #cp debian/patches/pbs_mkdirs.in buildutils 
 
-r=`grep -c 2.1.0 CHANGELOG`
-case `uname -r` in
-        2.6*)
-                if [ $r -eq 0 ]
-                then
-                        touch torque_oldconfigure
-                else
-                        touch torque_newconfigure
-                fi
-        ;;
-esac
+## We do not need this anymore
+#
+#r=`grep -c 2.1.0 CHANGELOG`
+#case `uname -r` in
+#       2.6*)
+#               if [ $r -eq 0 ]
+#               then
+#                       touch torque_oldconfigure
+#               else
+#                       touch torque_newconfigure
+#               fi
+#       ;;
+#esac
 
 # Always do this patch

trunk/rules

@@ -23 +23 @@
 
         # apply some patches
-        debian/patches/apply
+        #debian/patches/apply
 
         touch patched
@@ -77 +77 @@
         dh_installdebconf
         dh_compress
-        dh_fixperms -Xpbs_iff
+        dh_fixperms
         dh_installdeb 
         dh_makeshlibs
@@ -96 +96 @@
         # directories. Thanks to Jaap Dijkshoorn
         #
-        cp buildutils/pbs_mkdirs debian/torque/usr/sbin
+        #cp buildutils/pbs_mkdirs debian/torque/usr/sbin
 
         # Not in the standard install ;-)
         #
-        cp src/include/rm.h debian/torque/usr/include/torque
-        cp src/include/log.h debian/torque/usr/include/torque
-
-        #
-        # pbs_iff permissions must suid root
-        #
-        chown root.root debian/torque/usr/sbin/pbs_iff
-        chmod 4755 debian/torque/usr/sbin/pbs_iff
+        #cp src/include/rm.h debian/torque/usr/include/torque
+        #cp src/include/log.h debian/torque/usr/include/torque
 
         dh_builddeb