diff --git a/cle6.unstable/firerpms b/cle6.unstable/firerpms index 0c5feb6..30d8b7d 100755 --- a/cle6.unstable/firerpms +++ b/cle6.unstable/firerpms @@ -2,15 +2,15 @@ # # packing=cle6.unstable -ovis_branch=master +ovis_branch=2017.12.13.mutrino-bkp sos_branch=master NetworkRequires=gitlab.opengridcomputing.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git -OVISREPO=gitlab@gitlab.opengridcomputing.com:ovis/ovis.git +OVISREPO=/home/baallan/mutrino/2017.12.13.ovis . ../support/package-functions -prefix=/usr +prefix=/opt/ovis PACK_OPTS=" --disable-rpath --disable-static @@ -47,7 +47,7 @@ BALER_OPTS=" --disable-baler " STORE_OPTS=" ---enable-sos +--disable-sos --disable-flatfile --enable-csv --enable-store @@ -56,7 +56,7 @@ STORE_OPTS=" SAMPLER_OPTS=" --disable-jobid --enable-tsampler ---enable-cray_power_sampler +--disable-cray_power_sampler --disable-perfevent --disable-papi --disable-perf @@ -74,12 +74,12 @@ SAMPLER_OPTS=" --disable-hadoop --disable-generic_sampler --disable-switchx ---enable-cray_system_sampler ---enable-aries-gpcdr ---enable-gpcdlocal ---enable-aries-mmr ---enable-ugni ---enable-lustre +--disable-cray_system_sampler +--disable-aries-gpcdr +--disable-gpcdlocal +--disable-aries-mmr +--disable-ugni +--disable-lustre " allconfig="$PACK_OPTS $SECURITY_OPTS $NETWORK_OPTS $IFACE_OPTS $BALER_OPTS $STORE_OPTS $SAMPLER_OPTS $CRAY_LOCATIONS" @@ -98,16 +98,6 @@ else fi specdir=$dn -GPTAR=gpcd-support.tar -SOSTAR=sos.tar -if ! test -f $SOSTAR; then - echo archive $SOSTAR must be in spec dir - exit 1 -fi -if ! test -f $GPTAR; then - echo archive $GPTAR must be in spec dir - exit 1 -fi /bin/rm -rf ovis if ! git clone $OVISREPO ovis; then echo cannot checkout ovis. @@ -135,17 +125,13 @@ mkdir -p $OUTPUT_DIR # populate outdir inputs git archive --prefix=${PACKAGE=}-${VERSION}/ $COMMIT_ID --format=tar --output=${OUTPUT_DIR}/$TARGET sleep 0.1 -cp ../$GPTAR $OUTPUT_DIR -cp ../$SOSTAR $OUTPUT_DIR cd $OUTPUT_DIR # Untar archive echo "Untarring archive" tar xf $TARGET && \ -(cd ${PACKAGE}-${VERSION} && \ -tar xf ../$SOSTAR && \ -tar xf ../$GPTAR +(cd ${PACKAGE}-${VERSION} mkdir -p gpcd-support/m4 && \ ./autogen.sh) if ! test -f ${PACKAGE}-${VERSION}/configure; then @@ -164,6 +150,7 @@ rm -rf old mkdir old mv -f ${PACKAGE}-${VERSION} $TARGET $SOSTARGET old specfile=tmp-ovis-${packing}.spec +set -x tar zxf $TARGET.gz && \ cd ${PACKAGE}-${VERSION} && \ echo "================ configure for $packing rpms =============" && \ @@ -183,7 +170,7 @@ if test -f sos/config.status; then ./sos/config.status --file=$specdir/ovis-${packing}.spec:$specdir/$specfile specfile=ovis-${packing}.spec fi && \ -rpmbuild -v --define "_topdir `pwd`/$packing" -ba $specdir/$specfile && \ +rpmbuild -vv --define "_topdir `pwd`/$packing" -ba $specdir/$specfile && \ touch completed if ! test -f completed; then echo FAIL diff --git a/cle6.unstable/ovis.spec.in b/cle6.unstable/ovis.spec.in index 9b5d226..c144719 100644 --- a/cle6.unstable/ovis.spec.in +++ b/cle6.unstable/ovis.spec.in @@ -22,6 +22,11 @@ %global _defaultdocdir %{_usr}/share/doc %endif +# for rpm and cpio installation both allowed, we need this: +%define relo_usr /@ovis_prefix@ +%define relo_etc /@ovis_sysconfdir@ +%define relo_var /@ovis_localstatedir@ + # Main package Summary: OVIS LDMS Commands and Libraries Name: ovis @@ -32,10 +37,9 @@ Group: %{ldms_all} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: %{name}-%{version}.tar.gz Requires: rpm >= 4.8.0 -Requires: libevent -Requires: libyaml-0-2 libyaml-devel +Requires: libevent >= 2.0.21 @ENABLE_LDMS_PYTHON_TRUE@Requires: python-base python-devel -@ENABLE_PYTHON_TRUE@Requires:Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires:Cython @ENABLE_SWIG_TRUE@Requires: python-devel @ENABLE_SOS_TRUE@Requires: numpy @ENABLE_SSL_TRUE@Requires: openssl @@ -47,7 +51,7 @@ BuildRequires: gettext-tools gcc glib2-devel BuildRequires: libevent libevent-devel BuildRequires: libyaml-0-2 libyaml-devel @ENABLE_SWIG_TRUE@BuildRequires:python-base python-devel -@ENABLE_PYTHON_TRUE@BuildRequires:Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@BuildRequires:Cython @ENABLE_SWIG_TRUE@BuildRequires:swig @ENABLE_LIBGENDERS_TRUE@BuildRequires: boost-devel @ENABLE_LIBGENDERS_TRUE@BuildRequires: genders libgenders-devel libgendersplusplus @@ -62,9 +66,23 @@ Prefix: /etc %description -This package provides the LDMS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries. +This package provides the LDMS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for Cray/SUSE 12. Configured with @ac_configure_args@. +--prefix=%{relo_usr} +--exec-prefix=%{relo_usr} +--bindir=%{relo_usr}/bin +--sbindir=%{relo_usr}/sbin +--sysconfdir=%{relo_etc} +--datadir=%{relo_usr}/share +--includedir=%{relo_usr}/include +--libdir='${exec_prefix}/lib64' +--libexecdir=%{relo_usr}/libexec +--mandir=%{relo_usr}/share/man +--infodir=%{relo_usr}/share/info +--sharedstatedir=%{relo_var}/lib +--localstatedir=%{relo_var} +%dump %prep %setup -q @@ -73,42 +91,74 @@ Configured with @ac_configure_args@. echo bTMPPATH %{_tmppath} rm -rf $RPM_BUILD_ROOT echo bBUILDROOT $RPM_BUILD_ROOT -%configure @ac_configure_args@ -make V=1 -j 16 +export CFLAGS="@CFLAGS@ %{optflags}" +./configure @ac_configure_args@ --localstatedir=%{relo_var} --prefix=%{relo_usr} --exec-prefix=%{relo_usr} --bindir=%{relo_usr}/bin --sbindir=%{relo_usr}/sbin --sysconfdir=%{relo_etc} --datadir=%{relo_usr}/share --includedir=%{relo_usr}/include --libdir='${exec_prefix}/lib64' --libexecdir=%{relo_usr}/libexec --mandir=%{relo_usr}/share/man --infodir=%{relo_usr}/share/info --sharedstatedir=%{relo_var}/lib + +ncores=`grep -c ^processor /proc/cpuinfo` +make V=1 -j $ncores %install echo TMPPATH %{_tmppath} echo BUILDROOT $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} V=1 install +ls %{buildroot} +mv %{buildroot}%{relo_usr} %{buildroot}%{_prefix} +#@ENABLE_BALER_TRUE@mv %{buildroot}%{relo_etc} %{buildroot}%{_sysconfdir} + # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la # fix in subsequent after sorting use of sysconfdir or share/baler in baler -@ENABLE_BALER_TRUE@rm -f $RPM_BUILD_ROOT%{_prefix}/etc/ovis/eng-dictionary +# baler has been removed +#@ENABLE_BALER_TRUE@rm -f $RPM_BUILD_ROOT%{_prefix}/etc/ovis/eng-dictionary rm $RPM_BUILD_ROOT%{_bindir}/test_* rm $RPM_BUILD_ROOT%{_bindir}/ldms_ban.sh mv $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-*/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system -@ENABLE_LIBGENDERS_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -@ENABLE_LIBGENDERS_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} -@ENABLE_LIBGENDERS_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp -v $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +@ENABLE_TOSS_SYSTEMD_TRUE@cp -arv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} +@ENABLE_TOSS_SYSTEMD_TRUE@cp -rv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp -rv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterGenders +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/plugins-conf + +# relocate files from symlinks that are broken if relocated +#@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/baler/bhquery.py $RPM_BUILD_ROOT%{_bindir}/bhquery.real +#@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/abhttp/bclient.py $RPM_BUILD_ROOT%{_bindir}/bclient.real +#@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bhquery +#@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bclient +#@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bhquery.real $RPM_BUILD_ROOT%{_bindir}/bhquery +#@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bclient.real $RPM_BUILD_ROOT%{_bindir}/bclient + +echo making manifest +./util/relocation/bld_manifest.sh %{buildroot}%{_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir} > %{buildroot}%{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -@ENABLE_BALER_TRUE@%exclude %{_bindir}/bhquery +#@ENABLE_BALER_TRUE@%exclude %{_bindir}/bhquery %{_libdir}/* -%{_bindir}/envldms.sh -%{_bindir}/ldmsd_controller -%{_bindir}/ldms-pedigree -%{_bindir}/lib-pedigree +%{_bindir}/* %{_sbindir}/* %{_docdir}/%{name}-%{version}/COPYING %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/AUTHORS +%exclude %{_bindir}/ldms-py*sh +%exclude %{_bindir}/ldmsd-wrapper.sh +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libkey_* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libidx_* +@ENABLE_SOS_TRUE@%exclude %{_bindir}/sos_* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libsos* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libods* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/ovis-ldms/libstore_sos* +@ENABLE_SOS_TRUE@%exclude %{_sbindir}/ldmsd_sos_init #end core # devel @@ -123,10 +173,35 @@ package. %files devel %defattr(-,root,root) -%{_includedir}/*.h %{_includedir}/*/*.h +# no 3rd level w/out old jobid sampler enabled +#%{_includedir}/*/*/*.h +%{_includedir}/ovis-lib-config.h +%{_includedir}/ovis-ldms-config.h #end devel +%package config +Summary: LDMS configvar scripts when ovis main not installed +Group: %{ldms_grp} +Requires: ovis-relocation +%description config +This installs the ovis-*config-vars.sh files when the main +ovis package is absent. + +%files config +%defattr(-,root,root) +%{_libdir}/ovis-lib-configvars.sh +%{_libdir}/ovis-ldms-configvars.sh + +%post config +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +#end config + %package test Summary: LDMS test package Group: %{ldms_grp} @@ -138,14 +213,14 @@ on compute nodes in large clusters. %files test %defattr(-,root,root) -%{_bindir}/ldms*sh +%{_bindir}/ldms-py*sh #end test # initscripts %package initscripts-base Summary: LDMS base initscripts for libgenders control of %{name} Group: %{ldms_grp} -Requires: ovis = @VERSION@ +Requires: ovis-relocation ovis-config %description initscripts-base This is the support file set for libgenders based booting of LDMS daemons. Users normally provide information via /etc/genders (or alternate file) @@ -154,128 +229,102 @@ control file, use of libgenders can be bypassed entirely. %files initscripts-base %defattr(-,root,root) -@ENABLE_BALER_TRUE@%config(noreplace) %{_sysconfdir}/baler/* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/* -@ENABLE_LIBGENDERS_TRUE@%post initscripts-base -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-wrapper.sh -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldms-functions -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd.local.conf -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi +#@ENABLE_BALER_TRUE@%config(noreplace) %{_sysconfdir}/baler/* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/* +@ENABLE_TOSS_SYSTEMD_TRUE@%{_bindir}/ldmsd-wrapper.sh +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-base +# bash $RELO_DIR/relocate-paths.sh $USR $ETC $VAR $RELO_DIR/manifest +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + #end initscripts-base -@ENABLE_LIBGENDERS_TRUE@%package initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based systemd scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users normally provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. -@ENABLE_LIBGENDERS_TRUE@ -@ENABLE_LIBGENDERS_TRUE@%files initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_prefix}/lib/systemd/system/ldmsd*.service -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@%post initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd.service -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd@.service -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-systemd - - -@ENABLE_LIBGENDERS_TRUE@# initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%package initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users must provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. - -@ENABLE_LIBGENDERS_TRUE@%files initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/init.d/ldms* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@%post initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd.template -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis-initscripts-base ovis-relocation +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd + +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd-etc +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd service files for %{name} in etc +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis-initscripts-base ovis-relocation +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd-etc +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd-etc +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd-etc +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd-etc + + +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd-lib +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd service files for %{name} in /usr/lib +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis-initscripts-base ovis-relocation +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd-lib +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd-lib +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_prefix}/lib/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd-lib +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd-lib + + +@ENABLE_TOSS_SYSTEMD_TRUE@# initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis-initscripts-base ovis-relocation +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users must provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. + +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/init.d/ldms* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-sysvinit +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-sysv %package doc @@ -288,93 +337,122 @@ Doxygen files for ovis package. %defattr(-,root,root) %{_mandir}/*/* %{_datadir}/doc/%{name}-%{version} -%{_datadir}/doc/gpcdlocal +%exclude %{_datadir}/doc/%{name}-%{version}/relocation +@ENABLE_GPCDLOCAL_TRUE@%{_datadir}/doc/gpcdlocal @ENABLE_SOS_TRUE@#%%{_datadir}/doc/sos #%%{_datadir}/doc/ovis-lib-%{version} -@ENABLE_BALER_TRUE@#%%{_datadir}/doc/baler +#@ENABLE_BALER_TRUE@#%%{_datadir}/doc/baler ## %%docdir %{_defaultdocdir} %docdir /usr/share/doc %post doc -varrunmans=" -$RPM_INSTALL_PREFIX0/share/man/man5/ldms-attributes.5 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd-genders.8 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd.8 -" -for i in $varrunmans; do - $RPM_INSTALL_PREFIX/bin/ldms-manpatch.sh $i \ - -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ - -e "s%//run%/run%g" \ - -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - -e "s%/etc%$RPM_INSTALL_PREFIX2%g" -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +%package relocation +Summary: Relocation tool files for %{name} +Group: %{ldms_all} +%description relocation +Scripts for updating scripts at rpm relocation time. +%files relocation +%defattr(-,root,root) +%{_datadir}/doc/%{name}-%{version}/relocation +%docdir /usr/share/doc +%post relocation +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %package python2 Summary: Python files for LDMS %description python2 -Python files for LDMS +Python files for ovis +# install needs +Requires: ovis >= 3.0.0 python +# build needs +@ENABLE_LDMS_PYTHON_TRUE@BuildRequires: python-base +@ENABLE_SWIG_TRUE@BuildRequires: python-base python-devel swig %files python2 %defattr(-,root,root) @ENABLE_SWIG_TRUE@%{_prefix}/lib/python2.7/site-packages/ovis_lib @ENABLE_SWIG_TRUE@%{_prefix}/lib/python2.7/site-packages/ovis_ldms @ENABLE_LDMS_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/ldmsd -@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb -@ENABLE_BALER_TRUE@%{_prefix}/lib/python2.7/site-packages/baler -@ENABLE_BALER_TRUE@%{_prefix}/lib/python2.7/site-packages/abhttp +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb +#@ENABLE_BALER_TRUE@%{_prefix}/lib/python2.7/site-packages/baler +#@ENABLE_BALER_TRUE@%{_prefix}/lib/python2.7/site-packages/abhttp #%%{python2_sitelib}/* #end python2 # see https://fedoraproject.org/wiki/Packaging:Python_Old # and https://fedoraproject.org/wiki/Packaging:Python -%package sosdb -Summary: SOS database package -Group: %{ldms_grp} -Requires: ldms-all = 3.0.0 -%description sosdb -This is a collection of sos utilities. +@ENABLE_SOS_TRUE@%package sosdb +@ENABLE_SOS_TRUE@Summary: SOS database package +@ENABLE_SOS_TRUE@Group: %{ldms_grp} +# install requires +@ENABLE_SOS_TRUE@Requires: ovis >= 3.0.0 +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires: Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy +@ENABLE_SOS_TRUE@# build requires +@ENABLE_SWIG_TRUE@BuildRequires: python-base python-devel +@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_SOS_TRUE@%description sosdb +@ENABLE_SOS_TRUE@This is a collection of SOS database utilities for LDMS. +@ENABLE_SOS_TRUE@ +@ENABLE_SOS_TRUE@%files sosdb +@ENABLE_SOS_TRUE@%defattr(-,root,root) +@ENABLE_SOS_TRUE@%{_bindir}/sos_* +@ENABLE_SOS_TRUE@%{_libdir}/libkey_* +@ENABLE_SOS_TRUE@%{_libdir}/libsos* +@ENABLE_SOS_TRUE@%{_libdir}/libods* +@ENABLE_SOS_TRUE@%{_libdir}/libidx_* +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb +@ENABLE_SOS_TRUE@#end sosdb + +@ENABLE_SOS_TRUE@%package ldms-sos +@ENABLE_SOS_TRUE@Summary: LDMS sosdb plugins +@ENABLE_SOS_TRUE@Requires: ovis-sosdb +@ENABLE_SOS_TRUE@%description ldms-sos +@ENABLE_SOS_TRUE@Libraries and utilities for SOS usage in LDMS +@ENABLE_SOS_TRUE@%files ldms-sos +@ENABLE_SOS_TRUE@%defattr(-,root,root) +@ENABLE_SOS_TRUE@%{_sbindir}/ldmsd_sos_init +@ENABLE_SOS_TRUE@%{_libdir}/ovis-ldms/libstore_sos* +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb +@ENABLE_SOS_TRUE@#end ldms-sos -%files sosdb -%defattr(-,root,root) -%{_bindir}/sos_* -%{_libdir}/libkey* -%{_libdir}/libidx_BXTREE.* -%{_sbindir}/ldmsd_sos_init -%{_libdir}/libsos* -@ENABLE_PYTHON_TRUE@%%{_prefix}/lib/python2.7/site-packages/sosdb -#end test %post -for i in $RPM_INSTALL_PREFIX/bin/envldms.sh \ - $RPM_INSTALL_PREFIX/bin/ldms*.sh \ - $RPM_INSTALL_PREFIX/lib64/ovis-*configvars.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post test -for i in $RPM_INSTALL_PREFIX/bin/ldms*.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post python2 -@ENABLE_BALER_TRUE@rm -f $RPM_INSTALL_PREFIX/bin/bhquery -@ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %changelog +* Wed Oct 18 2017 Ben Allan 3.4.4-4 +Cray relocation scheme +* Wed Apr 26 2017 Ben Allan 3.4.1-1 +Flex array and swig bug patches. Refactor cython dependent bits. +* Wed Mar 29 2017 Ben Allan 3.4.0-1 +Update package refactorization * Tue Mar 14 2017 Ben Allan 3.3.1-2 Update package refactorization * Tue Feb 21 2017 Ben Allan 3.3.1-1 diff --git a/toss2/firerpms b/toss2/firerpms index bee35fb..293a04b 100755 --- a/toss2/firerpms +++ b/toss2/firerpms @@ -2,7 +2,7 @@ # # packing=toss2 -ovis_branch=OVIS-3.4.3 +ovis_branch=v3.4.6 sos_branch=master NetworkRequires=github.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git @@ -49,7 +49,7 @@ BALER_OPTS=" --disable-baler " STORE_OPTS=" ---enable-sos +--disable-sos --enable-flatfile --enable-csv --enable-store @@ -69,10 +69,12 @@ SAMPLER_OPTS=" --disable-hadoop --disable-generic_sampler --disable-switchx +--disable-sensors +--enable-dstat +--enable-llnl-edac --enable-sysclassib --enable-perf --enable-jobid ---enable-sensors --enable-array_example --enable-procinterrupts --enable-procnetdev @@ -134,14 +136,11 @@ else git submodule init sos && git submodule update sos && tar cf ../$SOSTAR sos fi -patches=" -flex_array.3.4.1 -" +patches="" for i in $patches; do patch -p1 < ../patches/$i git commit -a -m "add $packing distribution patches" done - if ! test -f ../$SOSTAR; then echo failed to download sos exit 1 diff --git a/toss2/ovis.spec.in b/toss2/ovis.spec.in index 6a79c30..8b9a91b 100644 --- a/toss2/ovis.spec.in +++ b/toss2/ovis.spec.in @@ -18,6 +18,11 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +# for rpm and cpio installation both allowed, we need this: +%define relo_usr /@ovis_prefix@ +%define relo_etc /@ovis_sysconfdir@ +%define relo_var /@ovis_localstatedir@ + # Main package Summary: OVIS Commands and Libraries Name: ovis @@ -59,8 +64,22 @@ Prefix: /etc %description -This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 2. -Configured with @ac_configure_args@ CFLAGS="@CFLAGS@ %{optflags}" +This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3. +Configured for relocation with @ac_configure_args@ +--prefix=%{relo_usr} +--exec-prefix=%{relo_usr} +--bindir=%{relo_usr}/bin +--sbindir=%{relo_usr}/sbin +--sysconfdir=%{relo_etc} +--datadir=%{relo_usr}/share +--includedir=%{relo_usr}/include +--libdir='${exec_prefix}/lib64' +--libexecdir=%{relo_usr}/libexec +--mandir=%{relo_usr}/share/man +--infodir=%{relo_usr}/share/info +--sharedstatedir=%{relo_var}/lib +--localstatedir=%{relo_var} + %prep %setup -q @@ -69,14 +88,32 @@ Configured with @ac_configure_args@ CFLAGS="@CFLAGS@ %{optflags}" echo bTMPPATH %{_tmppath} rm -rf $RPM_BUILD_ROOT echo bBUILDROOT $RPM_BUILD_ROOT -export CFLAGS="@CFLAGS@ %{optflags}" -%configure @ac_configure_args@ -make V=1 -j 16 +export CFLAGS="@CFLAGS@ %{optflags} -O1" +./configure @ac_configure_args@ --localstatedir=%{relo_var} --prefix=%{relo_usr} --exec-prefix=%{relo_usr} --bindir=%{relo_usr}/bin --sbindir=%{relo_usr}/sbin --sysconfdir=%{relo_etc} --datadir=%{relo_usr}/share --includedir=%{relo_usr}/include --libdir='${exec_prefix}/lib64' --libexecdir=%{relo_usr}/libexec --mandir=%{relo_usr}/share/man --infodir=%{relo_usr}/share/info --sharedstatedir=%{relo_var}/lib + +ncores=`grep -c ^processor /proc/cpuinfo` +make V=1 -j $ncores %install echo TMPPATH %{_tmppath} echo BUILDROOT $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} V=1 install +ls %{buildroot} +mkdir -p %{buildroot}%{_prefix} +(cd %{buildroot}%{_prefix}/..; rmdir `basename %{buildroot}%{_prefix}`) +mv %{buildroot}%{relo_usr} %{buildroot}%{_prefix} +if test -d %{buildroot}%{relo_etc}; then + mv %{buildroot}%{relo_etc} %{buildroot}%{_sysconfdir} +fi + +# sbin wrapper rework +for b in $RPM_BUILD_ROOT%{_sbindir}/ldms*; do + bn=`basename $b` + echo wrapping $bn + dn=`dirname $b` + mv $b $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/$bn + (cd $dn; ln -s .ldms-wrapper $bn) +done # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @@ -84,12 +121,28 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @ENABLE_BALER_TRUE@rm -f $RPM_BUILD_ROOT%{_prefix}/etc/ovis/eng-dictionary rm $RPM_BUILD_ROOT%{_bindir}/test_* rm $RPM_BUILD_ROOT%{_bindir}/ldms_ban.sh -mv $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-*/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system -@ENABLE_LIBGENDERS_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -@ENABLE_LIBGENDERS_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} -@ENABLE_LIBGENDERS_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +find $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-%{version} -maxdepth 1 -type f -exec mv {} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ \; +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +@ENABLE_TOSS_SYSTEMD_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} +@ENABLE_TOSS_SYSTEMD_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterGenders +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/plugins-conf + +# relocate files from symlinks that are broken if relocated +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.6/site-packages/baler/bhquery.py $RPM_BUILD_ROOT%{_bindir}/bhquery.real +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.6/site-packages/abhttp/bclient.py $RPM_BUILD_ROOT%{_bindir}/bclient.real +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bclient +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bhquery.real $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bclient.real $RPM_BUILD_ROOT%{_bindir}/bclient + +echo making manifest +./util/relocation/bld_manifest.sh %{buildroot}%{_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir} > %{buildroot}%{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %clean rm -rf $RPM_BUILD_ROOT @@ -122,13 +175,23 @@ rm -rf $RPM_BUILD_ROOT @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbquery.* @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbsos_img.* @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbsos_msg.* + %{_libdir}/* %{_bindir}/* %{_sbindir}/* +%{_sbindir}/.ldms* +#%{_sbindir}/.ldms-wrapper +%{_datadir}/doc/%{name}-%{version}/relocation %{_docdir}/%{name}-%{version}/COPYING %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/AUTHORS %exclude %{_bindir}/ldms-py*sh +%exclude %{_bindir}/ldms-meminfo.sh +%exclude %{_bindir}/ldms-static-test.sh +%exclude %{_bindir}/ldmsd-wrapper.sh +%exclude %{_bindir}/ldmsd-pre-systemd +%exclude %{_bindir}/ldmsd-pre-sysvinit + @ENABLE_SOS_TRUE@%exclude %{_libdir}/libkey_* @ENABLE_SOS_TRUE@%exclude %{_libdir}/libidx_* @ENABLE_SOS_TRUE@%exclude %{_bindir}/sos_* @@ -137,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT @ENABLE_SOS_TRUE@%exclude %{_libdir}/ovis-ldms/libstore_sos* @ENABLE_SOS_TRUE@%exclude %{_sbindir}/ldmsd_sos_init #end core + @ENABLE_BALER_TRUE@# baler @ENABLE_BALER_TRUE@%package baler @ENABLE_BALER_TRUE@Summary: OVIS Baler tools @@ -205,12 +269,15 @@ Requires: ovis = @VERSION@ Obsoletes: ldms-all-test %description test This is a collection of test scripts for (LDMS). -They also serve as examples, but are not usually of interest -on compute nodes in large clusters. +They also serve as examples, but are not usually of direct +interest on compute nodes in production clusters. %files test %defattr(-,root,root) %{_bindir}/ldms-py*sh +%{_bindir}/ldms-meminfo.sh +%{_bindir}/ldms-static-test.sh +%{_datadir}/doc/ovis-ldms-%{version}/examples/static-test #end test # initscripts @@ -228,127 +295,66 @@ control file, use of libgenders can be bypassed. %files initscripts-base %defattr(-,root,root) @ENABLE_BALER_TRUE@%config(noreplace) %{_sysconfdir}/baler/* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/* -@ENABLE_LIBGENDERS_TRUE@%post initscripts-base -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-wrapper.sh -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldms-functions -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd.local.conf -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi +@ENABLE_TOSS_SYSTEMD_TRUE@%{_sysconfdir}/sysconfig/* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.local.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.agg.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets/ldmsauth.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.local +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.agg +@ENABLE_TOSS_SYSTEMD_TRUE@%{_bindir}/ldmsd-wrapper.sh + +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-base +# bash $RELO_DIR/relocate-paths.sh $USR $ETC $VAR $RELO_DIR/manifest +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + #end initscripts-base -@ENABLE_LIBGENDERS_TRUE@%package initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based systemd scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users normally provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. -@ENABLE_LIBGENDERS_TRUE@ -@ENABLE_LIBGENDERS_TRUE@%files initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_prefix}/lib/systemd/system/ldmsd*.service -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@%post initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd.service -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd@.service -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-systemd - - -@ENABLE_LIBGENDERS_TRUE@# initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%package initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users must provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. - -@ENABLE_LIBGENDERS_TRUE@%files initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/init.d/ldms* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@%post initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd.template -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_prefix}/lib/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd + +@ENABLE_TOSS_SYSTEMD_TRUE@# initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users must provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. + +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_sysconfdir}/init.d/ldms* +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-sysvinit +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-sysv %package doc @@ -362,26 +368,19 @@ Doxygen files for ovis package. %defattr(-,root,root) %{_mandir}/*/* %{_datadir}/doc/%{name}-%{version} +%exclude %{_datadir}/doc/%{name}-%{version}/relocation +%exclude %{_datadir}/doc/ovis-ldms-%{version}/examples ## %{_datadir}/doc/ovis-lib-%{version} @ENABLE_SOS_TRUE@# %{_datadir}/doc/sos @ENABLE_BALER_TRUE@# %{_datadir}/doc/baler ## %%docdir %{_defaultdocdir} %docdir /usr/share/doc %post doc -varrunmans=" -$RPM_INSTALL_PREFIX0/share/man/man5/ldms-attributes.5 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd-genders.8 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd.8 -" -for i in $varrunmans; do - $RPM_INSTALL_PREFIX/bin/ldms-manpatch.sh $i \ - -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ - -e "s%//run%/run%g" \ - -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - -e "s%/etc%$RPM_INSTALL_PREFIX2%g" -done +bash %{_prefix}/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + %{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %package python2 Summary: Python files for LDMS, SOS, and baler @@ -407,13 +406,13 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@%package sosdb @ENABLE_SOS_TRUE@Summary: SOS database package @ENABLE_SOS_TRUE@Group: %{ldms_grp} -# install requires +@ENABLE_SOS_TRUE@# install requires @ENABLE_SOS_TRUE@Requires: ovis >= 3.0.0 -@ENABLE_PYTHON_TRUE@Requires: Cython -@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy -# build requires -@ENABLE_SWIG_TRUE@BuildRequires: python python-devel -@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires: Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy +@ENABLE_SOS_TRUE@# build requires +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: python python-devel +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: swig @ENABLE_SOS_TRUE@%description sosdb @ENABLE_SOS_TRUE@This is a collection of SOS database utilities for LDMS. @ENABLE_SOS_TRUE@ @@ -426,6 +425,7 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@%{_libdir}/libidx_* @ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.6/site-packages/sosdb @ENABLE_SOS_TRUE@#end sosdb + @ENABLE_SOS_TRUE@%package ldms-sos @ENABLE_SOS_TRUE@Summary: LDMS sosdb plugins @ENABLE_SOS_TRUE@Requires: ovis-sosdb @@ -439,36 +439,34 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@#end ldms-sos %post -for i in $RPM_INSTALL_PREFIX/bin/envldms.sh \ - $RPM_INSTALL_PREFIX/bin/ldms*.sh \ - $RPM_INSTALL_PREFIX/lib64/ovis-*configvars.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post test -for i in $RPM_INSTALL_PREFIX/bin/ldms-py*.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post python2 -@ENABLE_BALER_TRUE@rm -f $RPM_INSTALL_PREFIX/bin/bhquery -@ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %changelog +* Thu Apr 19 2018 Ben Allan 3.4.6-1 +SOS/baler v3 deprecation. Wrapper file for sbin exec relocation support. +* Wed Oct 18 2017 Ben Allan 3.4.4-4 +Cray relocation scheme +* Thu Aug 31 2017 Ben Allan 3.4.4-2.1 +Update for upstream and override -O2 which produces infinite loop bugs +with toss gcc 4.8.5. * Wed Apr 26 2017 Ben Allan 3.4.1-1 Flex array and swig bug patches. Refactor cython dependent bits. * Wed Mar 29 2017 Ben Allan 3.4.0-1 diff --git a/toss3.unstable/firerpms b/toss3.unstable/firerpms index cde3d02..8cb293c 100755 --- a/toss3.unstable/firerpms +++ b/toss3.unstable/firerpms @@ -2,18 +2,18 @@ # # packing=toss3.unstable -ovis_branch=OVIS-3.4 +ovis_branch=OVIS-3.4.6-dstat-fix sos_branch=master NetworkRequires=github.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git -OVISREPO=https://github.com/ovis-hpc/ovis.git +OVISREPO=gitlab@gitlab.opengridcomputing.com:baallan/ovis.git if test -n "$MODULEPATH"; then module purge fi . ../support/package-functions -prefix=/usr +prefix=/genetha PACK_OPTS=" --disable-rpath --disable-static @@ -43,12 +43,13 @@ IFACE_OPTS=" --enable-ldms-python --disable-python --enable-libgenders +--enable-genderssystemd " BALER_OPTS=" ---enable-baler +--disable-baler " STORE_OPTS=" ---enable-sos +--disable-sos --enable-flatfile --enable-csv --enable-store @@ -68,10 +69,13 @@ SAMPLER_OPTS=" --disable-hadoop --disable-generic_sampler --disable-switchx +--disable-sensors +--enable-dstat +--enable-llnl-edac --enable-sysclassib +--enable-opa2 --enable-perf --enable-jobid ---enable-sensors --enable-array_example --enable-procinterrupts --enable-procnetdev @@ -134,9 +138,7 @@ else git submodule init sos && git submodule update sos && tar cf ../$SOSTAR sos fi -patches=" -flex_array.3.4.1 -" +patches="" for i in $patches; do patch -p1 < ../patches/$i git commit -a -m "add $packing distribution patches" @@ -207,7 +209,7 @@ if test -f sos/config.status; then ./sos/config.status --file=$specdir/ovis-${packing}.spec:$specdir/$specfile specfile=ovis-${packing}.spec fi && \ -rpmbuild -v --define "_topdir `pwd`/$packing" -ba $specdir/$specfile && \ +rpmbuild -vv --define "_topdir `pwd`/$packing" -ba $specdir/$specfile && \ touch completed if ! test -f completed; then echo FAIL diff --git a/toss3.unstable/inst b/toss3.unstable/inst new file mode 100644 index 0000000..b33428a --- /dev/null +++ b/toss3.unstable/inst @@ -0,0 +1 @@ +rpm -ivh ./ovis/Tars/ovis-3.4.6/toss3.unstable/RPMS/x86_64/*rpm diff --git a/toss3.unstable/inventory.sh b/toss3.unstable/inventory.sh old mode 100644 new mode 100755 index 6aad33b..35548db --- a/toss3.unstable/inventory.sh +++ b/toss3.unstable/inventory.sh @@ -1,4 +1,5 @@ # this dumps the file lists and dependency lists # for the generated rpms -for i in ./ovis/Tars/ovis-3.4.0/toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > plist -for i in ./ovis/Tars/ovis-3.4.0/toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > rlist +ver=3.4.6 +for i in ./ovis/Tars/ovis-$ver/toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > plist +for i in ./ovis/Tars/ovis-$ver/toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > rlist diff --git a/toss3.unstable/ovis.spec.in b/toss3.unstable/ovis.spec.in index f6151c3..c82b9f3 100644 --- a/toss3.unstable/ovis.spec.in +++ b/toss3.unstable/ovis.spec.in @@ -18,11 +18,16 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +# for rpm and cpio installation both allowed, we need this: +%define relo_usr /@ovis_prefix@ +%define relo_etc /@ovis_sysconfdir@ +%define relo_var /@ovis_localstatedir@ + # Main package Summary: OVIS Commands and Libraries Name: ovis Version: @VERSION@ -Release: serrano_%{build_timestamp}%{?dist} +Release: 0.2%{?dist} License: GPLv2 or BSD Group: %{ldms_all} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,8 +65,22 @@ Prefix: /etc %description This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3. -Configured with @ac_configure_args@. - +Configured for relocation with @ac_configure_args@ +--prefix=%{relo_usr} +--exec-prefix=%{relo_usr} +--bindir=%{relo_usr}/bin +--sbindir=%{relo_usr}/sbin +--sysconfdir=%{relo_etc} +--datadir=%{relo_usr}/share +--includedir=%{relo_usr}/include +--libdir='${exec_prefix}/lib64' +--libexecdir=%{relo_usr}/libexec +--mandir=%{relo_usr}/share/man +--infodir=%{relo_usr}/share/info +--sharedstatedir=%{relo_var}/lib +--localstatedir=%{relo_var} + +%dump %prep %setup -q @@ -70,14 +89,33 @@ Configured with @ac_configure_args@. echo bTMPPATH %{_tmppath} rm -rf $RPM_BUILD_ROOT echo bBUILDROOT $RPM_BUILD_ROOT -export CFLAGS="@CFLAGS@ %{optflags}" -%configure @ac_configure_args@ -make V=1 -j 16 +export CFLAGS="@CFLAGS@ %{optflags} -O1" +#export CFLAGS="@CFLAGS@" +./configure @ac_configure_args@ --localstatedir=%{relo_var} --prefix=%{relo_usr} --exec-prefix=%{relo_usr} --bindir=%{relo_usr}/bin --sbindir=%{relo_usr}/sbin --sysconfdir=%{relo_etc} --datadir=%{relo_usr}/share --includedir=%{relo_usr}/include --libdir='${exec_prefix}/lib64' --libexecdir=%{relo_usr}/libexec --mandir=%{relo_usr}/share/man --infodir=%{relo_usr}/share/info --sharedstatedir=%{relo_var}/lib + +ncores=`grep -c ^processor /proc/cpuinfo` +make V=1 -j $ncores %install echo TMPPATH %{_tmppath} echo BUILDROOT $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} V=1 install +ls %{buildroot} +mkdir -p %{buildroot}%{_prefix} +(cd %{buildroot}%{_prefix}/..; rmdir `basename %{buildroot}%{_prefix}`) +mv %{buildroot}%{relo_usr} %{buildroot}%{_prefix} +if test -d %{buildroot}%{relo_etc}; then + mv %{buildroot}%{relo_etc} %{buildroot}%{_sysconfdir} +fi + +# sbin wrapper rework +for b in $RPM_BUILD_ROOT%{_sbindir}/ldms*; do + bn=`basename $b` + echo wrapping $bn + dn=`dirname $b` + mv $b $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/$bn + (cd $dn; ln -s .ldms-wrapper $bn) +done # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @@ -85,12 +123,28 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @ENABLE_BALER_TRUE@rm -f $RPM_BUILD_ROOT%{_prefix}/etc/ovis/eng-dictionary rm $RPM_BUILD_ROOT%{_bindir}/test_* rm $RPM_BUILD_ROOT%{_bindir}/ldms_ban.sh -mv $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-*/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system -@ENABLE_LIBGENDERS_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -@ENABLE_LIBGENDERS_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} -@ENABLE_LIBGENDERS_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +find $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-%{version} -maxdepth 1 -type f -exec mv {} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ \; +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +@ENABLE_TOSS_SYSTEMD_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} +@ENABLE_TOSS_SYSTEMD_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterGenders +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/plugins-conf + +# relocate files from symlinks that are broken if relocated +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/baler/bhquery.py $RPM_BUILD_ROOT%{_bindir}/bhquery.real +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/abhttp/bclient.py $RPM_BUILD_ROOT%{_bindir}/bclient.real +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bclient +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bhquery.real $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bclient.real $RPM_BUILD_ROOT%{_bindir}/bclient + +echo making manifest +./util/relocation/bld_manifest.sh %{buildroot}%{_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir} > %{buildroot}%{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %clean rm -rf $RPM_BUILD_ROOT @@ -127,10 +181,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/* %{_bindir}/* %{_sbindir}/* +%{_sbindir}/.ldms* +#%{_sbindir}/.ldms-wrapper +%{_datadir}/doc/%{name}-%{version}/relocation %{_docdir}/%{name}-%{version}/COPYING %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/AUTHORS %exclude %{_bindir}/ldms-py*sh +%exclude %{_bindir}/ldms-meminfo.sh +%exclude %{_bindir}/ldms-static-test.sh +%exclude %{_bindir}/ldmsd-wrapper.sh +%exclude %{_bindir}/ldmsd-pre-systemd +%exclude %{_bindir}/ldmsd-pre-sysvinit + @ENABLE_SOS_TRUE@%exclude %{_libdir}/libkey_* @ENABLE_SOS_TRUE@%exclude %{_libdir}/libidx_* @ENABLE_SOS_TRUE@%exclude %{_bindir}/sos_* @@ -208,12 +271,15 @@ Requires: ovis = @VERSION@ Obsoletes: ldms-all-test %description test This is a collection of test scripts for (LDMS). -They also serve as examples, but are not usually of interest -on compute nodes in large clusters. +They also serve as examples, but are not usually of direct +interest on compute nodes in large clusters. %files test %defattr(-,root,root) %{_bindir}/ldms-py*sh +%{_bindir}/ldms-meminfo.sh +%{_bindir}/ldms-static-test.sh +%{_datadir}/doc/ovis-ldms-%{version}/examples/static-test #end test # initscripts @@ -231,127 +297,66 @@ control file, use of libgenders can be bypassed. %files initscripts-base %defattr(-,root,root) @ENABLE_BALER_TRUE@%config(noreplace) %{_sysconfdir}/baler/* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/* -@ENABLE_LIBGENDERS_TRUE@%post initscripts-base -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-wrapper.sh -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldms-functions -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd.local.conf -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi +@ENABLE_TOSS_SYSTEMD_TRUE@%{_sysconfdir}/sysconfig/* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.local.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.agg.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets/ldmsauth.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.local +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.agg +@ENABLE_TOSS_SYSTEMD_TRUE@%{_bindir}/ldmsd-wrapper.sh + +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-base +# bash $RELO_DIR/relocate-paths.sh $USR $ETC $VAR $RELO_DIR/manifest +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + #end initscripts-base -@ENABLE_LIBGENDERS_TRUE@%package initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based systemd scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users normally provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. -@ENABLE_LIBGENDERS_TRUE@ -@ENABLE_LIBGENDERS_TRUE@%files initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_prefix}/lib/systemd/system/ldmsd*.service -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@%post initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd.service -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd@.service -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-systemd - - -@ENABLE_LIBGENDERS_TRUE@# initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%package initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users must provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. - -@ENABLE_LIBGENDERS_TRUE@%files initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/init.d/ldms* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@%post initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd.template -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_prefix}/lib/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd + +@ENABLE_TOSS_SYSTEMD_TRUE@# initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users must provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. + +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_sysconfdir}/init.d/ldms* +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-sysvinit +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-sysv %package doc @@ -365,26 +370,19 @@ Doxygen files for ovis package. %defattr(-,root,root) %{_mandir}/*/* %{_datadir}/doc/%{name}-%{version} +%exclude %{_datadir}/doc/%{name}-%{version}/relocation +%exclude %{_datadir}/doc/ovis-ldms-%{version}/examples ## %{_datadir}/doc/ovis-lib-%{version} @ENABLE_SOS_TRUE@# %{_datadir}/doc/sos @ENABLE_BALER_TRUE@# %{_datadir}/doc/baler ## %%docdir %{_defaultdocdir} %docdir /usr/share/doc %post doc -varrunmans=" -$RPM_INSTALL_PREFIX0/share/man/man5/ldms-attributes.5 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd-genders.8 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd.8 -" -for i in $varrunmans; do - $RPM_INSTALL_PREFIX/bin/ldms-manpatch.sh $i \ - -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ - -e "s%//run%/run%g" \ - -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - -e "s%/etc%$RPM_INSTALL_PREFIX2%g" -done +bash %{_prefix}/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + %{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %package python2 Summary: Python files for LDMS, SOS, and baler @@ -410,13 +408,13 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@%package sosdb @ENABLE_SOS_TRUE@Summary: SOS database package @ENABLE_SOS_TRUE@Group: %{ldms_grp} -# install requires +@ENABLE_SOS_TRUE@# install requires @ENABLE_SOS_TRUE@Requires: ovis >= 3.0.0 -@ENABLE_PYTHON_TRUE@Requires: Cython -@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy -# build requires -@ENABLE_SWIG_TRUE@BuildRequires: python python-devel -@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires: Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy +@ENABLE_SOS_TRUE@# build requires +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: python python-devel +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: swig @ENABLE_SOS_TRUE@%description sosdb @ENABLE_SOS_TRUE@This is a collection of SOS database utilities for LDMS. @ENABLE_SOS_TRUE@ @@ -444,36 +442,31 @@ Requires: ovis >= 3.0.0 python %post -for i in $RPM_INSTALL_PREFIX/bin/envldms.sh \ - $RPM_INSTALL_PREFIX/bin/ldms*.sh \ - $RPM_INSTALL_PREFIX/lib64/ovis-*configvars.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post test -for i in $RPM_INSTALL_PREFIX/bin/ldms-py*.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post python2 -@ENABLE_BALER_TRUE@rm -f $RPM_INSTALL_PREFIX/bin/bhquery -@ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %changelog +* Thu Apr 19 2018 Ben Allan 3.4.6-0 +SOS/baler v3 deprecation. Wrapper file for sbin exec relocation support. +* Wed Oct 18 2017 Ben Allan 3.4.4-4 +Cray relocation scheme * Wed Apr 26 2017 Ben Allan 3.4.1-1 Flex array and swig bug patches. Refactor cython dependent bits. * Wed Mar 29 2017 Ben Allan 3.4.0-1 diff --git a/toss3/firerpms b/toss3/firerpms index 21b887b..0aa02d3 100755 --- a/toss3/firerpms +++ b/toss3/firerpms @@ -1,8 +1,8 @@ -#!/bin/bash -x +#!/bin/bash # # packing=toss3 -ovis_branch=OVIS-3.4.4 +ovis_branch=v3.4.6 sos_branch=master NetworkRequires=github.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git @@ -43,12 +43,13 @@ IFACE_OPTS=" --enable-ldms-python --disable-python --enable-libgenders +--enable-genderssystemd " BALER_OPTS=" ---enable-baler +--disable-baler " STORE_OPTS=" ---enable-sos +--disable-sos --enable-flatfile --enable-csv --enable-store @@ -68,10 +69,13 @@ SAMPLER_OPTS=" --disable-hadoop --disable-generic_sampler --disable-switchx +--disable-sensors +--enable-dstat +--enable-llnl-edac --enable-sysclassib +--enable-opa2 --enable-perf --enable-jobid ---enable-sensors --enable-array_example --enable-procinterrupts --enable-procnetdev @@ -134,14 +138,11 @@ else git submodule init sos && git submodule update sos && tar cf ../$SOSTAR sos fi -patches=" -flex_array.3.4.1 -" +patches="" for i in $patches; do patch -p1 < ../patches/$i git commit -a -m "add $packing distribution patches" done - if ! test -f ../$SOSTAR; then echo failed to download sos exit 1 diff --git a/toss3/ovis.spec.in b/toss3/ovis.spec.in index 8198353..683cc20 100644 --- a/toss3/ovis.spec.in +++ b/toss3/ovis.spec.in @@ -18,11 +18,16 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +# for rpm and cpio installation both allowed, we need this: +%define relo_usr /@ovis_prefix@ +%define relo_etc /@ovis_sysconfdir@ +%define relo_var /@ovis_localstatedir@ + # Main package Summary: OVIS Commands and Libraries Name: ovis Version: @VERSION@ -Release: 2.1%{?dist} +Release: 1%{?dist} License: GPLv2 or BSD Group: %{ldms_all} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,7 +65,20 @@ Prefix: /etc %description This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3. -Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags} -O1" +Configured for relocation with @ac_configure_args@ +--prefix=%{relo_usr} +--exec-prefix=%{relo_usr} +--bindir=%{relo_usr}/bin +--sbindir=%{relo_usr}/sbin +--sysconfdir=%{relo_etc} +--datadir=%{relo_usr}/share +--includedir=%{relo_usr}/include +--libdir='${exec_prefix}/lib64' +--libexecdir=%{relo_usr}/libexec +--mandir=%{relo_usr}/share/man +--infodir=%{relo_usr}/share/info +--sharedstatedir=%{relo_var}/lib +--localstatedir=%{relo_var} %prep @@ -71,13 +89,31 @@ echo bTMPPATH %{_tmppath} rm -rf $RPM_BUILD_ROOT echo bBUILDROOT $RPM_BUILD_ROOT export CFLAGS="@CFLAGS@ %{optflags} -O1" -%configure @ac_configure_args@ -make V=1 -j 16 +./configure @ac_configure_args@ --localstatedir=%{relo_var} --prefix=%{relo_usr} --exec-prefix=%{relo_usr} --bindir=%{relo_usr}/bin --sbindir=%{relo_usr}/sbin --sysconfdir=%{relo_etc} --datadir=%{relo_usr}/share --includedir=%{relo_usr}/include --libdir='${exec_prefix}/lib64' --libexecdir=%{relo_usr}/libexec --mandir=%{relo_usr}/share/man --infodir=%{relo_usr}/share/info --sharedstatedir=%{relo_var}/lib + +ncores=`grep -c ^processor /proc/cpuinfo` +make V=1 -j $ncores %install echo TMPPATH %{_tmppath} echo BUILDROOT $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} V=1 install +ls %{buildroot} +mkdir -p %{buildroot}%{_prefix} +(cd %{buildroot}%{_prefix}/..; rmdir `basename %{buildroot}%{_prefix}`) +mv %{buildroot}%{relo_usr} %{buildroot}%{_prefix} +if test -d %{buildroot}%{relo_etc}; then + mv %{buildroot}%{relo_etc} %{buildroot}%{_sysconfdir} +fi + +# sbin wrapper rework +for b in $RPM_BUILD_ROOT%{_sbindir}/ldms*; do + bn=`basename $b` + echo wrapping $bn + dn=`dirname $b` + mv $b $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/$bn + (cd $dn; ln -s .ldms-wrapper $bn) +done # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @@ -85,12 +121,28 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la @ENABLE_BALER_TRUE@rm -f $RPM_BUILD_ROOT%{_prefix}/etc/ovis/eng-dictionary rm $RPM_BUILD_ROOT%{_bindir}/test_* rm $RPM_BUILD_ROOT%{_bindir}/ldms_ban.sh -mv $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-*/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d -@ENABLE_LIBGENDERS_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system -@ENABLE_LIBGENDERS_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -@ENABLE_LIBGENDERS_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} -@ENABLE_LIBGENDERS_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +find $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-%{version} -maxdepth 1 -type f -exec mv {} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ \; +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +@ENABLE_TOSS_SYSTEMD_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} +@ENABLE_TOSS_SYSTEMD_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterGenders +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/plugins-conf + +# relocate files from symlinks that are broken if relocated +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/baler/bhquery.py $RPM_BUILD_ROOT%{_bindir}/bhquery.real +@ENABLE_BALER_TRUE@cp $RPM_BUILD_ROOT%{_prefix}/lib/python2.7/site-packages/abhttp/bclient.py $RPM_BUILD_ROOT%{_bindir}/bclient.real +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@rm $RPM_BUILD_ROOT%{_bindir}/bclient +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bhquery.real $RPM_BUILD_ROOT%{_bindir}/bhquery +@ENABLE_BALER_TRUE@mv $RPM_BUILD_ROOT%{_bindir}/bclient.real $RPM_BUILD_ROOT%{_bindir}/bclient + +echo making manifest +./util/relocation/bld_manifest.sh %{buildroot}%{_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir} > %{buildroot}%{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %clean rm -rf $RPM_BUILD_ROOT @@ -123,13 +175,23 @@ rm -rf $RPM_BUILD_ROOT @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbquery.* @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbsos_img.* @ENABLE_BALER_TRUE@%exclude %{_libdir}/libbsos_msg.* + %{_libdir}/* %{_bindir}/* %{_sbindir}/* +%{_sbindir}/.ldms* +#%{_sbindir}/.ldms-wrapper +%{_datadir}/doc/%{name}-%{version}/relocation %{_docdir}/%{name}-%{version}/COPYING %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/AUTHORS %exclude %{_bindir}/ldms-py*sh +%exclude %{_bindir}/ldms-meminfo.sh +%exclude %{_bindir}/ldms-static-test.sh +%exclude %{_bindir}/ldmsd-wrapper.sh +%exclude %{_bindir}/ldmsd-pre-systemd +%exclude %{_bindir}/ldmsd-pre-sysvinit + @ENABLE_SOS_TRUE@%exclude %{_libdir}/libkey_* @ENABLE_SOS_TRUE@%exclude %{_libdir}/libidx_* @ENABLE_SOS_TRUE@%exclude %{_bindir}/sos_* @@ -138,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT @ENABLE_SOS_TRUE@%exclude %{_libdir}/ovis-ldms/libstore_sos* @ENABLE_SOS_TRUE@%exclude %{_sbindir}/ldmsd_sos_init #end core + @ENABLE_BALER_TRUE@# baler @ENABLE_BALER_TRUE@%package baler @ENABLE_BALER_TRUE@Summary: OVIS Baler tools @@ -206,12 +269,15 @@ Requires: ovis = @VERSION@ Obsoletes: ldms-all-test %description test This is a collection of test scripts for (LDMS). -They also serve as examples, but are not usually of interest -on compute nodes in large clusters. +They also serve as examples, but are not usually of direct +interest on compute nodes in production clusters. %files test %defattr(-,root,root) %{_bindir}/ldms-py*sh +%{_bindir}/ldms-meminfo.sh +%{_bindir}/ldms-static-test.sh +%{_datadir}/doc/ovis-ldms-%{version}/examples/static-test #end test # initscripts @@ -229,127 +295,66 @@ control file, use of libgenders can be bypassed. %files initscripts-base %defattr(-,root,root) @ENABLE_BALER_TRUE@%config(noreplace) %{_sysconfdir}/baler/* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/* -@ENABLE_LIBGENDERS_TRUE@%post initscripts-base -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-wrapper.sh -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldms-functions -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/sysconfig/ldms.d/ldmsd.local.conf -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi +@ENABLE_TOSS_SYSTEMD_TRUE@%{_sysconfdir}/sysconfig/* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.local.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.agg.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets/ldmsauth.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.local +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.agg +@ENABLE_TOSS_SYSTEMD_TRUE@%{_bindir}/ldmsd-wrapper.sh + +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-base +# bash $RELO_DIR/relocate-paths.sh $USR $ETC $VAR $RELO_DIR/manifest +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + #end initscripts-base -@ENABLE_LIBGENDERS_TRUE@%package initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based systemd scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users normally provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. -@ENABLE_LIBGENDERS_TRUE@ -@ENABLE_LIBGENDERS_TRUE@%files initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_prefix}/lib/systemd/system/ldmsd*.service -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@%post initscripts-systemd -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-systemd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd.service -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/lib/systemd/system/ldmsd@.service -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-systemd - - -@ENABLE_LIBGENDERS_TRUE@# initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%package initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} -@ENABLE_LIBGENDERS_TRUE@Group: %{ldms_grp} -@ENABLE_LIBGENDERS_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base -@ENABLE_LIBGENDERS_TRUE@%description initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. -@ENABLE_LIBGENDERS_TRUE@Users must provide information via /etc/genders (or alternate file) -@ENABLE_LIBGENDERS_TRUE@to make these scripts operate. They are required to fail out of the box. - -@ENABLE_LIBGENDERS_TRUE@%files initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@%defattr(-,root,root) -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_sysconfdir}/init.d/ldms* -@ENABLE_LIBGENDERS_TRUE@%config(noreplace) %{_bindir}/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@%post initscripts-sysv -@ENABLE_LIBGENDERS_TRUE@varrunscripts=" -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX0/bin/ldmsd-pre-sysvinit -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd -@ENABLE_LIBGENDERS_TRUE@$RPM_INSTALL_PREFIX2/init.d/ldmsd.template -@ENABLE_LIBGENDERS_TRUE@" -@ENABLE_LIBGENDERS_TRUE@# replace /var in /var/run occurences with prefix1 relocation -@ENABLE_LIBGENDERS_TRUE@if test "$RPM_INSTALL_PREFIX1" != "/var" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/etc" != "$RPM_INSTALL_PREFIX2" \ -@ENABLE_LIBGENDERS_TRUE@ -o "/usr" != "$RPM_INSTALL_PREFIX0"; then -@ENABLE_LIBGENDERS_TRUE@ for i in $varrunscripts; do -@ENABLE_LIBGENDERS_TRUE@ if test $i.rpmnew -nt $i; then -@ENABLE_LIBGENDERS_TRUE@ j=$i.rpmnew -@ENABLE_LIBGENDERS_TRUE@ else -@ENABLE_LIBGENDERS_TRUE@ j=$i -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ if grep LDMS_POST_INSTALLED=0 $j >/dev/null; then -@ENABLE_LIBGENDERS_TRUE@ sed -i \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%//run%/run%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/etc%$RPM_INSTALL_PREFIX2%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ -@ENABLE_LIBGENDERS_TRUE@ -e "s%LDMS_POST_INSTALLED=0%LDMS_POST_INSTALLED=1%g" \ -@ENABLE_LIBGENDERS_TRUE@ $j -@ENABLE_LIBGENDERS_TRUE@ fi -@ENABLE_LIBGENDERS_TRUE@ done -@ENABLE_LIBGENDERS_TRUE@fi -@ENABLE_LIBGENDERS_TRUE@#end initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_prefix}/lib/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd + +@ENABLE_TOSS_SYSTEMD_TRUE@# initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users must provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. + +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_sysconfdir}/init.d/ldms* +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-sysvinit +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-sysv %package doc @@ -363,26 +368,19 @@ Doxygen files for ovis package. %defattr(-,root,root) %{_mandir}/*/* %{_datadir}/doc/%{name}-%{version} +%exclude %{_datadir}/doc/%{name}-%{version}/relocation +%exclude %{_datadir}/doc/ovis-ldms-%{version}/examples ## %{_datadir}/doc/ovis-lib-%{version} @ENABLE_SOS_TRUE@# %{_datadir}/doc/sos @ENABLE_BALER_TRUE@# %{_datadir}/doc/baler ## %%docdir %{_defaultdocdir} %docdir /usr/share/doc %post doc -varrunmans=" -$RPM_INSTALL_PREFIX0/share/man/man5/ldms-attributes.5 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd-genders.8 -$RPM_INSTALL_PREFIX0/share/man/man8/ldmsd.8 -" -for i in $varrunmans; do - $RPM_INSTALL_PREFIX/bin/ldms-manpatch.sh $i \ - -e "s%/var%$RPM_INSTALL_PREFIX1%g" \ - -e "s%//run%/run%g" \ - -e "s%/usr%$RPM_INSTALL_PREFIX0%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - -e "s%/etc%$RPM_INSTALL_PREFIX2%g" -done +bash %{_prefix}/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + %{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest %package python2 Summary: Python files for LDMS, SOS, and baler @@ -408,13 +406,13 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@%package sosdb @ENABLE_SOS_TRUE@Summary: SOS database package @ENABLE_SOS_TRUE@Group: %{ldms_grp} -# install requires +@ENABLE_SOS_TRUE@# install requires @ENABLE_SOS_TRUE@Requires: ovis >= 3.0.0 -@ENABLE_PYTHON_TRUE@Requires: Cython -@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy -# build requires -@ENABLE_SWIG_TRUE@BuildRequires: python python-devel -@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires: Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy +@ENABLE_SOS_TRUE@# build requires +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: python python-devel +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: swig @ENABLE_SOS_TRUE@%description sosdb @ENABLE_SOS_TRUE@This is a collection of SOS database utilities for LDMS. @ENABLE_SOS_TRUE@ @@ -427,6 +425,7 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@%{_libdir}/libidx_* @ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb @ENABLE_SOS_TRUE@#end sosdb + @ENABLE_SOS_TRUE@%package ldms-sos @ENABLE_SOS_TRUE@Summary: LDMS sosdb plugins @ENABLE_SOS_TRUE@Requires: ovis-sosdb @@ -439,37 +438,33 @@ Requires: ovis >= 3.0.0 python @ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb @ENABLE_SOS_TRUE@#end ldms-sos + %post -for i in $RPM_INSTALL_PREFIX/bin/envldms.sh \ - $RPM_INSTALL_PREFIX/bin/ldms*.sh \ - $RPM_INSTALL_PREFIX/lib64/ovis-*configvars.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post test -for i in $RPM_INSTALL_PREFIX/bin/ldms-py*.sh; do - sed -i \ - -e "s%BUILDDIR=/usr%BUILDDIR=$RPM_INSTALL_PREFIX%g" \ - -e "s%exec_prefix=/usr%exec_prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%libdir=/usr%libdir=$RPM_INSTALL_PREFIX%g" \ - -e "s%%prefix=/usr%%prefix=$RPM_INSTALL_PREFIX%g" \ - -e "s%$RPM_INSTALL_PREFIX0/bin/test%/usr/bin/test%g" \ - -e "s%$RPM_INSTALL_PREFIX0/lib64/ovis-libevent2/lib64/%/usr/lib64/ovis-libevent2/lib64/%g" \ - $i -done +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %post python2 -@ENABLE_BALER_TRUE@rm -f $RPM_INSTALL_PREFIX/bin/bhquery -@ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %changelog +* Thu Apr 19 2018 Ben Allan 3.4.6-1 +SOS/baler v3 deprecation. Wrapper file for sbin exec relocation support. +* Wed Oct 18 2017 Ben Allan 3.4.4-4 +Cray relocation scheme * Thu Aug 31 2017 Ben Allan 3.4.4-2.1 Update for upstream and override -O2 which produces infinite loop bugs with toss gcc 4.8.5. diff --git a/v41.toss3.unstable/.gitignore b/v41.toss3.unstable/.gitignore new file mode 100644 index 0000000..4f337fc --- /dev/null +++ b/v41.toss3.unstable/.gitignore @@ -0,0 +1,8 @@ +ovis +plist +rlist +sos +*log +*.spec +*.tar +*.gz diff --git a/v41.toss3.unstable/firerpms b/v41.toss3.unstable/firerpms new file mode 100755 index 0000000..ac5463d --- /dev/null +++ b/v41.toss3.unstable/firerpms @@ -0,0 +1,215 @@ +#!/bin/bash -x +# +# +packing=v41.toss3.unstable +ovis_branch=ldmsd_usage_systemd_master +sos_branch=master +NetworkRequires=github.com +#SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git +OVISREPO=gitlab@gitlab.opengridcomputing.com:baallan/ovis.git +#OVISREPO=/home/baallan/ovis/repos/buildfiles_3_18 + +if test -n "$MODULEPATH"; then + module purge +fi +. ../support/package-functions + +prefix=/genetha +PACK_OPTS=" +--disable-rpath +--disable-static +--prefix=$prefix +--with-pkglibdir=ovis-ldms +" +DOC_OPTS=" +--enable-doc +--enable-doc-html +" +SECURITY_OPTS=" +--enable-ovis_auth +--enable-ssl +" +NETWORK_OPTS=" +--enable-ovis_event +--enable-zap +--enable-sock +--enable-rdma +--disable-mmap +" +CRAY_LOCATIONS="" + +IFACE_OPTS=" +--enable-swig +--disable-readline +--enable-ldms-python +--disable-python +--enable-libgenders +--enable-genderssystemd +" +STORE_OPTS=" +--enable-sos +--enable-flatfile +--enable-csv +--enable-store +--enable-rabbitv3 +" +SAMPLER_OPTS=" +--enable-kokkos +--disable-cray_power_sampler +--disable-cray_system_sampler +--disable-aries-gpcdr +--disable-gpcdlocal +--disable-aries-mmr +--disable-ugni +--disable-perfevent +--disable-papi +--disable-procdiskstats +--disable-atasmart +--disable-hadoop +--disable-generic_sampler +--disable-switchx +--enable-sysclassib +--enable-opa2 +--enable-jobinfo +--enable-perf +--enable-jobid +--enable-sensors +--enable-array_example +--enable-procinterrupts +--enable-procnetdev +--enable-procnfs +--enable-procsensors +--enable-procstat +--enable-vmstat +--enable-meminfo +--enable-lustre +" +allconfig="$PACK_OPTS $SECURITY_OPTS $NETWORK_OPTS $IFACE_OPTS $STORE_OPTS $SAMPLER_OPTS $CRAY_LOCATIONS" + +if ! pack_prechecks "$allconfig"; then + echo "Check dependencies listed above, install needed packages, and try again" + exit 1 +fi + +dn=$(pwd) +bn=$(basename $dn) +if test "$bn" = "$packing" -a -f ovis.spec.in; then + : in the right place +else + echo This must be run from $packing, which should be clean and at any rate will be overwritten. + exit 1 +fi + +specdir=$dn +SOSTAR=sos.tar + +/bin/rm -rf ovis +if ! git clone $OVISREPO ovis; then + echo cannot checkout ovis. + exit 1 +fi + +cd ovis +if ! git checkout $ovis_branch; then + echo cannot checkout ovis branch $ovis_branch. + exit 1 +fi +if test -n "$SOSREPO"; then + (cd .. ; /bin/rm -rf sos ; + if ! git clone $SOSREPO sos; then + echo cannot checkout SOS. + exit 1 + else + (cd sos; if ! git checkout $sos_branch; then + echo "cannot checkout sos branch $sos_branch"; + exit 1 + fi ) + tar cf $SOSTAR sos + fi + /bin/rm -rf sos + if ! test -f ../$SOSTAR; then + echo archive $SOSTAR must be next to source tree. + exit 1 + fi + ) +else + git submodule init sos && git submodule update sos && tar cf ../$SOSTAR sos +fi + +patches="" +for i in $patches; do + patch -p1 < ../patches/$i + git commit -a -m "add $packing distribution patches" +done +if ! test -f ../$SOSTAR; then + echo archive $SOSTAR must be next to source tree. + exit 1 +fi +VERSION=$(pack_get_ac_version configure.ac) +PACKAGE=$(pack_get_ac_name configure.ac) +# Find SHA of latest checkin someone tagged +COMMIT_ID="$(git log -1 --pretty="%H")" +BASE_COMMIT_ID="$(git rev-parse $ovis_branch)" + +# Get most recent tag id for this branch +TAG_ID="$(git describe --tags --abbrev=0)" +TARGET=${PACKAGE}-${VERSION}.tar +REPO_DIR=`pwd` +OUTPUT_DIR=`pwd`/Tars +# Create output dir +mkdir -p $OUTPUT_DIR +# populate outdir inputs +git archive --prefix=${PACKAGE=}-${VERSION}/ $COMMIT_ID --format=tar --output=${OUTPUT_DIR}/$TARGET +sleep 0.1 +cp ../$SOSTAR $OUTPUT_DIR + +cd $OUTPUT_DIR + +# Untar archive +echo "Untarring archive" +tar xf $TARGET && \ +(cd ${PACKAGE}-${VERSION} && \ +tar xf ../$SOSTAR && \ +mkdir -p gpcd-support/m4 && \ +./autogen.sh) +if ! test -f ${PACKAGE}-${VERSION}/configure; then + echo "unable to generate ovis build files" + exit 1 +fi + +# Tar back up excluding unwanted files and dirs +echo "tarring archive with excludes from " +echo "$REPO_DIR/util/tar-excludes.txt" +TAR_OPTS="-X $REPO_DIR/util/tar-excludes.txt" +tar czf $TARGET.gz $TAR_OPTS ${PACKAGE}-${VERSION} + +echo "Relocating cruft" +rm -rf old +mkdir old +mv -f ${PACKAGE}-${VERSION} $TARGET $SOSTARGET old +specfile=tmp-ovis-${packing}.spec +tar zxf $TARGET.gz && \ +cd ${PACKAGE}-${VERSION} && \ +echo "================ configure for $packing rpms =============" && \ +./configure CC=gcc CXX=g++ $allconfig && \ +echo "============================= make $packing rpms =============" && \ +make dist-gzip && \ +mkdir -p $packing/{BUILD,RPMS,SOURCES,SPECS,SRPMS} && \ +cp $TARGET.gz $packing/SOURCES && \ +./config.status --file=-:$specdir/ovis.spec.in | \ +./ldms/config.status --file=-:- | \ +./lib/config.status --file=$specdir/tmp-ovis-${packing}.spec:- && \ +if test -f sos/config.status; then + ./sos/config.status --file=$specdir/ovis-${packing}.spec:$specdir/$specfile + specfile=ovis-${packing}.spec +fi && \ +rpmbuild -vv --define "_topdir `pwd`/$packing" -ba $specdir/$specfile && \ +touch completed +if ! test -f completed; then + echo FAIL +else + echo PASS + cd $dn + echo the droids you seek may be: + find . -name '*.rpm' +fi diff --git a/v41.toss3.unstable/inst b/v41.toss3.unstable/inst new file mode 100644 index 0000000..b06d29f --- /dev/null +++ b/v41.toss3.unstable/inst @@ -0,0 +1 @@ +rpm -ivh ./ovis/Tars/ovis-4.1.0/v41.toss3.unstable/RPMS/x86_64/*rpm diff --git a/v41.toss3.unstable/inventory.sh b/v41.toss3.unstable/inventory.sh new file mode 100644 index 0000000..cfd0571 --- /dev/null +++ b/v41.toss3.unstable/inventory.sh @@ -0,0 +1,5 @@ +# this dumps the file lists and dependency lists +# for the generated rpms +ver=4.1.0 +for i in ./ovis/Tars/ovis-$ver/v41.toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qp --requires $i; echo; done > plist +for i in ./ovis/Tars/ovis-$ver/v41.toss3.unstable/RPMS/x86_64/*rpm; do echo $i; echo $i; rpm -qpl $i; echo; done > rlist diff --git a/v41.toss3.unstable/ovis.spec.in b/v41.toss3.unstable/ovis.spec.in new file mode 100644 index 0000000..e62060a --- /dev/null +++ b/v41.toss3.unstable/ovis.spec.in @@ -0,0 +1,419 @@ +# Set topdir to be builddir/rpm +# note this is intentionally ignored by rpmbuild. must use +# commandline syntax in makefile.am to get this effect. +#% define _topdir %(echo $PWD)/toss +# do not set unfascist build +#%-define _unpackaged_files_terminate_build 0 +#%-define _missing_doc_files_terminate_build 0 + +%define ldms_all System Environment/Libraries +%define build_timestamp %(date +"%Y%m%d_%H%M") +# % global __strip /bin/true +%global _enable_debug_package 0 +%global debug_package %{nil} +%global __os_install_post /usr/lib/rpm/brp-compress %{nil} +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /opt/python-2.7/bin/python} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + +# for rpm and cpio installation both allowed, we need this: +%define relo_usr /@ovis_prefix@ +%define relo_etc /@ovis_sysconfdir@ +%define relo_var /@ovis_localstatedir@ + +# Main package +Summary: OVIS Commands and Libraries +Name: ovis +Version: @VERSION@ +Release: cts1x_%{build_timestamp}%{?dist} +License: GPLv2 or BSD +Group: %{ldms_all} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source: %{name}-%{version}.tar.gz +Obsoletes: ldms-all +Requires: rpm >= 4.8.0 +Requires: libevent >= 2.0.21 +@ENABLE_LDMS_PYTHON_TRUE@Requires: python +@ENABLE_SSL_TRUE@Requires: openssl +@ENABLE_LIBGENDERS_TRUE@Requires: boost-regex boost-program-options +@ENABLE_LIBGENDERS_TRUE@Requires: genders +@ENABLE_SYSCLASSIB_TRUE@Requires: libibmad libibumad +@ENABLE_RDMA_TRUE@Requires: librdmacm libibverbs +@ENABLE_KOKKOS_TRUE@Requires: bison-devel flex-devel + +BuildRequires: gettext-devel gcc glib2-devel +@ENABLE_DOC_TRUE@BuildRequires: doxygen +@ENABLE_OVIS_AUTH_TRUE@BuildRequires: openssl-devel +@ENABLE_SYSCLASSIB_TRUE@BuildRequires: libibverbs-devel +@ENABLE_RDMA_TRUE@BuildRequires: librdmacm-devel libibverbs-devel +@ENABLE_SYSCLASSIB_TRUE@BuildRequires: libibmad libibmad-devel libibumad libibumad-devel +BuildRequires: libevent libevent-devel +@ENABLE_SWIG_TRUE@BuildRequires: python python-devel +@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_LIBGENDERS_TRUE@BuildRequires: boost-devel +@ENABLE_LIBGENDERS_TRUE@BuildRequires: genders +@ENABLE_KOKKOS_TRUE@BuildRequires: bison bison-devel flex flex-devel +Url: http://ovis.ca.sandia.gov/ + +# relocation prefix0 for file installs other than sysconfdir & localstatedir +Prefix: /usr +# relocation prefix1 for runtime localstatedir post install hooks +Prefix: /var +# relocation prefix2 for runtime sysconfdir post install hooks +Prefix: /etc + + +%description +This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3. +Configured for relocation with @ac_configure_args@ +--prefix=%{relo_usr} +--exec-prefix=%{relo_usr} +--bindir=%{relo_usr}/bin +--sbindir=%{relo_usr}/sbin +--sysconfdir=%{relo_etc} +--datadir=%{relo_usr}/share +--includedir=%{relo_usr}/include +--libdir='${exec_prefix}/lib64' +--libexecdir=%{relo_usr}/libexec +--mandir=%{relo_usr}/share/man +--infodir=%{relo_usr}/share/info +--sharedstatedir=%{relo_var}/lib +--localstatedir=%{relo_var} + +%dump + +%prep +%setup -q + +%build +echo bTMPPATH %{_tmppath} +rm -rf $RPM_BUILD_ROOT +echo bBUILDROOT $RPM_BUILD_ROOT +export CFLAGS="@CFLAGS@ %{optflags} -O1" +#export CFLAGS="@CFLAGS@" +./configure @ac_configure_args@ --localstatedir=%{relo_var} --prefix=%{relo_usr} --exec-prefix=%{relo_usr} --bindir=%{relo_usr}/bin --sbindir=%{relo_usr}/sbin --sysconfdir=%{relo_etc} --datadir=%{relo_usr}/share --includedir=%{relo_usr}/include --libdir='${exec_prefix}/lib64' --libexecdir=%{relo_usr}/libexec --mandir=%{relo_usr}/share/man --infodir=%{relo_usr}/share/info --sharedstatedir=%{relo_var}/lib + +ncores=`grep -c ^processor /proc/cpuinfo` +make V=1 -j $ncores + +%install +echo TMPPATH %{_tmppath} +echo BUILDROOT $RPM_BUILD_ROOT +make DESTDIR=${RPM_BUILD_ROOT} V=1 install +ls %{buildroot} +mkdir -p %{buildroot}%{_prefix} +(cd %{buildroot}%{_prefix}/..; rmdir `basename %{buildroot}%{_prefix}`) +mv %{buildroot}%{relo_usr} %{buildroot}%{_prefix} +if test -d %{buildroot}%{relo_etc}; then + mv %{buildroot}%{relo_etc} %{buildroot}%{_sysconfdir} +fi + +# sbin wrapper rework +for b in $RPM_BUILD_ROOT%{_sbindir}/ldms*; do + bn=`basename $b` + echo wrapping $bn + dn=`dirname $b` + mv $b $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/$bn + (cd $dn; ln -s .ldms-wrapper $bn) +done +# remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/ovis-ldms/lib*.la +rm $RPM_BUILD_ROOT%{_bindir}/test_* +rm $RPM_BUILD_ROOT%{_bindir}/ldms_ban.sh +find $RPM_BUILD_ROOT%{_docdir}/ovis-ldms-%{version} -maxdepth 1 -type f -exec mv {} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ \; +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +@ENABLE_TOSS_SYSTEMD_TRUE@mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +@ENABLE_TOSS_SYSTEMD_TRUE@cp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/sysv/etc/init.d/ldms* $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ +@ENABLE_TOSS_SYSTEMD_TRUE@cp -ar $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/etc/* $RPM_BUILD_ROOT%{_sysconfdir} +@ENABLE_TOSS_SYSTEMD_TRUE@cp -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sample_init_scripts/genders/systemd/services/ldms*.service $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_localstatedir}/run/ldmsd +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterGenders +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets +mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldms.d/plugins-conf + +echo making manifest +./util/relocation/bld_manifest.sh %{buildroot}%{_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_localstatedir} > %{buildroot}%{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_libdir}/* +%{_bindir}/* +%{_sbindir}/* +%{_sbindir}/.ldms* +#%{_sbindir}/.ldms-wrapper +%{_datadir}/doc/%{name}-%{version}/relocation +%{_docdir}/%{name}-%{version}/COPYING +%{_docdir}/%{name}-%{version}/ChangeLog +%{_docdir}/%{name}-%{version}/AUTHORS +%exclude %{_bindir}/ldms-py*sh +%exclude %{_bindir}/ldms-meminfo.sh +%exclude %{_bindir}/ldms-static-test.sh +%exclude %{_bindir}/ldmsd-wrapper.sh +%exclude %{_bindir}/ldmsd-pre-systemd +%exclude %{_bindir}/ldmsd-pre-sysvinit + +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libkey_* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libidx_* +@ENABLE_SOS_TRUE@%exclude %{_bindir}/sos_* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libsos* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/libods* +@ENABLE_SOS_TRUE@%exclude %{_libdir}/ovis-ldms/libstore_sos* +@ENABLE_SOS_TRUE@%exclude %{_sbindir}/ldmsd_sos_init +#end core + +# devel +%package devel +Summary: LDMS devel package +Group: %{ldms_grp} +Requires: ovis = @VERSION@ +Obsoletes: ldms-all-devel +%description devel +This is a development package of Lightweight Distributed Metric System (LDMS). +Users who want to implement their own sampler or store must install this +package. + +%files devel +%defattr(-,root,root) +%{_includedir}/*/*.h +%{_includedir}/*/*/*.h +%{_includedir}/ovis-lib-config.h +%{_includedir}/ovis-ldms-config.h +#end devel + +%package test +Summary: LDMS test package +Group: %{ldms_grp} +Requires: ovis = @VERSION@ +Obsoletes: ldms-all-test +%description test +This is a collection of test scripts for (LDMS). +They also serve as examples, but are not usually of direct +interest on compute nodes in large clusters. + +%files test +%defattr(-,root,root) +%{_bindir}/ldms-py*sh +%{_bindir}/ldms-meminfo.sh +%{_bindir}/ldms-static-test.sh +%{_datadir}/doc/ovis-ldms-%{version}/examples/static-test +#end test + +# initscripts +%package initscripts-base +Summary: LDMS base initscripts for libgenders control of %{name} +Group: %{ldms_grp} +Requires: ovis = @VERSION@ +Obsoletes: ldms-all-initscripts +%description initscripts-base +This is the support file set for libgenders based booting of LDMS daemons. +Users normally provide information via /etc/genders (or alternate file) +to make these scripts operate. With a manually written daemon +control file, use of libgenders can be bypassed. + +%files initscripts-base +%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%{_sysconfdir}/sysconfig/* +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.local.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ldmsd.agg.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterSecrets/ldmsauth.conf +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.local +@ENABLE_TOSS_SYSTEMD_TRUE@%config(noreplace) %{_sysconfdir}/sysconfig/ldms.d/ClusterGenders/genders.agg +@ENABLE_TOSS_SYSTEMD_TRUE@%{_bindir}/ldmsd-wrapper.sh +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-base +# bash $RELO_DIR/relocate-paths.sh $USR $ETC $VAR $RELO_DIR/manifest +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +#end initscripts-base + +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS systemd scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based systemd scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users normally provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. +@ENABLE_TOSS_SYSTEMD_TRUE@ +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_prefix}/lib/systemd/system/ldmsd*.service +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-systemd +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-systemd + +@ENABLE_TOSS_SYSTEMD_TRUE@# initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%package initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@Summary: LDMS sysv init scripts for libgenders control of %{name} +@ENABLE_TOSS_SYSTEMD_TRUE@Group: %{ldms_grp} +@ENABLE_TOSS_SYSTEMD_TRUE@Requires: ovis = @VERSION@ ovis-initscripts-base +@ENABLE_TOSS_SYSTEMD_TRUE@%description initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@This is the libgenders based sysv init scripts for LDMS daemons. +@ENABLE_TOSS_SYSTEMD_TRUE@Users must provide information via /etc/genders (or alternate file) +@ENABLE_TOSS_SYSTEMD_TRUE@to make these scripts operate. They are required to fail out of the box. + +@ENABLE_TOSS_SYSTEMD_TRUE@%files initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@%defattr(-,root,root) +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_sysconfdir}/init.d/ldms* +@ENABLE_TOSS_SYSTEMD_TRUE@%config %{_bindir}/ldmsd-pre-sysvinit +@ENABLE_TOSS_SYSTEMD_TRUE@%post initscripts-sysv +@ENABLE_TOSS_SYSTEMD_TRUE@bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX2 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX1 \ +@ENABLE_TOSS_SYSTEMD_TRUE@ $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest +@ENABLE_TOSS_SYSTEMD_TRUE@#end initscripts-sysv + + +%package doc +Summary: Documentation files for %{name} +Group: %{ldms_all} +Obsoletes: ldms-all-doc +## Requires: %{name}-devel = %{version}-%{release} +%description doc +Doxygen files for ovis package. +%files doc +%defattr(-,root,root) +%{_mandir}/*/* +%{_datadir}/doc/%{name}-%{version} +%exclude %{_datadir}/doc/%{name}-%{version}/relocation +%exclude %{_datadir}/doc/ovis-ldms-%{version}/examples +## %{_datadir}/doc/ovis-lib-%{version} +@ENABLE_SOS_TRUE@# %{_datadir}/doc/sos +## %%docdir %{_defaultdocdir} +%docdir /usr/share/doc +%post doc +bash %{_prefix}/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + %{_prefix}/share/doc/ovis-@VERSION@/relocation/manifest + +%package python2 +Summary: Python files for LDMS, SOS +%description python2 +Python files for ovis +# install needs +Requires: ovis >= 3.0.0 python +# build needs +@ENABLE_LDMS_PYTHON_TRUE@BuildRequires: python +@ENABLE_SWIG_TRUE@BuildRequires: python python-devel swig +%files python2 +%defattr(-,root,root) +@ENABLE_SWIG_TRUE@%{_prefix}/lib/python2.7/site-packages/ovis_lib +@ENABLE_SWIG_TRUE@%{_prefix}/lib/python2.7/site-packages/ovis_ldms +@ENABLE_LDMS_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/ldmsd +#%%{python2_sitelib}/* +#end python2 +# see https://fedoraproject.org/wiki/Packaging:Python_Old +# and https://fedoraproject.org/wiki/Packaging:Python + +@ENABLE_SOS_TRUE@%package sosdb +@ENABLE_SOS_TRUE@Summary: SOS database package +@ENABLE_SOS_TRUE@Group: %{ldms_grp} +@ENABLE_SOS_TRUE@# install requires +@ENABLE_SOS_TRUE@Requires: ovis >= 3.0.0 +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@Requires: Cython +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@@ENABLE_SOS_TRUE@Requires: numpy +@ENABLE_SOS_TRUE@# build requires +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: python python-devel +@ENABLE_SOS_TRUE@@ENABLE_SWIG_TRUE@BuildRequires: swig +@ENABLE_SOS_TRUE@%description sosdb +@ENABLE_SOS_TRUE@This is a collection of SOS database utilities for LDMS. +@ENABLE_SOS_TRUE@ +@ENABLE_SOS_TRUE@%files sosdb +@ENABLE_SOS_TRUE@%defattr(-,root,root) +@ENABLE_SOS_TRUE@%{_bindir}/sos_* +@ENABLE_SOS_TRUE@%{_libdir}/libkey_* +@ENABLE_SOS_TRUE@%{_libdir}/libsos* +@ENABLE_SOS_TRUE@%{_libdir}/libods* +@ENABLE_SOS_TRUE@%{_libdir}/libidx_* +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb +@ENABLE_SOS_TRUE@#end sosdb + +@ENABLE_SOS_TRUE@%package ldms-sos +@ENABLE_SOS_TRUE@Summary: LDMS sosdb plugins +@ENABLE_SOS_TRUE@Requires: ovis-sosdb +@ENABLE_SOS_TRUE@%description ldms-sos +@ENABLE_SOS_TRUE@Libraries and utilities for SOS usage in LDMS +@ENABLE_SOS_TRUE@%files ldms-sos +@ENABLE_SOS_TRUE@%defattr(-,root,root) +@ENABLE_SOS_TRUE@%{_sbindir}/ldmsd_sos_init +@ENABLE_SOS_TRUE@%{_libdir}/ovis-ldms/libstore_sos* +@ENABLE_SOS_TRUE@@ENABLE_PYTHON_TRUE@%{_prefix}/lib/python2.7/site-packages/sosdb +@ENABLE_SOS_TRUE@#end ldms-sos + + +%post +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +%post test +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +%post python2 +bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh \ + $RPM_INSTALL_PREFIX0 \ + $RPM_INSTALL_PREFIX2 \ + $RPM_INSTALL_PREFIX1 \ + $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest + +%changelog +* Fri Apr 13 2018 Ben Allan 4.0.0-rc +Baler decoupled upstream. omnipath support added. +* Wed Oct 18 2017 Ben Allan 3.4.4-4 +Cray relocation scheme +* Wed Apr 26 2017 Ben Allan 3.4.1-1 +Flex array and swig bug patches. Refactor cython dependent bits. +* Wed Mar 29 2017 Ben Allan 3.4.0-1 +Update package refactorization +* Tue Mar 14 2017 Ben Allan 3.3.1-2 +Update package refactorization +* Tue Feb 21 2017 Ben Allan 3.3.1-1 +Update for gender feature. +* Thu Aug 25 2016 Ben Allan 3.0.0-21 +Update for baler features. +* Mon Mar 14 2016 Ben Allan 3.0.0-6 +Update for cray/sos features. +* Tue Mar 01 2016 Ben Allan 3.0.0-3 +ported for LANL monitoring server. +* Tue Nov 03 2015 Ben Allan 3.0.0-2 +ported for LANL monitoring server. +* Tue Oct 13 2015 Ben Allan 3.0.0-1 +update to v3. +* Tue Aug 25 2015 Ben Allan 2.4.5-1 +update to latest upstream. +* Wed Jul 29 2015 Ben Allan 2.4.4-1 +update to latest upstream. +* Thu Jun 18 2015 Ben Allan 2.4.3-1 +packaging of initscripts for ldmsd/ldms-aggd. +* Sat May 23 2015 Ben Allan 2.4.2-1 +update to latest upstream. +* Thu Apr 23 2015 Ben Allan 2.4.1-1 +packaging with sysclassib and procstatutil2 enabled. +* Wed Feb 18 2015 Ben Allan 2.4.0-1 +packaging with separate libevent +* Mon Sep 15 2014 Ben Allan 2.2.0-1 +all-in-one packaging w/libevent