Title: [opsview-base] [38] VERSION comes from above, and corrected a typo.
- Revision
- 38
- Author
- pknight
- Date
- 2012-09-07 17:22:41 +0100 (Fri, 07 Sep 2012)
Log Message
VERSION comes from above, and corrected a typo.
Modified Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-09-07 16:03:06 UTC (rev 37)
+++ trunk/Makefile 2012-09-07 16:22:41 UTC (rev 38)
@@ -141,9 +141,6 @@
# If CUSTOMER is set, will check for customer patches
CUSTOMER =
-OPSVIEW_BUILD := $(shell grep '^build: ' /usr/local/opsview-web/opsview_web.yml)
-OPSVIEW_BUILD := $(subst build: ,,$(OPSVIEW_BUILD))
-
OS_DISTRIBUTION := $(shell lsb_release -d)
OS_DISTRIBUTION := $(subst Description:,,$(OS_DISTRIBUTION))
OS_DISTRIBUTION := $(subst Distributor ID:,,$(OS_DISTRIBUTION)) # Solaris' format
@@ -589,7 +586,7 @@
${NRPE}: OS_DISTRIBUTION := $(subst ;, ,$(OS_DISTRIBUTION))
${NRPE}:
gunzip -c ${NRPE}.tar.gz | tar -xf -
- echo '#define OPSVIEW_VERSION_INFO "(OpsviewAgent $(OPSVIEW_BUILD); osname=$(KERNEL_NAME); osvers=$(KERNEL_RELEASE); desc=$(OS_DISTRIBUTION)")' >> ${NRPE}/include/common.h
+ echo '#define OPSVIEW_VERSION_INFO "(OpsviewAgent $(VERSION); osname=$(KERNEL_NAME); osvers=$(KERNEL_RELEASE); desc=$(OS_DISTRIBUTION))"' >> ${NRPE}/include/common.h
cd ${NRPE} && patch -p1 < ../patches/nrpe_solaris_log_facilities.patch
cd ${NRPE} && patch -p1 < ../patches/nrpe_multiline.patch
cd ${NRPE} && patch -p1 < ../patches/nrpe_remove_double_quotes_as_nasty.patch
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
