Hey Mark,
Thanks again for taking a look at this, comments inline
Mark Goodwin <goodwinos@xxxxxxxxx> writes:
> On 05/06/2015 05:38 AM, Lukas Berk wrote:
[...]
>> FWIW, with the changes to pcp.spec.in, I've used symlinks to maintain
>> the original invocation of the tool, whatever it may be. The changes
>> simply reflect pulling the tools into their own package.
> OK, so now pmiostat has been pcp-foo'erized but there is no pmiostat
> symlink. Also the man page has disappeared after the upgrade (see
> below).
I believe Nathan has corrected this and moved the symlinking to their
related makefiles instead.
[...]
>> As for the pcp-system-tools vs pcp-monitor distiction, would added
>> pieces in the description of each rpm ease your concern regarding what a
>> newbie user might be expecting?
>
> yep, it's no big deal anyway really
>
Ok, will write that up.
[...]
> OK, sorry I didn't see that first time. The pcp-compat spec rules look good.
> I set up a local yum repo and tested an upgrade from pcp-3.10.3-1 on f21
> with a simple "yum update pcp" and it pulled in pcp-compat and all the deps
> followed from there. There are a couple of packages missing from the
> pcp-compat
> dep rules though because the following pcp-3.10.3-1 packages were still
> installed after the upgrade :
>
> $ rpm -qa | grep 'pcp.*3.10.3'
> pcp-webjs-3.10.3-1.fc21.noarch
> pcp-import-sheet2pcp-3.10.3-1.x86_64
> pcp-doc-3.10.3-1.fc21.noarch
> pcp-debuginfo-3.10.3-1.fc21.x86_64
>
> As a result there were a lot of missing man pages and debuginfo mismatched,
> etc. I'll send a patch later today if I get time to fix this. Attached
> below is a transcript of the upgrade.
So, I believe those packages may be outside of the pcp-compat's domain.
It's purpose is to ensure that any package I've specifically split from
the base install, is still installed on machines after an upgrade. Not
to modify the dependency structure of existing packages. The packages
listed above, simply don't have a dependency on the core pcp package.
To test this, I took upstream pcp.git with none of my packaging changes,
and followed the rest of your commands. Almost an identical result:
% rpm -qa | grep pcp*3.10.4
pcp-webapp-vector-3.10.4-1.fc21.noarch
pcp-doc-3.10.4-1.fc21.noarch
pcp-webapp-graphite-3.10.4-1.fc21.noarch
pcp-debuginfo-3.10.4-1.fc21.x86_64
pcp-webjs-3.10.4-1.fc21.noarch
pcp-webapp-grafana-3.10.4-1.fc21.noarch
(I started with 3.10.4 installed, upgrading to 3.10.5, hence the version
difference and additional packages).
As for the missing man pages. I outlined earlier that I was looking to
move the man pages to pcp-doc, as it it's common place in container
environments to not ship with them (part of what's driving this change
in the first place). So given that there was no pcp-doc upgrade, that's
what they are. I think it makes sense in this case, to add pcp-doc to
the pcp-compat dependencies, an oversight on my part. Patch attached
(should apply cleanly to nathan's master branch).
Cheers,
Lukas
>From 43b0a5a0ab7469e5ad42a02b7da41af66987d438 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@xxxxxxxxxx>
Date: Wed, 6 May 2015 17:45:14 -0400
Subject: [PATCH] Add pcp-doc to pcp-compat deps to avoid losing man pages on
upgrade
Signed-off-by: Lukas Berk <lberk@xxxxxxxxxx>
---
build/rpm/pcp.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in
index acbe8c3..bc8996b 100644
--- a/build/rpm/pcp.spec.in
+++ b/build/rpm/pcp.spec.in
@@ -1307,7 +1307,7 @@ Requires: pcp-pmda-dm pcp-pmda-gluster pcp-pmda-unbound
pcp-pmda-apache
Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors
pcp-pmda-mailq pcp-pmda-mounts
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-rpm pcp-pmda-sendmail
pcp-pmda-shping
Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog
-Requires: pcp-system-tools
+Requires: pcp-system-tools pcp-doc
%description compat
This package contains the PCP compatibility dependencies for existing PCP
installations. This is not a package that should be depended on, and will
--
2.1.0
|