webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Tremer
2021-06-08 14:10:22 +00:00
parent f8b0610c53 abd5cc3cb7
commit 52c84741cf
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/158/filelists/python3-inotify Symbolic link
View File

@@ -0,0 +1 @@
../../../common/python3-inotify

1
lfs/collectd
View File

@@ -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.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 -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.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) && autoupdate -v configure.in
cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi

13
src/patches/collectd-4.10-disk-plugin-fields.patch
View File

@@ -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];