Note, this the the way I think optional components should be handled throughout
the build and packaging scripts.
Changes committed to git://git.pcp.io/kenj/pcp master
Ken McDonell (17):
qa/177: increase range for allowed number of log reads
qa/727: wait for pmwebd to start before pinging avahi
qa/775: add diagnostic output to aid debugging
qa/common.discovery: add diagnostic output to aid debugging
configure, builddefs.in: additional optional build/package hooks
pmdas: conditional build/packaging changes
rpm spec file: changes for optionally built/packaged pmdas
qa/946: additional diagnostics to help debugging
activemq pmda: add optional build/packing support
libpcp_fault: extend .gitignore to include getdate.y
debian build: refine Makepkgs-configure integration
json pmda: fix typo from conditonal build/package changes
build/rpm/GNUmakefile: missed extra pmda_foo variables
qa/975: change "match" filter
qa/common.webapi: improve logic in _wait_for_pmwebd_logfile()
qa/common.check: in Arrrgh cases, prefix log with current date(1)
postfix pmda: fix typo from conditonal build/package changes
Makepkgs | 42 ++++++-
build/rpm/GNUmakefile | 6 +
build/rpm/pcp.spec.in | 140 +++++++++++++++++++++++---
configure | 192 ++++++++++++++++++++++++++++++++++++
configure.ac | 108 ++++++++++++++++++++
debian/rules | 7 +
qa/177 | 6 -
qa/177.out | 6 -
qa/727 | 3
qa/775 | 16 +--
qa/946 | 8 -
qa/975 | 21 +++
qa/common.check | 2
qa/common.discovery | 6 -
qa/common.webapi | 32 ++++--
src/include/builddefs.in | 6 +
src/libpcp_fault/src/.gitignore | 1
src/pmdas/GNUmakefile | 7 -
src/pmdas/elasticsearch/GNUmakefile | 14 +-
src/pmdas/gluster/GNUmakefile | 8 +
src/pmdas/infiniband/GNUmakefile | 11 --
src/pmdas/json/GNUmakefile | 10 +
src/pmdas/mic/GNUmakefile | 8 +
src/pmdas/mysql/GNUmakefile | 14 +-
src/pmdas/nginx/GNUmakefile | 14 +-
src/pmdas/papi/GNUmakefile | 1
src/pmdas/perfevent/GNUmakefile | 10 -
src/pmdas/postfix/GNUmakefile | 16 +--
src/pmdas/postgresql/GNUmakefile | 14 +-
src/pmdas/rpm/GNUmakefile | 10 -
src/pmdas/systemd/GNUmakefile | 10 -
src/pmdas/unbound/GNUmakefile | 8 +
src/pmdas/zswap/GNUmakefile | 8 +
33 files changed, 637 insertions(+), 128 deletions(-)
Details ...
commit 2c631cf51094cc09ef12e8771d132d72455c68bf
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Nov 4 08:27:09 2015 +1100
postfix pmda: fix typo from conditonal build/package changes
Need PMDA_POSTFIX, not PMDA_PMAPI here ... cut-n-paste fat fingers
to blame.
commit a460cc23d96de2ead7953d7142de35fd3fd9953a
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Nov 4 06:38:58 2015 +1100
qa/common.check: in Arrrgh cases, prefix log with current date(1)
When pmcd/pmlogger fail to start, it helps to know if the reported
log file is from the recent failure to start, or the previous
instantiation of pmcd/pmlogger.
commit 19225a410ef03288768193ccacf91f21006b04e6
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Nov 4 06:36:38 2015 +1100
qa/common.webapi: improve logic in _wait_for_pmwebd_logfile()
Rather than sleep 2 seconds, first call _wait_for_pmwebd() to
make sure the daemon starts and the socket is establised, then
a timed loop looking for the creation of the log file.
commit 5126c7473116164341813e80f334d3b3d28af648
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 3 20:03:11 2015 +1100
qa/975: change "match" filter
Instead of an absolute +/- 0.000002 (that sometimes failed due to
arithmetic errors when the values are large), change to +/- 2% if
both values are not zero, else < 0.002 if one of the values is
zero.
In all the previous real code failures, the values have been off by
a mile (like x2 difference), so this should be fine.
commit fdf27ea923ab11157f067e2188a54cc7ee52e1aa
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 3 16:27:29 2015 +1100
build/rpm/GNUmakefile: missed extra pmda_foo variables
More of the conditional build/package changes.
Added some extra pmda_foo variables and forgot that pcp.spec is
created from pcp.spec.in by sed magic in the makefile, not
configure.
commit 3d34b036b342581c7ae2e5b0779a095d3b94fb75
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 3 16:26:13 2015 +1100
json pmda: fix typo from conditonal build/package changes
Need PMDA_JSON, not PMDA_PMAPI here ... cut-n-paste fat fingers
to blame.
commit 4e4150ab9d8534767831fdea120d265f203c71cd
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 3 08:47:33 2015 +1100
debian build: refine Makepkgs-configure integration
Motivated by the --without-optimization changes that were NQR.
It turns out that any tweaking of the options to configure in
Makepkgs is used the first time configure is run from Makepkgs,
but was ignored in the deeper use of configure from within the
Debian build and package script.
Clean this up so both invocations of configure use the same
options.
commit 247ade3508aa4c1005a74f612a2e8857750c8908
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Nov 3 08:46:39 2015 +1100
libpcp_fault: extend .gitignore to include getdate.y
commit a5226ac5ce8f66f62c0e17eaf8855fc4f232677a
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Nov 2 09:35:14 2015 +1100
activemq pmda: add optional build/packing support
Missed this one in the earlier round of commits.
commit 755a37158639fc46f875a692a605228efe9b683b
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Nov 2 06:55:46 2015 +1100
qa/946: additional diagnostics to help debugging
commit 0389495f809c4eccccfbcb0e671b864f7e1f6ddf
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Nov 2 06:47:00 2015 +1100
rpm spec file: changes for optionally built/packaged pmdas
Track the associated configure and makefile changes, so that now if
a (pmda) package Requires: some package at run-time and that package
is not installed at build time, then that (pmda) package is not
created.
For all distros this is a no-op change, because their build environments
typically have all packages installed.
It makes a difference for older build environments where we may not
have packages available, and so building a PCP package that cannot be
installed is not helful (and breaks automated QA).
commit 78e6ddde7cd5a464ef530eee75acee57e3c67cfa
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Nov 2 06:42:40 2015 +1100
pmdas: conditional build/packaging changes
Remove conditional code at top level makefile.
Descend into each PMDA directory and conditional build or install,
based on the builddefs variables set from configure.
Some cosmetic makefile changes to make the approach consistent across
all PMDAs that may be optionally built or installed (and hence
optonally packaged).
commit b51541aac88978ba21639e3ccf24ee178fccdd0b
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Nov 1 10:32:13 2015 +1100
configure, builddefs.in: additional optional build/package hooks
For _all_ the components (especially PMDAs) that may be optionally
built and/or optionally packaged on certain platforms, ensure there
are appropriate variables (usually of the form PMDA_FOO) defined
in builddefs so we can make correct choices in the makefiles and
the packaging recipes.
commit c883804888f582fcaf08c942e91ccfebf10f243a
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Fri Oct 30 07:20:38 2015 +1100
qa/common.discovery: add diagnostic output to aid debugging
commit ff5b034e09ca64667d810f08b0acc394c6bc4a04
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Fri Oct 30 07:17:38 2015 +1100
qa/775: add diagnostic output to aid debugging
commit 90f71ba6ddc2773236e971cd6f784a4fb7fca02f
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Fri Oct 30 07:00:42 2015 +1100
qa/727: wait for pmwebd to start before pinging avahi
commit 9f8db1f8b54131cbd05f4653656f1b1d79e0bf63
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Thu Oct 29 15:42:27 2015 +1100
qa/177: increase range for allowed number of log reads
Up from 51-57 to 51-58 ... found at least one QA archive where
this looks correct.
|