From abd5cc3cb758bc63b9c9d0a08812991fcfaf71b5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 8 Jun 2021 14:05:57 +0000 Subject: [PATCH] Revert "collectd: Use libstatgrab for reading disk stats" This reverts commit 86beff5f75a88cebe62f6d629cce3ae3768e231b. This patch breaks reading statistics on systems running a 4.14 kernel. It seems like it is not dependant on the kernel, though. Signed-off-by: Michael Tremer --- lfs/collectd | 1 - src/patches/collectd-4.10-disk-plugin-fields.patch | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 src/patches/collectd-4.10-disk-plugin-fields.patch diff --git a/lfs/collectd b/lfs/collectd index 5e96ddbb38..36b5078686 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -107,7 +107,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-disk-plugin-fields.patch cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/collectd-4.10-disk-plugin-fields.patch b/src/patches/collectd-4.10-disk-plugin-fields.patch deleted file mode 100644 index 4663d9a991..0000000000 --- a/src/patches/collectd-4.10-disk-plugin-fields.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/disk.c b/src/disk.c -index 4a78f1bd..c6f9e4bd 100644 ---- a/src/disk.c -+++ b/src/disk.c -@@ -428,7 +428,7 @@ static int disk_read (void) - IOObjectRelease (disk_list); - /* #endif HAVE_IOKIT_IOKITLIB_H */ - --#elif KERNEL_LINUX -+#elif 0 - FILE *fh; - char buffer[1024]; - -- 2.39.2