From ede7eadd2b957b541cf7f5530208ab71a3bf460b Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Sat, 14 Nov 2020 22:06:53 +0100 Subject: [PATCH] inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0 - Drop patch (already in version) This includes the following changes: 98e8dfa inotify-tools 3.20.11.0 583492a Allow produce NULL-delimited output (#118) e38d78e Resolves Issue #72 (#113) 8672a5e User $(id -u) over $USER e5f4ec6 Create FUNDING.yml 8967735 Add integration test to test if chown is tracked successfully e114a35 Only call git clean -fdx if specified 933dea5 Update issue templates 6644476 Create CODE_OF_CONDUCT.md c03dcfc Added -P/--no-dereference to watch a symlink (#46) aa125f5 Use localtime_r over localtime d222aa9 Fix some issues pointed out by lgtm 69829a8 cirrus-ci: disable the FreeBSD 13 builds c164cfd Add status for FreeBSD 1b06e96 Stop running unit tests on FreeBSD 7ddf451 Makefile.am: add build rule for README (#111) 67b6e71 Add arm64 build Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...akefile.am-add-build-rule-for-README.patch | 46 ------------------- .../inotify-tools/inotify-tools_git.bb | 8 ++-- 2 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch deleted file mode 100644 index 2c7cd99701a..00000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier -Date: Mon, 24 Feb 2020 21:44:45 +0100 -Subject: [PATCH] Makefile.am: add build rule for README - -Fixes: - -| configure.ac:17: installing 'config/config.sub' -| configure.ac:16: installing 'config/install-sh' -| configure.ac:16: installing 'config/missing' -| Makefile.am: error: required file './README' not found -| libinotifytools/src/Makefile.am: installing 'config/depcomp' - -Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] - -Signed-off-by: Pierre-Jean Texier ---- - Makefile.am | 2 ++ - autogen.sh | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 56e4531..d08c8fe 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = libinotifytools src man - -+README: README.md -+ - dist-hook: - # Automake official documentation states that dist-hook should assume files - # are not writable. -diff --git a/autogen.sh b/autogen.sh -index 48eb21d..31572c2 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,4 +1,3 @@ - #!/bin/sh - --cp README.md README - autoreconf --install "$@" || exit 1 --- -2.7.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index f42abeb2ba9..8206590a860 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -5,12 +5,10 @@ SECTION = "console/devel" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" -SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" -PV = "3.20.2.2" +SRCREV = "98e8dfa47eb6a6ba52e35de55d2de21b274a4af8" +PV = "3.20.11.0" -SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://0001-Makefile.am-add-build-rule-for-README.patch \ - " +SRC_URI = "git://github.com/rvoicilas/${BPN}" S = "${WORKDIR}/git"