From b79e12234c35d39e3973052494e3503929b728f7 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 11 Jan 2010 18:49:48 +0100 Subject: [PATCH] rules, control, collectd.conf: Disabled java plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … and removed build-dependency on openjdk-6-jdk, which is not available on Etch. --- debian/changelog | 4 +++- debian/collectd-core.install | 1 - debian/collectd.conf | 11 ----------- debian/control | 5 +---- debian/rules | 24 +++--------------------- 5 files changed, 7 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a3476d..6a7777c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,10 @@ collectd (4.8.2-1~bpo40+1) etch-backports; urgency=low libmemcached-dev, which is not available on Etch. - Disabled curl_json plugin and removed build-dependency on libyajl-dev, which is not available on Etch. + - Disabled java plugin and removed build-dependency on openjdk-6-jdk, + which is not available on Etch. - -- Sebastian Harl Mon, 11 Jan 2010 18:42:25 +0100 + -- Sebastian Harl Mon, 11 Jan 2010 18:49:24 +0100 collectd (4.8.2-1) unstable; urgency=medium diff --git a/debian/collectd-core.install b/debian/collectd-core.install index 11acfc4..4caba94 100644 --- a/debian/collectd-core.install +++ b/debian/collectd-core.install @@ -10,7 +10,6 @@ usr/share/man/man3/Collectd::Unixsock.3pm usr/share/man/man5/collectd-unixsock.5 usr/share/man/man5/collectd-email.5 usr/share/man/man5/collectd-exec.5 -usr/share/man/man5/collectd-java.5 usr/share/man/man5/collectd.conf.5 usr/share/man/man5/collectd-snmp.5 usr/share/man/man5/collectd-perl.5 diff --git a/debian/collectd.conf b/debian/collectd.conf index cde32ee..cbbfa34 100644 --- a/debian/collectd.conf +++ b/debian/collectd.conf @@ -51,7 +51,6 @@ LoadPlugin interface #LoadPlugin iptables #LoadPlugin ipvs LoadPlugin irq -#LoadPlugin java #LoadPlugin libvirt LoadPlugin load #LoadPlugin madwifi @@ -244,16 +243,6 @@ LoadPlugin users # IgnoreSelected true # -# -# JVMArg "-verbose:jni" -# -# LoadPlugin "org.collectd.java.GenericJMX" -# -# # See /usr/share/doc/collectd/examples/GenericJMX.conf -# # for an example config. -# -# - # # Connection "xen:///" # RefreshInterval 60 diff --git a/debian/control b/debian/control index 8739865..50a7c3f 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,7 @@ Build-Depends: debhelper (>= 5), po-debconf, dpatch, libvirt-dev (>= 0.4.0-6), libxml2-dev, linux-kernel-headers, - nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel], - openjdk-6-jdk [!hppa] + nut-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel] Build-Conflicts: libpthread-dev, iptables-dev Standards-Version: 3.8.3 Homepage: http://collectd.org/ @@ -81,14 +80,12 @@ Description: statistics collection and monitoring daemon (core system) * execution of external programs: exec * count the number of files in directories: filecount * Linux file-system based caching framework statistics: fscache - * query data from Java processes using JMX: GenericJMX (Java based plugin) * harddisk temperature: hddtemp * network traffic: interface * IPMI sensors information: ipmi * iptables statistics: iptables * IPVS connection statistics: ipvs * IRQ counters: irq - * embedded Java Virtual Machine: java * CPU, disk, network statistics of guest systems: libvirt * system load averages: load * logging to files, STDOUT and STDERR: logfile diff --git a/debian/rules b/debian/rules index afb266a..3ee236a 100755 --- a/debian/rules +++ b/debian/rules @@ -32,19 +32,6 @@ else CFLAGS += -O2 endif -# The archdir map has been copied from openjdk-6's debian/rules. -JAVA_ARCHDIR_MAP = alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc \ - i386=i386 lpia=i386 m68k=m68k mips=mips mipsel=mipsel \ - powerpc=ppc sparc=sparc s390=s390 ia64=ia64 -JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \ - $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP)))) -JAVA_HOME = /usr/lib/jvm/java-6-openjdk -JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server - -JAVAC = $(JAVA_HOME)/bin/javac -JAVA_CPPFLAGS = -I$(JAVA_HOME)/include -JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR) - include /usr/share/dpatch/dpatch.make confflags = --host=$(DEB_HOST_GNU_TYPE) \ @@ -66,6 +53,9 @@ confflags += --disable-curl_json # libganglia >= 3 is required for the gmond plugin. confflags += --disable-gmond +# OpenJDK is not available on Etch. +confflags += --disable-java + # libmemcached is required for the memcachec plugin. confflags += --disable-memcachec @@ -97,12 +87,6 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel)) confflags += --disable-netlink --disable-nut endif -# The hppa buildds currently do not keep up with Java related stuff, thus -# prevending testing transitions. -ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa)) - confflags += --disable-java -endif - config.status: configure $(DPATCH_STAMPFN) dh_testdir @@ -114,8 +98,6 @@ config.status: configure $(DPATCH_STAMPFN) PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \ ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \ - JAVAC="$(JAVAC)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \ - JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \ || ( status=$$?; cat config.log; exit $$status ) build: build-stamp -- 2.30.2