From 365fe7bc5e057d39ea3f1020eceea04f1d70d073 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 21 Oct 2017 13:19:56 +0200 Subject: [PATCH] Disable the sigrok plugin for now. It's not compatible with libsigrok4. Closes: #878348 --- debian/changelog | 7 +++++++ debian/control | 2 -- debian/rules | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35424d7..fdb6348 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +collectd (5.7.2-2) UNRELEASED; urgency=medium + + * Disable the sigrok plugin for now; it's not compatible with libsigrok4 + (Closes: #878348). + + -- Sebastian Harl Sat, 21 Oct 2017 13:18:27 +0200 + collectd (5.7.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 1ecaef2..f5d728a 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,6 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh libriemann-client-dev (>= 1.6.0), librrd-dev (>= 1.4~), libsensors4-dev [linux-any], - libsigrok-dev (>= 0.2~) [linux-any], # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~)) libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev, libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~), @@ -188,7 +187,6 @@ Description: statistics collection and monitoring daemon (core system) * serial port traffic: serial * values from SNMP enabled network devices: snmp * aggregate values received with the StatsD protocol: statsd - * sigrok-supported device measurements: sigrok * SMART statistics: smart * swap usage: swap * logging to syslog: syslog diff --git a/debian/rules b/debian/rules index b3325ec..e4df1c8 100755 --- a/debian/rules +++ b/debian/rules @@ -91,6 +91,10 @@ confflags += --disable-grpc # libqpos is required for the intel_rdt plugin. confflags += --disable-intel_rdt +# libsigrok4 incompatible with the plugin. +# Cf. https://github.com/collectd/collectd/issues/1574 +confflags += --disable-sigrok + # These plugins are Linux-specific. ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) confflags += \ @@ -111,10 +115,6 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) --disable-numa \ --disable-sensors \ --disable-vserver - # libsigrok >= 0.2.0 is required for the sigrok plugin, - # only available on Linux. - confflags += \ - --disable-sigrok endif # This plugin is FreeBSD-specific. -- 2.30.2