Revision: 16302
http://gar.svn.sourceforge.net/gar/?rev=16302&view=rev
Author: d_pocock
Date: 2011-11-27 03:41:10 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
ganglia: more config file fixes
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:54:31 UTC (rev 16301)
+++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-11-27 03:41:10 UTC (rev 16302)
@@ -130,7 +130,7 @@
TEST_SCRIPTS =
endif
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom
+#INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom
WWWROOT = /opt/csw/share/www
WWWGANGLIA = $(WWWROOT)/ganglia
@@ -138,7 +138,7 @@
ETCGANGLIA = $(sysconfdir)
PKGFILES_CSWganglia =
-PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW
/etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW .*/sbin/gmond .*/bin/gmetric
/opt/csw/lib/ganglia/mod*.so /etc/opt/csw/init.d/cswgmond
+PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW
etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW .*/sbin/gmond .*/bin/gmetric
$(call baseisadirs,$(libdir),ganglia/mod*\.so) /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+)*)
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
@@ -151,7 +151,7 @@
PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf
PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf
-PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW
+PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf
PRESERVECONF += $(WWWGANGLIA)/conf.php
# For gmond
@@ -170,15 +170,18 @@
include gar/category.mk
-install-custom:
+post-install-modulated:
-@rm $(DESTDIR)/opt/csw/bin/gstat
@ginstall -D $(DOWNLOADDIR)/cswgmond \
$(PKGROOT)/etc/opt/csw/init.d/cswgmond
@ginstall -D $(DOWNLOADDIR)/cswgmetad \
$(PKGROOT)/etc/opt/csw/init.d/cswgmetad
@ginstall -d $(DESTDIR)$(WWWGANGLIA)
+ @ginstall -d $(DESTDIR)$(sysconfdir)/ganglia
+ @ginstall -d $(DESTDIR)$(sysconfdir)/ganglia/conf.d
@cd $(WORKSRC)/web; \
cp -R * $(DESTDIR)$(WWWGANGLIA)
+ @rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php
@ginstall -D $(FILEDIR)/conf.php \
$(DESTDIR)$(WWWGANGLIA)/conf.php.CSW
@rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in
@@ -189,14 +192,11 @@
> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW
@echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \
>> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW
-# @ginstall -D $(FILEDIR)/gmond.conf \
-# $(DESTDIR)$(ETCGANGLIA)/gmond.conf
@ginstall -D $(FILEDIR)/gmetad.conf \
- $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW
- @rm -rf $(DESTDIR)$(ETCGANGLIA)/gmetad.conf
+ $(DESTDIR)$(ETCGANGLIA)/gmetad.conf
@cd $(WORKSRC)/gmond/modules/conf.d; \
for CONF_FILE in *.conf ; \
- do cp -R "$${CONF_FILE}"
$(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done
+ do cp -R "$${CONF_FILE}"
$(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}" ; done
@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \
$(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW
ifeq ($(VERSION),3.1.2)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
