From 1226978625975351620982de1bce6586c8bf7184 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Thu, 5 Jan 2017 21:54:13 +0100 Subject: [PATCH] disable building dpdkstat plugin on wheezy --- debian/changelog | 2 ++ debian/control | 1 - debian/rules | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8645876..be5ddf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ collectd (5.7.0-3~bpo7+1) UNRELEASED; urgency=high - Revert mysql-related package names back to libmysqlclient-dev and mysql-server. - Set lua plugin build-dependency to version available in wheezy. + - Disable dpdkstat plugin, which build dependencies aren't available in + wheezy. -- Marc Fournier Thu, 05 Jan 2017 22:24:38 +0100 diff --git a/debian/control b/debian/control index 1433381..2a82c63 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libdevstat-dev [kfreebsd-any], libdbi0-dev, - libdpdk-dev [amd64 i386], libesmtp-dev, libganglia1-dev (>= 3) [linux-any], libgeom-dev [kfreebsd-any], diff --git a/debian/rules b/debian/rules index 779f5a7..463f2a9 100755 --- a/debian/rules +++ b/debian/rules @@ -100,6 +100,9 @@ confflags += --disable-grpc # libqpos is required for the intel_rdt plugin. confflags += --disable-intel_rdt +# libdpdk is required for the dpdkstat plugin. +confflags += --disable-dpdkstat + # These plugins are Linux-specific. ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) confflags += \ @@ -170,7 +173,6 @@ endif # These plugins are Intel-hardware specific. ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH))) confflags += \ - --disable-dpdkstat \ --disable-turbostat endif -- 2.30.2