[csw-devel] Fwd: SF.net SVN: gar:[16300] csw/mgar/pkg/ganglia/trunk/Makefile

[Dagobert Michelsen]

Hi Daniel,

some comments :-)


Best regards

  -- Dago

Anfang der weitergeleiteten E-Mail:

> Von: d_pocock at users.sourceforge.net
> Datum: 27. November 2011 03:20:53 MEZ
> An: devel at lists.opencsw.org
> Betreff: [csw-devel] SF.net SVN: gar:[16300] csw/mgar/pkg/ganglia/trunk/Makefile
> Antwort an: Broadcasts commit logs for build descriptions and GAR <devel at lists.opencsw.org>
> 
> Revision: 16300
>          http://gar.svn.sourceforge.net/gar/?rev=16300&view=rev
> Author:   d_pocock
> Date:     2011-11-27 02:20:53 +0000 (Sun, 27 Nov 2011)
> Log Message:
> -----------
> ganglia: tweak for config files
> 
> Modified Paths:
> --------------
>    csw/mgar/pkg/ganglia/trunk/Makefile
> 
> Modified: csw/mgar/pkg/ganglia/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-27 02:00:22 UTC (rev 16299)
> +++ csw/mgar/pkg/ganglia/trunk/Makefile	2011-11-27 02:20:53 UTC (rev 16300)
> @@ -138,18 +138,18 @@
> ETCGANGLIA = $(sysconfdir)
> 
> PKGFILES_CSWganglia = 
> -PKGFILES_CSWgangliaagent = .*/gmond.conf* .*/sbin/gmond .*/bin/gmetric $(libdir)/ganglia/mod*.so /etc/opt/csw/init.d/cswgmond
> +PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW /etc/opt/csw/ganglia/conf.d/* .*/sbin/gmond .*/bin/gmetric $(libdir)/ganglia/mod*.so /etc/opt/csw/init.d/cswgmond

I suggest doing it one file at a time, this makes both reading, editing,
moving files between packages and reviewing changes easier, e.g.

PKGFILES_CSWgangliaagent += .*/gmond.conf.CSW <- better fully qualify
PKGFILES_CSWgangliaagent += /etc/opt/csw/ganglia/conf.d/*
PKGFILES_CSWgangliaagent += .*/sbin/gmond (even better if 32/64: $(call baseisadirs,$(sbindir),gmond)
PKGFILES_CSWgangliaagent += .*/bin/gmetric
PKGFILES_CSWgangliaagent += $(libdir)/ganglia/mod*.so <- Remmber we have regex, not globbing!
PKGFILES_CSWgangliaagent += /etc/opt/csw/init.d/cswgmond

> PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0\.0\.0)
> PKGFILES_CSWlibganglia0 += $(call baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0(\.\d+)*)

There is the more consise $(call pkgfiles_lib,libganglia-3.1.7.so.0) which is however not
suggested by checkpkg which replaces both lines.

> CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.1.7.so.0.0.0|soname=libganglia-3.1.7.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-1-7-0
> PKGFILES_CSWgangliamodpython = .*python.*
> PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so
> -PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.* /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad
> +PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.conf.CSW /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad
> PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.*
> 
> PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
> -PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW
> -PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW
> +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
> +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf

Right, usually the trailing .CSW is appended automatically, inspect work/<host>/build-global/*.protoype if in doubt.

> PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW
> PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW
> PRESERVECONF += $(WWWGANGLIA)/conf.php
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel