Fixes for qa/119 and qa/781 (and qa/581 if you have an sd card).
Ken mentioned he still has more to go for the json issues.
Changes committed to git://git.pcp.io/pcp/pcp.git master
Ken McDonell (4):
qa/admin/check-vm: update dependency tests based on recent build issues
json pmda: make build and packaging conditional
json PMDA: rpm pcp.spec file tweak
json PMDA: change Requires for python3
Mark Goodwin (3):
Improve filter for full PCP_BINADM_DIR path to pmlogger.
Also filter mmcblk[0-9] (if you happen to have an sd card inserted).
Filter out PCP_BINADM_DIR prefix for both pmlogconf and pmlogger.
build/rpm/GNUmakefile | 1
build/rpm/pcp.spec.in | 22 +++++++++++++++----
configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 36 +++++++++++++++++++++++++++++++
qa/119 | 2 -
qa/581 | 1
qa/781 | 2 -
qa/781.out | 6 ++---
qa/admin/check-vm | 19 ++++++++--------
src/include/builddefs.in | 5 ++++
src/pmdas/GNUmakefile | 5 +++-
11 files changed, 132 insertions(+), 20 deletions(-)
Details ...
commit 1e38f78638eae45b4e7068ba73b3c15b31f97313
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Sun Jun 7 17:07:54 2015 +1000
Filter out PCP_BINADM_DIR prefix for both pmlogconf and pmlogger.
modified: 781
modified: 781.out
commit 13502d89ddc8ff9ce44a4f3d83817c420011ce88
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Sun Jun 7 15:38:17 2015 +1000
Also filter mmcblk[0-9] (if you happen to have an sd card inserted).
modified: 581
commit 56ab6e89b40c0c8bd26319e695b78d89b946d800
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Sun Jun 7 15:37:02 2015 +1000
Improve filter for full PCP_BINADM_DIR path to pmlogger.
modified: 119
commit d0426debcf28f88bd4230f8c2a5c22b9c3e3c4e7
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Jun 7 13:49:37 2015 +1000
json PMDA: change Requires for python3
I don't believe there is a python3-jsonpointer rpm ... at least not
on many of my QA platforms.
Should be Requires python-jsonpointer for either python2 or python3.
commit 7b6a7c0584b959b2970d875939e67aff0b622861
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Jun 7 13:47:59 2015 +1000
json PMDA: rpm pcp.spec file tweak
Forgot pcp.spec.in not used by configure, need hand crafted rule
in GNUmakefile to generate pcp.spec, this time with correct
expansion for @pmda_json@.
commit f594ca1b241996ce4bf23f0128b8d896c2a2b703
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Jun 7 13:10:09 2015 +1000
json pmda: make build and packaging conditional
The json PMDA requires some Python modules that are not universally
available, so this commit captures that fact and makes the building
an packaging of the json PMDA conditional on the availability of
the required Python modules in the build environment.
Tested on Ubuntu 15.04 with and without the python-json-pointer
package installed and on Fedora 17 where the python-jsonpointer rpm
is not available and on RHEL 7.1 with python-jsonpointer installed.
commit 7c9b0205a42d63445832aae9bd67d18428d8bc7b
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Jun 7 10:20:37 2015 +1000
qa/admin/check-vm: update dependency tests based on recent build issues
|