From b73b7e42d8a87445d6539ff64953b47bac01b93b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 21 Feb 2022 21:22:08 +0800 Subject: inotify-tools: upgrade 3.21.9.6 -> 3.22.1.0 0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch removed since it's included in 3.22.1.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...inotifytools-Include-limit.h-for-PATH_MAX.patch | 29 ---------------------- .../inotify-tools/inotify-tools_3.21.9.6.bb | 27 -------------------- .../inotify-tools/inotify-tools_3.22.1.0.bb | 26 +++++++++++++++++++ 3 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch delete mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb create mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch deleted file mode 100644 index f30a62d594..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1e37cc3aa674c4b052f0655fef59a910fd7325cb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 16 Dec 2021 14:53:25 -0800 -Subject: [PATCH 1/2] libinotifytools: Include limit.h for PATH_MAX - -musl builds fail since the required header which defines PATH_MAX is -missing, its perhaps included indirectly via glibc based systems - -Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/153] -Signed-off-by: Khem Raj ---- - libinotifytools/src/inotifytools.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c -index 8bdfdb6..902eac2 100644 ---- a/libinotifytools/src/inotifytools.c -+++ b/libinotifytools/src/inotifytools.c -@@ -17,6 +17,7 @@ - #include "inotifytools_p.h" - #include "stats.h" - -+#include - #include - #include - #include --- -2.34.1 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb deleted file mode 100644 index 89c3a00b71..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Command line tools and C library providing a simple interface to inotify" -AUTHOR = "Rohan McGovern " -HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" -SECTION = "console/devel" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" - -SRCREV = "8f8fcdffb7e80928bea6c1fccd3527a9f5d8fe77" - -SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ - file://0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch \ - file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-doxygen" - -# workaround until glibc 2.35 is fixed for this [1] -# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html -CFLAGS += "-Wno-error" - -PACKAGES =+ "libinotifytools" - -FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb new file mode 100644 index 0000000000..38ba91552c --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Command line tools and C library providing a simple interface to inotify" +AUTHOR = "Rohan McGovern " +HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" +SECTION = "console/devel" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" + +SRCREV = "4b72dcd15299e1d0cb096397d9aab513ffed1657" + +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--disable-doxygen" + +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + +PACKAGES =+ "libinotifytools" + +FILES:libinotifytools = "${libdir}/lib*.so.*" -- cgit v1.2.3-54-g00ecf