[git.ipfire.org] IPFire 2.x development tree branch, master, updated. abd5cc3cb758bc63b9c9d0a08812991fcfaf71b5

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2805 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  abd5cc3cb758bc63b9c9d0a08812991fcfaf71b5 (commit)
      from  c253116d250aedcb9e340dc68cc52086700c698c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit abd5cc3cb758bc63b9c9d0a08812991fcfaf71b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 8 14:05:57 2021 +0000

    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 <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 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

Difference in files:
diff --git a/lfs/collectd b/lfs/collectd
index 5e96ddbb3..36b507868 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 4663d9a99..000000000
--- 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];
- 	


hooks/post-receive
--
IPFire 2.x development tree