Disable the lvm plugin

diff --git a/debian/changelog b/debian/changelog
index 8800d754af3cdeee00ac4e0cd6e81191347fd7ca..b6943d2e2223ff5047a289e6d17cd6d887c4cd85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium
   * Enable the grpc plugin, libgrpc++ is now available.
   * Enable the intel_rdt plugin, libpqos is now available.
   * Re-enable the varnish plugin, support for varnish 5.2 now implemented.
   * Enable the grpc plugin, libgrpc++ is now available.
   * Enable the intel_rdt plugin, libpqos is now available.
   * Re-enable the varnish plugin, support for varnish 5.2 now implemented.

+  * Disable the lvm plugin, liblvm2app being deprecated. (Closes: #881641)

   * debian/patches:
     - Added i2c_detection.patch; needed to build against libi2c-4.0. Thanks to
       Christian Ehrhardt fo reporting this problem and Andreas Hasenack for
   * debian/patches:
     - Added i2c_detection.patch; needed to build against libi2c-4.0. Thanks to
       Christian Ehrhardt fo reporting this problem and Andreas Hasenack for

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 16a9d368bf68939b07fbde40bc79b4b8c47ebd36..17be92dd9a660d2d41c8ddaf4cf14b29fd70d249 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -133,7 +133,6 @@ LoadPlugin irq
 #LoadPlugin java
 LoadPlugin load
 #LoadPlugin lua
 #LoadPlugin java
 LoadPlugin load
 #LoadPlugin lua

-#LoadPlugin lvm

 #LoadPlugin madwifi
 #LoadPlugin mbmon
 #LoadPlugin md
 #LoadPlugin madwifi
 #LoadPlugin mbmon
 #LoadPlugin md

diff --git a/debian/control b/debian/control
index cbcda5901442766f7cd016d1f3359e6c1a545dba..2478ba9b9b24040274403d776924d0b675399fa5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libkvm-dev [kfreebsd-any],
  libldap2-dev,
  liblua5.3-dev,
  libkvm-dev [kfreebsd-any],
  libldap2-dev,
  liblua5.3-dev,

- liblvm2-dev [linux-any],

  libmemcached-dev,
  libmicrohttpd-dev,
  libmodbus-dev,
  libmemcached-dev,
  libmicrohttpd-dev,
  libmodbus-dev,


@@ -154,7 +153,6 @@ Description: statistics collection and monitoring daemon (core system)
    * logging to files, STDOUT and STDERR: logfile
    * logging in logstash's JSON event format: log_logstash
    * embedded Lua interpreter: lua
    * logging to files, STDOUT and STDERR: logfile
    * logging in logstash's JSON event format: log_logstash
    * embedded Lua interpreter: lua

-   * Logical Volume Manager usage: lvm

    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
    * query and parse data from a memcache daemon: memcachec
    * Atheros wireless LAN chipset statistics: madwifi
    * motherboard monitor: mbmon
    * query and parse data from a memcache daemon: memcachec

diff --git a/debian/rules b/debian/rules
index 1e06f00ff1529ff5432f0a85fd7296df1bdfa766..0ec86d41ff6eb6e863d88f292322d3c1c6709d1e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,10 @@ confflags += --disable-xmms
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok
 
 # Cf. https://github.com/collectd/collectd/issues/1574
 confflags += --disable-sigrok
 

+# liblvm2app is deprecated.
+# https://github.com/collectd/collectd/issues/2647
+confflags += --disable-lvm
+

 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \


@@ -99,7 +103,6 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-ipc \
                --disable-iptables \
                --disable-ipvs \
                --disable-ipc \
                --disable-iptables \
                --disable-ipvs \

-               --disable-lvm \

                --disable-madwifi \
                --disable-md \
                --disable-netlink \
                --disable-madwifi \
                --disable-md \
                --disable-netlink \