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

wrightru at users.sourceforge.net wrightru at users.sourceforge.net
Wed Mar 17 17:55:43 CET 2010 

Revision: 9232
          http://gar.svn.sourceforge.net/gar/?rev=9232&view=rev
Author:   wrightru
Date:     2010-03-17 16:55:43 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
Merge 3.1.7 branch into trunk

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/ganglia/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/ganglia/trunk/


Property changes on: csw/mgar/pkg/ganglia/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc:6266-6330
/csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc:6331-6977
/csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc:6978-8434
/csw/mgar/pkg/ganglia/branches/ganglia-3.1.7:8435-9231

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2010-03-17 15:36:14 UTC (rev 9231)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2010-03-17 16:55:43 UTC (rev 9232)
@@ -1,5 +1,5 @@
 GARNAME = ganglia
-GARVERSION = 3.1.2
+GARVERSION = 3.1.7
 CATEGORIES = utils
 
 # How should we set this?
@@ -24,7 +24,7 @@
 DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove
 DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad
 
-PACKAGES = CSWgangliaagent CSWgangliart CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython
+PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython
 
 CATALOGNAME_CSWganglia		= ganglia
 CATALOGNAME_CSWgangliart	= ganglia_rt
@@ -42,16 +42,18 @@
 SPKG_DESC_CSWgangliagmetad	= Ganglia gmetad
 SPKG_DESC_CSWgangliaweb		= Ganglia web
 
-BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd
+BUILD_DEP_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre
 
 RUNTIME_DEP_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt
+RUNTIME_DEP_PKGS_CSWgangliart += CSWpcrert
 RUNTIME_DEP_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt
-RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart
+RUNTIME_DEP_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert
 RUNTIME_DEP_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart
 RUNTIME_DEP_PKGS_CSWgangliamodpython += CSWgangliaagent
 RUNTIME_DEP_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt
 RUNTIME_DEP_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt
 RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd
+RUNTIME_DEP_PKGS_CSWgangliagmetad += CSWpcrert
 RUNTIME_DEP_PKGS_CSWgangliaweb = CSWgangliagmetad 
 RUNTIME_DEP_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd
 
@@ -64,6 +66,10 @@
 #   http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77
 #PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch
 
+# Uncomment this if we want to build both 32 bit and 64 bit binaries
+# By default, only 32 bit binaries are built
+#BUILD64 = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Don't build gmetad (not tested yet on Solaris, more deps required to build)
@@ -84,22 +90,35 @@
 # TODO: define a CSWgangliamodpython package
 # Depends: some issues exist getting the Python support working on Solaris,
 # Ganglia's configure.in needs to be further enhanced for this to work
-CONFIGURE_ARGS += --without-python
+CONFIGURE_ARGS += --disable-python
 #CONFIGURE_ARGS += --with-python=/opt/csw
 
 # For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris,
 # so we skip it.  This should be re-assessed with each new release
 # from upstream.  Proposed fixes for the test suite to be submitted
 # upstream.
-ifeq ($(GARVERSION),3.1.2)
+ifeq ($(GARVERSION),3.1.3)
 TEST_SCRIPTS = 
 endif
+ifeq ($(GARVERSION),3.1.4)
+TEST_SCRIPTS =
+endif
+ifeq ($(GARVERSION),3.1.5)
+TEST_SCRIPTS =
+endif
+ifeq ($(GARVERSION),3.1.6)
+TEST_SCRIPTS =
+endif
+ifeq ($(GARVERSION),3.1.7)
+TEST_SCRIPTS =
+endif
 
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom
 
 WWWROOT = /opt/csw/share/www
 WWWGANGLIA = $(WWWROOT)/ganglia
-ETCGANGLIA = /etc/opt/csw/ganglia
+sysconfdir = /etc/opt/csw/ganglia
+ETCGANGLIA = $(sysconfdir)
 
 PKGFILES_CSWganglia = 
 PKGFILES_CSWgangliart = $(libdir)/libganglia.*
@@ -109,6 +128,11 @@
 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/conf.d/modgstatus.conf.CSW
+PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW
+PRESERVECONF += $(WWWGANGLIA)/conf.php
 
 # For gmond
 INITSMF = /etc/opt/csw/init.d/cswgmond
@@ -134,25 +158,26 @@
 	@cd $(WORKSRC)/web; \
 		cp -R * $(DESTDIR)$(WWWGANGLIA)
 	@ginstall -D $(FILEDIR)/conf.php \
-		$(DESTDIR)$(WWWGANGLIA)/conf.php
+		$(DESTDIR)$(WWWGANGLIA)/conf.php.CSW
 	@rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in
 	@ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \
 		$(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
 	@ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d
 	@$(WORKSRC)/gmond/gmond -t | grep -v "^include" \
-		> $(DESTDIR)$(ETCGANGLIA)/gmond.conf
+		> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW
 	@echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \
-		>> $(DESTDIR)$(ETCGANGLIA)/gmond.conf
+		>> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW
 #	@ginstall -D $(FILEDIR)/gmond.conf \
 #		$(DESTDIR)$(ETCGANGLIA)/gmond.conf
 	@ginstall -D $(FILEDIR)/gmetad.conf \
-		$(DESTDIR)$(ETCGANGLIA)/gmetad.conf
+		$(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW
 	@cd $(WORKSRC)/gmond/modules/conf.d; \
-		cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d
-	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \
-		$(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf
+		for CONF_FILE in *.conf ; \
+		do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done
+	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \
+		$(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW
 ifeq ($(GARVERSION),3.1.2)
-	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf
+	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW
 endif
 	@ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds
 	

Modified: csw/mgar/pkg/ganglia/trunk/checksums
===================================================================
--- csw/mgar/pkg/ganglia/trunk/checksums	2010-03-17 15:36:14 UTC (rev 9231)
+++ csw/mgar/pkg/ganglia/trunk/checksums	2010-03-17 16:55:43 UTC (rev 9232)
@@ -1,6 +1,6 @@
-f3436682e339279357aa98473a9f2b8a  download/CSWgangliaweb.postinstall
-c4c333a46db391464e372ad8ede4993c  download/CSWgangliaweb.preremove
-25d302948e25837bf17757d5e23e4955  download/cswgmetad
-c6bb96c949dbb989d06ebb36b6af885d  download/cswgmond
-aaba09a6fa897ed581789f679f7ca62d  download/ganglia-3.1.2.tar.gz
-2ff504ecb546aca2cdd6ee09af9a417e  download/httpd-ganglia.conf.CSW
+f3436682e339279357aa98473a9f2b8a  CSWgangliaweb.postinstall
+c4c333a46db391464e372ad8ede4993c  CSWgangliaweb.preremove
+25d302948e25837bf17757d5e23e4955  cswgmetad
+c6bb96c949dbb989d06ebb36b6af885d  cswgmond
+6aa5e2109c2cc8007a6def0799cf1b4c  ganglia-3.1.7.tar.gz
+2ff504ecb546aca2cdd6ee09af9a417e  httpd-ganglia.conf.CSW


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list