tags 968950 + patch thanks On Mon, 24 Aug 2020 09:50:21 -0400 Joseph Nahmias <j...@nahmias.net> wrote: > Package: collectd-dev > Version: 5.11.0-7~bpo10+1 > Severity: important > > Hello, > > Thanks for backporting collectd 5.11 to buster! When compiling my own > collectd plugin, I hit an error because plugin.h includes meta_data.h, but > the latter is not provided by the collectd-dev package. IIUC, it should be > a simple fix to debian/collectd-dev.install to make sure this file gets > included in the package.
Attached a tested patch to include the missing header files. -- Benjamin Drung Senior DevOps Engineer and Debian & Ubuntu Developer Compute Platform Operations 1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Deutschland E-Mail: benjamin.dr...@ionos.com | Web: www.ionos.de Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498 Vorstand: Hüseyin Dogan, Dr. Martin Endreß, Claudia Frese, Henning Kettler, Arthur Mai, Matthias Steinberg, Achim Weiß Aufsichtsratsvorsitzender: Markus Kadelke Member of United Internet
From ff6f0b1fd50ce00eae066ce8273b46a731ff6e85 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <benjamin.dr...@ionos.com> Date: Fri, 14 May 2021 11:55:33 +0200 Subject: [PATCH] collectd-dev: Add all header files from src/utils `/usr/include/collectd/core/daemon/plugin.h` includes `utils/metadata/meta_data.h` and therefore this file needs to be included in collectd-dev as well. Add all headers files from `src/utils` because previous version had those headers include (before they were moved into this subdirectory). Closes: #968950 Signed-off-by: Benjamin Drung <benjamin.dr...@ionos.com> --- debian/collectd-dev.install | 32 +++++++++++++++++++++++++++++++- debian/rules | 7 +++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install index a3dd678..a6492e9 100644 --- a/debian/collectd-dev.install +++ b/debian/collectd-dev.install @@ -1,4 +1,34 @@ src/liboconfig/oconfig.h usr/include/collectd/liboconfig src/*.h usr/include/collectd/core src/daemon/*.h usr/include/collectd/core/daemon - +src/utils/avltree/avltree.h usr/include/collectd/core/utils/avltree +src/utils/cmds/*.h usr/include/collectd/core/utils/cmds +src/utils/common/common.h usr/include/collectd/core/utils/common +src/utils/config_cores/config_cores.h usr/include/collectd/core/utils/config_cores +src/utils/crc32/crc32.h usr/include/collectd/core/utils/crc32 +src/utils/curl_stats/curl_stats.h usr/include/collectd/core/utils/curl_stats +src/utils/db_query/db_query.h usr/include/collectd/core/utils/db_query +src/utils/deq/deq.h usr/include/collectd/core/utils/deq +src/utils/dmi/dmi.h usr/include/collectd/core/utils/dmi +src/utils/dns/dns.h usr/include/collectd/core/utils/dns +src/utils/dpdk/dpdk.h usr/include/collectd/core/utils/dpdk +src/utils/format_graphite/format_graphite.h usr/include/collectd/core/utils/format_graphite +src/utils/format_json/format_json.h usr/include/collectd/core/utils/format_json +src/utils/format_kairosdb/format_kairosdb.h usr/include/collectd/core/utils/format_kairosdb +src/utils/format_stackdriver/format_stackdriver.h usr/include/collectd/core/utils/format_stackdriver +src/utils/gce/gce.h usr/include/collectd/core/utils/gce +src/utils/heap/heap.h usr/include/collectd/core/utils/heap +src/utils/ignorelist/ignorelist.h usr/include/collectd/core/utils/ignorelist +src/utils/latency/latency_config.h usr/include/collectd/core/utils/latency +src/utils/latency/latency.h usr/include/collectd/core/utils/latency +src/utils/lookup/vl_lookup.h usr/include/collectd/core/utils/lookup +src/utils/match/match.h usr/include/collectd/core/utils/match +src/utils/message_parser/message_parser.h usr/include/collectd/core/utils/message_parser +src/utils/metadata/meta_data.h usr/include/collectd/core/utils/metadata +src/utils/mount/mount.h usr/include/collectd/core/utils/mount +src/utils/oauth/oauth.h usr/include/collectd/core/utils/oauth +src/utils/ovs/ovs.h usr/include/collectd/core/utils/ovs +src/utils/proc_pids/proc_pids.h usr/include/collectd/core/utils/proc_pids +src/utils/rrdcreate/rrdcreate.h usr/include/collectd/core/utils/rrdcreate +src/utils/tail/tail.h usr/include/collectd/core/utils/tail +src/utils/taskstats/taskstats.h usr/include/collectd/core/utils/taskstats diff --git a/debian/rules b/debian/rules index 5cf4804..e57341f 100755 --- a/debian/rules +++ b/debian/rules @@ -280,12 +280,11 @@ install-indep: # update include path for collectd header files ( set -e; \ cd $(CURDIR)/debian/collectd-dev/usr/include/collectd/; \ - for lib in $$(find . -type f -name '*.h'); do \ + headers=$$(find . -type f -name '*.h'); \ + for lib in $$headers; do \ libname=$$(basename $$lib); \ fullpath=$$(echo $$lib | sed -r -e 's,^\./,collectd/,'); \ - for dir in $$(find . -mindepth 1 -type d); do \ - sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$dir/*.h; \ - done; \ + sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$headers; \ done ) install-arch: build -- 2.27.0
