adaptivecomputing · knielson · Dec 2, 2016 · Dec 2, 2016 · Dec 2, 2016 · Dec 2, 2016
diff --git a/Makefile.am b/Makefile.am
@@ -3,6 +3,23 @@ include $(top_srcdir)/buildutils/config.mk
 ACLOCAL_AMFLAGS = -I buildutils
 SUBDIRS = src doc contrib/blcr contrib/init.d contrib/systemd
 
+noinst_SCRIPTS = torque.setup
+
+edit_scripts = sed \
+    -e "s|@exec_prefix[@]|$(exec_prefix)|g" \
+    -e "s|@PBS_HOME[@]|$(PBS_SERVER_HOME)|g"
+
+torque.setup: Makefile
+	rm -f $@ [email protected]
+	my_srcdir=''; \
+	  test -f ./[email protected] || my_srcdir=$(srcdir)/; \
+	  $(edit_scripts) $${my_srcdir}[email protected] >[email protected]
+	chmod +x [email protected]
+	chmod a-w [email protected]
+	mv [email protected] $@
+
+torque.setup: torque.setup.in
+
 EXTRA_DIST = acinclude.m4 \
   CHANGELOG \
   configure.ac \
@@ -25,7 +42,7 @@ EXTRA_DIST = acinclude.m4 \
 	README.new_in_51 \
 	Release_Notes \
   run_report.py \
-	torque.setup \
+        torque.setup.in \
 	torque.spec \
 	buildutils/config.mk \
 	buildutils/determine.distro \
@@ -68,6 +85,7 @@ EXTRA_DIST = acinclude.m4 \
 
 bin_SCRIPTS = pbs-config
 
+CLEANFILES = torque.setup
 DISTCLEANFILES = pbs-config current_hash
 MOSTLYCLEANFILES = *.gcda *.gcno *.gcov
 

diff --git a/buildutils/torque-build b/buildutils/torque-build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 POSIXLY_CORRECT=1
 
@@ -29,7 +29,8 @@ usage() {
     echo   "                                  /opt/coverity/default/bin/cov-build)"
     echo   "    -C|--no-coverity            Do not run coverity (default)"
     echo   ""
-    echo   "    -g|--enable-cgroups         Enable cgroups"
+    echo   "    -g|--enable-cgroups         Enable cgroups (default)"
+    echo   "    -G|--disable-cgroups        Do not enable cgroups"
     echo   "    -u|--unit-tests             Run unit-tests (default)"
     echo   "    -U|--no-unit-tests          Do not run unit tests"
     echo   ""
@@ -134,6 +135,11 @@ do
             cgroups=1
             shift
             ;;
+        -G|--disable-cgroups)
+            cgroups=0
+            with_option="$with_option --without cgroups --without hwloc"
+            shift
+            ;;
         *)
             echo "Invalid argument '${1}' specified." >&2
             usage
@@ -225,6 +231,7 @@ then
   cgroupsopts="--enable-cgroups"
   configure_options="$configure_options --enable-cgroups --with-hwloc-path=$hwloc_path"
 else
+  hwloc_path=none
   cgroupsopts="--disable-cgroups"
 fi
 
@@ -289,8 +296,10 @@ then
     mkdir -p buildutils/rpmbuild/SOURCES
     mkdir -p buildutils/rpmbuild/SPECS
     mkdir -p buildutils/rpmbuild/RPMS/{i386,i686,noarch,x86_64}
-    # get the distro
-    distro=$(buildutils/determine.distro -r)
+
+    # ignore SP version suffix for SLES12
+    echo "${distro}" | fgrep -q sles12. && distro=sles12
+
     if [ "${distro}" = el7 ]; then
       cp buildutils/torque.adaptive.spec.el7 \
           buildutils/rpmbuild/SPECS/torque.adaptive.spec

diff --git a/buildutils/torque.adaptive.spec.el6 b/buildutils/torque.adaptive.spec.el6
@@ -63,9 +63,12 @@
   unset CONFFLAGS \
   CONFFLAGS_FILE=`mktemp %{_tmppath}/confflags.XXXX` \
   ./configure --help 2>&1 > ${CONFFLAGS_FILE} \
-  if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+  if test %{_hwlocpath} != none \
   then \
-      CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+      if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+      then \
+          CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+      fi \
   fi \
   if grep -q  -- '--enable-cgroups' "${CONFFLAGS_FILE}" \
   then \
@@ -348,7 +351,7 @@
 ### Macro variables
 %{!?torque_user:%global torque_user root}
 %{!?torque_home:%global torque_home %{_var}/spool/%{project_name}}
-%{!?sendmail_path:%global sendmail_path %{_sbindir}/sendmail}
+%{!?sendmail_path:%global sendmail_path /usr/sbin/sendmail}
 
 # This ensures that the debugging symbols are not stripped
 %define __os_install_post /usr/lib/rpm/brp-compress
@@ -600,10 +603,10 @@ echo '$logevent 225 # bitmap of which events to log' > \
     %{buildroot}%{torque_sysconfdir}/mom_priv/config
 
 %{__mkdir_p} %{buildroot}/etc/profile.d
-echo 'test -d ${_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
+echo 'test -d %{_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
 echo 'test `id -u` = 0 && test -d %{_sbindir} && export PATH=%{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.sh
-echo 'test -d ${_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
-echo 'test `id -u` = 0 && test-d ${_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
+echo 'test -d %{_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
+echo 'test `id -u` = 0 && test -d %{_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
 
 # Moab requires libtorque.so.0, but works with libtorque.so.2, so fudge it
 %{__ln_s} libtorque.so.2 %{buildroot}%{_libdir}/libtorque.so.0
@@ -674,8 +677,6 @@ TIMESTAMP="`date +%%Y.%%m.%%d_%%H.%%M.%%S`"
 %{pre_add_back_up_file %{_bindir}/printjob %{client_sub}-${TIMESTAMP}}
 %{pre_add_back_up_file %{_bindir}/printserverdb %{client_sub}-${TIMESTAMP}}
 %{pre_add_back_up_file %{_bindir}/printtracking %{client_sub}-${TIMESTAMP}}
-%{pre_add_back_up_file %{_bindir}/printtracking %{client_sub}-${TIMESTAMP}}
-%{pre_add_back_up_file %{_bindir}/printtracking %{client_sub}-${TIMESTAMP}}
 for file in %{_bindir}/q*
 do
    %{pre_add_back_up_file ${file} %{client_sub}-${TIMESTAMP}}

diff --git a/buildutils/torque.adaptive.spec.el7 b/buildutils/torque.adaptive.spec.el7
@@ -63,9 +63,12 @@
   unset CONFFLAGS \
   CONFFLAGS_FILE=`mktemp %{_tmppath}/confflags.XXXX` \
   ./configure --help 2>&1 > ${CONFFLAGS_FILE} \
-  if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+  if test %{_hwlocpath} != none \
   then \
-      CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+    if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+    then \
+        CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+    fi \
   fi \
   if grep -q  -- '--enable-cgroups' "${CONFFLAGS_FILE}" \
   then \
@@ -348,7 +351,7 @@
 ### Macro variables
 %{!?torque_user:%global torque_user root}
 %{!?torque_home:%global torque_home %{_var}/spool/%{project_name}}
-%{!?sendmail_path:%global sendmail_path %{_sbindir}/sendmail}
+%{!?sendmail_path:%global sendmail_path /usr/sbin/sendmail}
 
 # This ensures that the debugging symbols are not stripped
 %define __os_install_post /usr/lib/rpm/brp-compress
@@ -599,10 +602,10 @@ echo '$logevent 225 # bitmap of which events to log' > \
     %{buildroot}%{torque_sysconfdir}/mom_priv/config
 
 %{__mkdir_p} %{buildroot}/etc/profile.d
-echo 'test -d ${_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
+echo 'test -d %{_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
 echo 'test `id -u` = 0 && test -d %{_sbindir} && export PATH=%{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.sh
