inotify-tools: upgrade 3.20.1 -> 3.20.2.2

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Pierre-Jean Texier
2020-02-24 21:03:56 +00:00
committed by Khem Raj
parent 7cd1a97272
commit da1f9f6361
3 changed files with 50 additions and 35 deletions
@@ -0,0 +1,46 @@
From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001
From: Pierre-Jean Texier <pjtexier@koncepto.io>
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 <pjtexier@koncepto.io>
---
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
@@ -1,31 +0,0 @@
inotify-tools: fix __NR_inotify_add_watch system call number on _MIPS_SIM_ABI64
The correct value should be the same as defined in
linux/arch/mips/include/uapi/asm/unistd.h
Upstream-Status: Summitted [https://github.com/rvoicilas/inotify-tools/pull/71]
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
libinotifytools/src/inotifytools/inotify-nosys.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h
index db76b2c..5f7b11b 100644
--- a/libinotifytools/src/inotifytools/inotify-nosys.h
+++ b/libinotifytools/src/inotifytools/inotify-nosys.h
@@ -100,8 +100,8 @@ struct inotify_event {
# endif
# if _MIPS_SIM == _MIPS_SIM_ABI64
# define __NR_inotify_init (__NR_Linux + 243)
-# define __NR_inotify_add_watch (__NR_Linux + 243)
-# define __NR_inotify_rm_watch (__NR_Linux + 243)
+# define __NR_inotify_add_watch (__NR_Linux + 244)
+# define __NR_inotify_rm_watch (__NR_Linux + 245)
# endif
# if _MIPS_SIM == _MIPS_SIM_NABI32
# define __NR_inotify_init (__NR_Linux + 247)
--
1.7.10.4
@@ -5,12 +5,12 @@ SECTION = "console/devel"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
SRCREV = "e203934e46784bb34c213078423ba1678e0c4936"
PV = "3.20.1"
SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d"
PV = "3.20.2.2"
SRC_URI = "git://github.com/rvoicilas/${BPN} \
file://inotify-nosys-fix-system-call-number.patch \
"
file://0001-Makefile.am-add-build-rule-for-README.patch \
"
S = "${WORKDIR}/git"