mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
inotify-tools: Upgrade 3.14 -> 3.20.1
Remove patch applied upstream. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-45
@@ -1,45 +0,0 @@
|
|||||||
From 7affb288d6c0726e7b1ebc317a878927b6ef0d02 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrea Galbusera <gizero@gmail.com>
|
|
||||||
Date: Tue, 13 Sep 2016 08:10:29 +0200
|
|
||||||
Subject: [PATCH] inotifywait: fix compile error with GCC 6
|
|
||||||
|
|
||||||
Fails to compile with misleading-indentation error
|
|
||||||
|
|
||||||
| src/inotifywait.c: In function 'output_event_csv':
|
|
||||||
| src/inotifywait.c:126:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
|
|
||||||
| if (filename != NULL)
|
|
||||||
| ^~
|
|
||||||
| src/inotifywait.c:129:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
|
|
||||||
| printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) );
|
|
||||||
| ^~~~~~
|
|
||||||
| cc1: all warnings being treated as errors
|
|
||||||
|
|
||||||
Fix indentation to resolve.
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/rvoicilas/inotify-tools/pull/66]
|
|
||||||
|
|
||||||
Signed-off-by: Andrea Galbusera <gizero@gmail.com>
|
|
||||||
---
|
|
||||||
src/inotifywait.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/inotifywait.c b/src/inotifywait.c
|
|
||||||
index c5ce5e3..404a85b 100644
|
|
||||||
--- a/src/inotifywait.c
|
|
||||||
+++ b/src/inotifywait.c
|
|
||||||
@@ -122,9 +122,9 @@ void validate_format( char * fmt ) {
|
|
||||||
|
|
||||||
|
|
||||||
void output_event_csv( struct inotify_event * event ) {
|
|
||||||
- char *filename = csv_escape(inotifytools_filename_from_wd(event->wd));
|
|
||||||
- if (filename != NULL)
|
|
||||||
- printf("%s,", filename);
|
|
||||||
+ char *filename = csv_escape(inotifytools_filename_from_wd(event->wd));
|
|
||||||
+ if (filename != NULL)
|
|
||||||
+ printf("%s,", filename);
|
|
||||||
|
|
||||||
printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) );
|
|
||||||
if ( event->len > 0 )
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
@@ -5,11 +5,10 @@ SECTION = "console/devel"
|
|||||||
LICENSE = "GPL-2.0"
|
LICENSE = "GPL-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
|
||||||
|
|
||||||
SRCREV = "1df9af4d6cd0f4af4b1b19254bcf056aed4ae395"
|
SRCREV = "e203934e46784bb34c213078423ba1678e0c4936"
|
||||||
PV = "3.14+git${SRCPV}"
|
PV = "3.20.1"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/rvoicilas/${BPN} \
|
SRC_URI = "git://github.com/rvoicilas/${BPN} \
|
||||||
file://inotifywait-fix-compile-error-with-GCC-6.patch \
|
|
||||||
file://inotify-nosys-fix-system-call-number.patch \
|
file://inotify-nosys-fix-system-call-number.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user