summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch28
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch40
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch119
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb (renamed from meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb)5
4 files changed, 1 insertions, 191 deletions
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
deleted file mode 100644
index 3b195aae4f..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 20 Dec 2022 10:46:50 -0800
4Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro
5
6This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit
7and we do not need to define lfs64 functions
8
9Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index bddf14d..b89a266 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -17,6 +17,9 @@ AC_PROG_CC
20 AM_INIT_AUTOMAKE
21 LT_INIT
22
23+# Add option for largefile support
24+AC_SYS_LARGEFILE
25+
26 AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN)
27
28 AC_ARG_ENABLE(doxygen,
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
deleted file mode 100644
index 931244830c..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 16 Dec 2021 14:57:55 -0800
4Subject: [PATCH 2/2] libinotifytools: Bridge differences between
5 musl/glibc/kernel fnotify.h
6
7System detects to use sys/fnotify.h and then assumes glibc's definitions
8but musl has definitions of its own. perhaps portable thing would be to
9use linux/fnotify.h interface directly on linux irrespective of libc
10
11See the differences discussion here [1]
12
13[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba
14
15Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 libinotifytools/src/inotifytools.c | 6 ++++++
19 1 file changed, 6 insertions(+)
20
21diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
22index 902eac2..2b96395 100644
23--- a/libinotifytools/src/inotifytools.c
24+++ b/libinotifytools/src/inotifytools.c
25@@ -55,6 +55,12 @@ struct fanotify_event_fid {
26 struct fanotify_event_info_fid info;
27 struct file_handle handle;
28 };
29+
30+#ifndef __GLIBC__
31+#define val __val
32+#define __kernel_fsid_t fsid_t
33+#endif
34+
35 #endif
36
37 /**
38--
392.34.1
40
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
deleted file mode 100644
index c0784ecc73..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 20 Dec 2022 10:48:10 -0800
4Subject: [PATCH] replace stat64/lstat64 with stat/lstat
5
6lfs64 functions are not needed when off_t is 64-bit
7Additionally this fixes build with musl which does not
8export these functions without defining _LARGEFILE64_SOURCE
9
10Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 libinotifytools/src/inotifytools.c | 8 ++++----
14 libinotifytools/src/inotifytools/inotify-nosys.h | 5 -----
15 libinotifytools/src/inotifytools/inotifytools.h | 5 -----
16 src/common.c | 4 ++--
17 src/common.h | 6 +-----
18 5 files changed, 7 insertions(+), 21 deletions(-)
19
20diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
21index 50f6135..3e17ac6 100644
22--- a/libinotifytools/src/inotifytools.c
23+++ b/libinotifytools/src/inotifytools.c
24@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path,
25
26 static struct dirent * ent;
27 char * next_file;
28- static struct stat64 my_stat;
29+ static struct stat my_stat;
30 ent = readdir( dir );
31 // Watch each directory within this directory
32 while ( ent ) {
33 if ( (0 != strcmp( ent->d_name, "." )) &&
34 (0 != strcmp( ent->d_name, ".." )) ) {
35 nasprintf(&next_file,"%s%s", my_path, ent->d_name);
36- if ( -1 == lstat64( next_file, &my_stat ) ) {
37+ if ( -1 == lstat( next_file, &my_stat ) ) {
38 error = errno;
39 free( next_file );
40 if ( errno != EACCES ) {
41@@ -1840,9 +1840,9 @@ int inotifytools_error() {
42 * @internal
43 */
44 static int isdir( char const * path ) {
45- static struct stat64 my_stat;
46+ static struct stat my_stat;
47
48- if ( -1 == lstat64( path, &my_stat ) ) {
49+ if ( -1 == lstat( path, &my_stat ) ) {
50 if (errno == ENOENT) return 0;
51 fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
52 return 0;
53diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h
54index 01aa45e..97166d4 100644
55--- a/libinotifytools/src/inotifytools/inotify-nosys.h
56+++ b/libinotifytools/src/inotifytools/inotify-nosys.h
57@@ -13,11 +13,6 @@
58 #include <sys/syscall.h>
59 #include <unistd.h>
60
61-#ifdef __FreeBSD__
62-#define stat64 stat
63-#define lstat64 lstat
64-#endif
65-
66 /*
67 * struct inotify_event - structure read from the inotify device for each event
68 *
69diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h
70index 49936ae..2ec4358 100644
71--- a/libinotifytools/src/inotifytools/inotifytools.h
72+++ b/libinotifytools/src/inotifytools/inotifytools.h
73@@ -1,11 +1,6 @@
74 #ifndef _inotifytools_H
75 #define _inotifytools_H
76
77-#ifdef __FreeBSD__
78-#define stat64 stat
79-#define lstat64 lstat
80-#endif
81-
82 #ifdef __cplusplus
83 extern "C"
84 {
85diff --git a/src/common.c b/src/common.c
86index 5a6fda1..885286e 100644
87--- a/src/common.c
88+++ b/src/common.c
89@@ -45,9 +45,9 @@ void print_event_descriptions() {
90 }
91
92 int isdir(char const *path) {
93- static struct stat64 my_stat;
94+ static struct stat my_stat;
95
96- if (-1 == lstat64(path, &my_stat)) {
97+ if (-1 == lstat(path, &my_stat)) {
98 if (errno == ENOENT)
99 return 0;
100 fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
101diff --git a/src/common.h b/src/common.h
102index 12d3dde..7f1e34a 100644
103--- a/src/common.h
104+++ b/src/common.h
105@@ -1,13 +1,9 @@
106 #ifndef COMMON_H
107 #define COMMON_H
108
109-#ifdef __FreeBSD__
110-#define stat64 stat
111-#define lstat64 lstat
112-#ifdef ENABLE_FANOTIFY
113+#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY)
114 #error "FreeBSD does not support fanotify"
115 #endif
116-#endif
117
118 #include <stdbool.h>
119
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
index 8a0ae17ad7..fdec940268 100644
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb
+++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
@@ -4,12 +4,9 @@ SECTION = "console/devel"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" 5LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
6 6
7SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" 7SRCREV = "5c2ab772338bcbe516306bf8cf1059ddf2fa6bb7"
8 8
9SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ 9SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \
10 file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \
11 file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \
12 file://0003-replace-stat64-lstat64-with-stat-lstat.patch \
13 " 10 "
14 11
15S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-21 16:16:36 +0000