-echo 'test -d ${_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
-echo 'test `id -u` = 0 && test-d ${_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
+echo 'test -d %{_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
+echo 'test `id -u` = 0 && test -d %{_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
 
 # Moab requires libtorque.so.0, but works with libtorque.so.2, so fudge it
 %{__ln_s} libtorque.so.2 %{buildroot}%{_libdir}/libtorque.so.0

diff --git a/buildutils/torque.adaptive.spec.sles12 b/buildutils/torque.adaptive.spec.sles12
@@ -63,9 +63,12 @@
   unset CONFFLAGS \
   CONFFLAGS_FILE=`mktemp %{_tmppath}/confflags.XXXX` \
   ./configure --help 2>&1 > ${CONFFLAGS_FILE} \
-  if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+  if test %{_hwlocpath} != none \
   then \
-      CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+      if grep -q  -- '--with-hwloc-path' "${CONFFLAGS_FILE}" \
+      then \
+          CONFFLAGS='--with-hwloc-path=%{_hwlocpath}' \
+      fi \
   fi \
   if grep -q  -- '--enable-cgroups' "${CONFFLAGS_FILE}" \
   then \
@@ -348,7 +351,7 @@
 ### Macro variables
 %{!?torque_user:%global torque_user root}
 %{!?torque_home:%global torque_home %{_var}/spool/%{project_name}}
-%{!?sendmail_path:%global sendmail_path %{_sbindir}/sendmail}
+%{!?sendmail_path:%global sendmail_path /usr/sbin/sendmail}
 
 # This ensures that the debugging symbols are not stripped
 %define __os_install_post /usr/lib/rpm/brp-compress
@@ -599,10 +602,10 @@ echo '$logevent 225 # bitmap of which events to log' > \
     %{buildroot}%{torque_sysconfdir}/mom_priv/config
 
 %{__mkdir_p} %{buildroot}/etc/profile.d
-echo 'test -d ${_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
+echo 'test -d %{_bindir} && export PATH=%{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.sh
 echo 'test `id -u` = 0 && test -d %{_sbindir} && export PATH=%{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.sh
-echo 'test -d ${_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
-echo 'test `id -u` = 0 && test-d ${_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
+echo 'test -d %{_bindir} && setenv PATH %{_bindir}:${PATH}' > %{buildroot}/etc/profile.d/torque.csh
+echo 'test `id -u` = 0 && test -d %{_sbindir} && setenv PATH %{_sbindir}:${PATH}' >> %{buildroot}/etc/profile.d/torque.csh
 
 # Moab requires libtorque.so.0, but works with libtorque.so.2, so fudge it
 %{__ln_s} libtorque.so.2 %{buildroot}%{_libdir}/libtorque.so.0

diff --git a/buildutils/torque.spec.in b/buildutils/torque.spec.in
@@ -13,6 +13,13 @@
 %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
 %endif
 
+# If _initrddir is defined, which indicates that we are on a system with SYSV
+# init.d services, define _initrddir to be /etc/init.d so that the source
+# tarball will work across both Red Hat and SUSE distros.
+%if %{?_initrddir:1}0
+%define _initrddir /etc/init.d
+%endif
+
 # some binaries under /bin in el5|6 are only provided in /usr/bin in el7+.
 # the el7 rpms actually provide the old location, but can't be used as a rpm requirement
 # introducing the rootbin macro for this, as none seems to exists
@@ -387,6 +394,9 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %doc INSTALL INSTALL.GNU CHANGELOG PBS_License.txt README.* Release_Notes src/pam/README.pam
 %doc doc/READ_ME doc/doc_fonts doc/soelim.c doc/ers
 %config(noreplace) %{torque_home}/pbs_environment
+%config(noreplace) /etc/ld.so.conf.d/torque.conf
+%config(noreplace) /etc/profile.d/torque.sh
+%config(noreplace) /etc/profile.d/torque.csh
 %config(noreplace) %{torque_home}/server_name
 %if %{?_unitdir:1}0
 %{_unitdir}/trqauthd.service