package/inotify-tools: bump to version 4.25.9.0
PATCH 1/1 package/inotify-tools: bump to version 4.25.9.0
- Fix crash on >=1024 watched files
- Add recursive watch with --include
- Add static compilation flag
- Fix fanotify-only options when disabled
- Fix man page reference formatting
--- DEVELOPERS | 1 + package/inotify-tools/inotify-tools.hash | 2 +- package/inotify-tools/inotify-tools.mk | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-)
DEVELOPERS +1 -0
@@ -3062,6 +3062,7 @@ F: package/wolfssl/ N: Shubham Chakraborty <[email protected]> F: package/ccache/ F: package/hyperfine/ +F: package/inotify-tools/ N: Simon Dawson <[email protected]> F: boot/at91bootstrap3/
package/inotify-tools/inotify-tools.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 c5b018567814ea555d716f518b6e3ae243c733f7bd3e8585d81748a6da286f3c inotify-tools-3.20.2.2.tar.gz +sha256 d33a4fd24c72c2d08893f129d724adf725b93dae96c359e4f4e9f32573cc853b inotify-tools-4.25.9.0.tar.gz sha256 e41fc126320a79ed53b5aa3386f059f7d10770856d6fd714ab80a96ce6bd09d6 COPYING
package/inotify-tools/inotify-tools.mk +3 -2
@@ -4,10 +4,11 @@ # ################################################################################ -INOTIFY_TOOLS_VERSION = 3.20.2.2 -INOTIFY_TOOLS_SITE = https://github.com/inotify-tools/inotify-tools/releases/download/$(INOTIFY_TOOLS_VERSION) +INOTIFY_TOOLS_VERSION = 4.25.9.0 +INOTIFY_TOOLS_SITE = $(call github,inotify-tools,inotify-tools,$(INOTIFY_TOOLS_VERSION)) INOTIFY_TOOLS_LICENSE = GPL-2.0+ INOTIFY_TOOLS_LICENSE_FILES = COPYING INOTIFY_TOOLS_INSTALL_STAGING = YES +INOTIFY_TOOLS_AUTORECONF = YES $(eval $(autotools-package))
Signature · 6 lines
2.53.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Shubham,
Thanks for the patch.
Quoted 8 lines · Shubham Chakraborty
- Fix crash on >=1024 watched files
- Add recursive watch with --include
- Add static compilation flag
- Fix fanotify-only options when disabled
- Fix man page reference formattingSigned-off-by Shubham Chakraborty <[email protected]>---
[...]
package/inotify-tools/inotify-tools.mk line 9
Quoted 13 lines
package/inotify-tools/inotify-tools.mk +1
-2@@ -4,10 +4,11 @@ # ################################################################################ -INOTIFY_TOOLS_VERSION = 3.20.2.2 -INOTIFY_TOOLS_SITE = https://github.com/inotify-tools/inotify-tools/releases/download/$(INOTIFY_TOOLS_VERSION) +INOTIFY_TOOLS_VERSION = 4.25.9.0
This new version is introducing build failures. See:
https://gitlab.com/jolivain/buildroot/-/pipelines/2478551252
For reference, the previous version is fine:
https://gitlab.com/jolivain/buildroot/-/pipelines/2478553249
You can reproduce with the command:
utils/test-pkg -a -p inotify-tools
Could you have a look please?
Quoted 10 lines
package/inotify-tools/inotify-tools.mk +2
-1+INOTIFY_TOOLS_SITE = $(call github,inotify-tools,inotify-tools,$(INOTIFY_TOOLS_VERSION)) INOTIFY_TOOLS_LICENSE = GPL-2.0+ INOTIFY_TOOLS_LICENSE_FILES = COPYING INOTIFY_TOOLS_INSTALL_STAGING = YES +INOTIFY_TOOLS_AUTORECONF = YES $(eval $(autotools-package)) --2.53.0
Best regards,
Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/1 package/inotify-tools: bump to version 4.25.9.0
In reply to Shubham Chakraborty- Fix crash on >=1024 watched files
- Add recursive watch with --include
- Add static compilation flag
- Fix fanotify-only options when disabled
- Fix man page reference formatting
- Add C++ toolchain dependency (new requirement)
- Add patch to fix fanotify header conflicts with uClibc
--- .../0001-fix-fanotify-header-conflict.patch | 83 +++++++++++++++++++ package/inotify-tools/Config.in | 5 ++ 2 files changed, 88 insertions(+) create mode 100644 package/inotify-tools/0001-fix-fanotify-header-conflict.patch
package/inotify-tools/0001-fix-fanotify-header-conflict.patch new file +83 -0
@@ -0,0 +1,83 @@ +From f59f9fefb26342c35c2874e83299d5b69bbc6ffb Mon Sep 17 00:00:00 2001 +From: Shubham Chakraborty <[email protected]> +Date: Wed, 29 Apr 2026 01:40:39 +0530 +Subject: [PATCH] libinotifytools: fix fanotify fallback with uClibc + +uClibc provides sys/fanotify.h, but it lacks the newer FAN_REPORT_* +declarations and related event info types needed by inotify-tools 4.25.9.0. + +The configure test therefore selects the fallback header path. + +That fallback previously included the bundled linux/fanotify.h copy before +sys/fanotify.h, which led to duplicate struct definitions on uClibc. + +Fix it by building the fallback on top of sys/fanotify.h and only defining +the missing declarations actually used by inotify-tools. +--- + .../src/inotifytools/fanotify.h.in | 45 +++++++++++++++++-- + 1 file changed, 41 insertions(+), 4 deletions(-) + +diff --git a/libinotifytools/src/inotifytools/fanotify.h.in b/libinotifytools/src/inotifytools/fanotify.h.in +index 9fcbe26..c30bb73 100644 +--- a/libinotifytools/src/inotifytools/fanotify.h.in ++++ b/libinotifytools/src/inotifytools/fanotify.h.in +@@ -10,15 +10,52 @@ + #elif !defined __ANDROID__ + /* + * Assuming sys/fanotify.h does exist, but linux/fanotify.h doesn't have +- * FAN_REPORT_DFID_NAME, so include our own copy of linux/fanotify.h +- * before including sys/fanotify.h. ++ * FAN_REPORT_DFID_NAME, so extend the libc header with the newer ++ * fanotify declarations required by inotify-tools. + */ +-#include "fanotify-dfid-name.h" + #include <sys/fanotify.h> ++#include <linux/types.h> ++ ++#ifndef FAN_MARK_FILESYSTEM ++#define FAN_MARK_FILESYSTEM 0x00000100 ++#endif ++#ifndef FAN_MARK_INODE ++#define FAN_MARK_INODE 0x00000000 ++#endif ++#ifndef FAN_REPORT_FID ++#define FAN_REPORT_FID 0x00000200 ++#endif ++#ifndef FAN_REPORT_DIR_FID ++#define FAN_REPORT_DIR_FID 0x00000400 ++#endif ++#ifndef FAN_REPORT_NAME ++#define FAN_REPORT_NAME 0x00000800 ++#endif ++#ifndef FAN_REPORT_DFID_NAME ++#define FAN_REPORT_DFID_NAME (FAN_REPORT_DIR_FID | FAN_REPORT_NAME) ++#endif ++#ifndef FAN_EVENT_INFO_TYPE_FID ++#define FAN_EVENT_INFO_TYPE_FID 1 ++struct fanotify_event_info_header { ++ __u8 info_type; ++ __u8 pad; ++ __u16 len; ++}; ++struct fanotify_event_info_fid { ++ struct fanotify_event_info_header hdr; ++ __kernel_fsid_t fsid; ++ unsigned char handle[]; ++}; ++#endif ++#ifndef FAN_EVENT_INFO_TYPE_DFID_NAME ++#define FAN_EVENT_INFO_TYPE_DFID_NAME 2 ++#endif ++#ifndef FAN_EVENT_INFO_TYPE_DFID ++#define FAN_EVENT_INFO_TYPE_DFID 3 ++#endif + #else + #include <linux/fanotify.h> + #endif // SYS_FANOTIFY_H_EXISTS_AND_WORKS + + + #endif +- +-- +2.54.0 +
package/inotify-tools/Config.in +5 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_INOTIFY_TOOLS bool "inotify-tools" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() help inotify-tools is a C library and a set of command-line
@@ -9,3 +10,7 @@ config BR2_PACKAGE_INOTIFY_TOOLS 'inotifywatch' binaries. https://github.com/inotify-tools/inotify-tools + +comment "inotify-tools needs a toolchain w/ C++" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP
Signature · 6 lines
2.54.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot