inotify-tools: move recipe to oe-core from meta-oe

inotify-tools: move recipe to oe-core from meta-oe

[Trevor Gamblin]

An interface for inotify already exists through pyinotify,
but migrating inotify-tools to oe-core provides an option
that doesn't rely on python.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 ...inotify-nosys-fix-system-call-number.patch | 31 +++++++++++++++++++
 .../inotify-tools/inotify-tools_git.bb        | 23 ++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
 create mode 100644 meta/recipes-support/inotify-tools/inotify-tools_git.bb

diff --git a/meta/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
new file mode 100644
index 0000000000..89b890dda9
--- /dev/null
+++ b/meta/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
@@ -0,0 +1,31 @@
+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
+
diff --git a/meta/recipes-support/inotify-tools/inotify-tools_git.bb b/meta/recipes-support/inotify-tools/inotify-tools_git.bb
new file mode 100644
index 0000000000..05ca4b4ad5
--- /dev/null
+++ b/meta/recipes-support/inotify-tools/inotify-tools_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Command line tools and C library providing a simple interface to inotify"
+AUTHOR = "Rohan McGovern <rohan@mcgovern.id.au>"
+HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools"
+SECTION = "console/devel"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
+
+SRCREV = "e203934e46784bb34c213078423ba1678e0c4936"
+PV = "3.20.1"
+
+SRC_URI = "git://github.com/rvoicilas/${BPN} \
+           file://inotify-nosys-fix-system-call-number.patch \
+          "
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-doxygen"
+
+PACKAGES =+ "libinotifytools"
+
+FILES_libinotifytools = "${libdir}/lib*.so.*"
-- 
2.23.0

Re: inotify-tools: move recipe to oe-core from meta-oe

[Adrian Bunk]

On Tue, Oct 29, 2019 at 03:39:21PM -0500, Trevor Gamblin wrote:
> An interface for inotify already exists through pyinotify,
> but migrating inotify-tools to oe-core provides an option
> that doesn't rely on python.
>... 

pyinotify is in meta-python.

The only option currently in oe-core is to use C,
which is the standard way to use inotify.

inotify-tools can be useful, but I don't see the rationale
why it should move from meta-oe to oe-core.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: inotify-tools: move recipe to oe-core from meta-oe

[Randy MacLeod]

On 10/29/19 5:13 PM, Adrian Bunk wrote:
> On Tue, Oct 29, 2019 at 03:39:21PM -0500, Trevor Gamblin wrote:
>> An interface for inotify already exists through pyinotify,
>> but migrating inotify-tools to oe-core provides an option
>> that doesn't rely on python.
>> ...
> 
> pyinotify is in meta-python.
> 
> The only option currently in oe-core is to use C,
> which is the standard way to use inotify.
> 
> inotify-tools can be useful, but I don't see the rationale
> why it should move from meta-oe to oe-core.

Trevor,

I thought the motivation for moving inotify-tools to oe-core
was:
  a) It's a nice cmdline utility
  b) coreutils ptests needs it.

I think I've mislead you into believing b) since
inotify-tools provides:
   /usr/bin/inotifywait
   /usr/bin/inotifywatch
and I don't see any mention of that in the coreutils/tests directory
or in fact in coreutils.git at all:

$ cd .../coreutils.git
$ grep -r inotifywa * -> NULL

So we need to figure out what the failing coreutils ptests that
involve inotify really need since it seems that it's not inotify-tools.

../Randy

> 
> cu
> Adrian
> 


-- 
# Randy MacLeod
# Wind River Linux

Re: inotify-tools: move recipe to oe-core from meta-oe

[Trevor Gamblin]

On 10/29/19 5:13 PM, Adrian Bunk wrote:
> On Tue, Oct 29, 2019 at 03:39:21PM -0500, Trevor Gamblin wrote:
>> An interface for inotify already exists through pyinotify,
>> but migrating inotify-tools to oe-core provides an option
>> that doesn't rely on python.
>> ...
> pyinotify is in meta-python.
>
> The only option currently in oe-core is to use C,
> which is the standard way to use inotify.
>
> inotify-tools can be useful, but I don't see the rationale
> why it should move from meta-oe to oe-core.
>
> cu
> Adrian
>
Right. Echoing the meta-oe patch response, hold off on this after all. I 
have a ptest coming that might use it,

but I'll need to review the gameplan here.