From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Jun 2021 14:10:22 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52c84741cf97a4fdb30da0e27509e7fd353f66c9;hp=f8b0610c53deb66797ab94ceae05fa3b9ed6aa9d;p=people%2Fmfischer%2Fipfire-2.x.git

Merge branch 'master' into next
---

diff --git a/config/rootfiles/core/158/filelists/python3-inotify b/config/rootfiles/core/158/filelists/python3-inotify
new file mode 120000
index 0000000000..d2515bcba0
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/python3-inotify
@@ -0,0 +1 @@
+../../../common/python3-inotify
\ No newline at end of file
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];
-