toss3 v42 ovis build

support/package-functions

@@ -200,18 +200,20 @@ function pack_ck_numpy {
 # sosdb check
 function pack_ck_sosdb {
 	# need to extract with value here from options and check there instead of /usr
-	pack_checkdirs_none /usr/include/sos
+	pack_checkfiles /usr/include/sos/sos.h
 	x=$?
 	if test "$x" != "0"; then
 		echo missing package sosdb
+		echo may need to build python2-cython and python2-numpy
+		echo "(see toss3.cython and toss3.numpy directories)"
 		echo may need to firerpms.sos and install sosdb.
 	fi
 	return $?
 }
 
 # cython check
 function pack_ck_cython {
-	pack_checkfiles_none /opt/cython/0.28.5/bin/cython /usr/bin/cython
+	pack_checkfiles_none /opt/cython/0.28.5/bin/cython
 	x=$?
 	if test "$x" != "0"; then
 		echo missing package Cython or equivalent

v41.rhel7.unstable/inventory.sh

@@ -1,6 +1,7 @@
 # this dumps the file lists and dependency lists
 # for the generated rpms
-for i in ./sos/Tars/sosdb-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > sosdeps
-for i in ./sos/Tars/sosdb-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > sosfiles
-for i in ./ovis/Tars/ovis-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > ovisdeps
-for i in ./ovis/Tars/ovis-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > ovisfiles
+x=$(basename $(pwd))
+for i in ./sos/Tars/sosdb-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > sosdeps
+for i in ./sos/Tars/sosdb-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > sosfiles
+for i in ./ovis/Tars/ovis-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > ovisdeps
+for i in ./ovis/Tars/ovis-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > ovisfiles

v42.toss3.unstable/firerpms

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #
-packing=v41.rhel7.unstable
+packing=v42.toss3.unstable
 ovis_branch=OVIS-4.2.3
 sospkg= ; # if set empty, disable sos in ldms
 sospkg=sosdb-4.2.1
@@ -10,8 +10,10 @@ [email protected]:ovis-hpc/ovis.git
 
 if test -n "$MODULEPATH"; then
 	module purge
+	if test -n "$sospkg"; then
 	module load python2-cython
 	module load python2-numpy
+	fi
 fi
 . ../support/package-functions
 

v42.toss3.unstable/firerpms.sos

@@ -1,11 +1,16 @@
 #!/bin/bash
 #
 #
-packing=v41.rhel7.unstable
+packing=v42.toss3.unstable
 sos_branch=ovis-4.2.3
 NetworkRequires=github.com
 [email protected]:ovis-hpc/sos.git
 
+if test -n "$MODULEPATH"; then
+	module purge
+	module load python2-cython
+	module load python2-numpy
+fi
 . ../support/package-functions
 
 prefix=/usr

v42.toss3.unstable/inventory.sh

@@ -1,6 +1,7 @@
 # this dumps the file lists and dependency lists
 # for the generated rpms
-for i in ./sos/Tars/sosdb-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > sosdeps
-for i in ./sos/Tars/sosdb-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > sosfiles
-for i in ./ovis/Tars/ovis-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > ovisdeps
-for i in ./ovis/Tars/ovis-4.*/v41.rhel7.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > ovisfiles
+x=$(basename $(pwd))
+for i in ./sos/Tars/sosdb-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > sosdeps
+for i in ./sos/Tars/sosdb-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > sosfiles
+for i in ./ovis/Tars/ovis-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > ovisdeps
+for i in ./ovis/Tars/ovis-4.*/$x/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > ovisfiles

v42.toss3.unstable/ovis.spec.in

@@ -27,7 +27,7 @@
 Summary: OVIS Commands and Libraries
 Name: ovis
 Version: @VERSION@
-Release: desktop_%{build_timestamp}%{?dist}
+Release: 1.0%{?dist}
 License: GPLv2 or BSD
 Group: %{ldms_all}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)