control, rules: Limit the LVM plugin to Linux.

diff --git a/debian/changelog b/debian/changelog
index 2facd482e4bc6a2f44dcc325285e60fee32e83f0..d489354f27e2bca996a0752bfb96a3b44c05c2b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,7 @@ collectd (5.4.0-1) UNRELEASED; urgency=low
     - Depend on libmnl-dev and enable the netlink plugin on all architectures
       (upstream removed the dependency on the netlink library which is only
       available as a static non-PIC library on Debian) (Closes: #531352).
-  * debian/control:
-    - Depend on liblvm2-dev (required by the new LVM plugin).
+    - Depend on liblvm2-dev and enable the LVM plugin on Linux.
   * debian/rules:
     - Disable the aquaero plugin which requires libaquaero5.
     - Disable the cgroups plugin on non-Linux.

diff --git a/debian/control b/debian/control
index cde3c76330dbd4595b001efdff85598f5a996683..0acf4320a121607b2d151d67d2f0f370b127033d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  libglib2.0-dev,
  libhal-dev,
  libkvm-dev [kfreebsd-any],
- liblvm2-dev,
+ liblvm2-dev [linux-any],
  libmemcached-dev,
  libmodbus-dev,
  libmnl-dev,

diff --git a/debian/rules b/debian/rules
index 64c66adf6ae8b8ca3a65c7d43bedcc7e7d83628c..0d6969907d9d362ec0493a58e2de86d22cec3ea1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,7 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-ethstat \
                --disable-iptables \
                --disable-ipvs \
+               --disable-lvm \
                --disable-madwifi \
                --disable-md \
                --disable-netlink \