diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:59:51 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
commit | b6ba9533ad565ca2347fb32fcbdf6a3396884236 (patch) | |
tree | 9df8fb63bc9f5adfac5789f9549f949269101af7 /meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch | |
parent | aa7b7cd364723de5c1e3b587bddb376b8b0e53c5 (diff) | |
download | meta-openembedded-b6ba9533ad565ca2347fb32fcbdf6a3396884236.tar.gz |
autofs: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file configure.in
checking file daemon/module.c
Hunk #1 succeeded at 19 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 55 with fuzz 2 (offset 1 line).
checking file include/automount.h
Hunk #1 succeeded at 51 (offset 1 line).
WARNING:
among others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index 6b6ba6d855..469027aacc 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -1,21 +1,22 @@ -From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 19:12:10 -0700 -Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC +Subject: [PATCH] Replace __S_IEXEC with S_IEXEC S_IEXEC is portable Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- daemon/lookup.c | 4 ++-- modules/lookup_multi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/lookup.c b/daemon/lookup.c -index 62071df..1bec97f 100644 +index 201ccbb..d821db8 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c -@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source +@@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source if (!S_ISREG(st.st_mode)) return NSS_STATUS_NOTFOUND; @@ -24,7 +25,7 @@ index 62071df..1bec97f 100644 type = src_prog; else type = src_file; -@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ +@@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ if (!S_ISREG(st.st_mode)) return NSS_STATUS_NOTFOUND; @@ -34,10 +35,10 @@ index 62071df..1bec97f 100644 else type = src_file; diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index 6ec8434..88d081f 100644 +index fadd2ea..3ecda6d 100644 --- a/modules/lookup_multi.c +++ b/modules/lookup_multi.c -@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch +@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch continue; } @@ -46,6 +47,3 @@ index 6ec8434..88d081f 100644 type = src_prog; else type = src_file; --- -2.12.1 - |