[OE-core] [PATCH] findutils: update the patch to avoid patch fuzz warning
Martin Jansa
martin.jansa at gmail.com
Fri Jun 22 10:46:00 UTC 2018
Thanks for quick update
For some reason this patch of .patch cannot be applied (at least when
applied from patchwork)
https://patchwork.openembedded.org/patch/151897/
openembedded-core $ pwam 151897
git diff con2018-06-22 10:43:15 URL:
https://patchwork.openembedded.org/patch/151897/mbox/ [3472] ->
"pw-am-151897.patch" [1]
Applying: findutils: update the patch to avoid patch fuzz warning
.git/rebase-apply/patch:31: trailing whitespace.
.git/rebase-apply/patch:33: trailing whitespace.
.git/rebase-apply/patch:40: trailing whitespace.
.git/rebase-apply/patch:78: trailing whitespace.
--
error: patch failed:
meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch:29
error:
meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch:
patch does not apply
Patch failed at 0001 findutils: update the patch to avoid patch fuzz warning
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Normal patch tool fails to apply it as well:
$ patch -p1 < pw-am-151897.patch
patching file
meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
Hunk #1 FAILED at 29.
1 out of 5 hunks FAILED -- saving rejects to file
meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch.rej
On Fri, Jun 22, 2018 at 12:12 PM Zhixiong Chi <zhixiong.chi at windriver.com>
wrote:
> Regenerate the patch to avoid patch fuzz warning.
>
> Signed-off-by: Zhixiong Chi <zhixiong.chi at windriver.com>
> ---
> ...-honour-the-ignore_readdir_race-opti.patch | 29 ++++++++++---------
> 1 file changed, 16 insertions(+), 13 deletions(-)
>
> diff --git
> a/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
> b/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
> index 45e499a184..333b38e882 100644
> ---
> a/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
> +++
> b/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
> @@ -29,6 +29,8 @@ https://savannah.gnu.org/bugs/?52981
>
> Upstream-Status: Backport
> Signed-off-by : Zhixiong Chi <zhixiong.chi at windriver.com>
> +
> +%% original patch:
> 0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
> ---
> NEWS | 4 ++++
> doc/find.texi | 15 ++++++++++++++-
> @@ -37,22 +39,22 @@ Signed-off-by : Zhixiong Chi <
> zhixiong.chi at windriver.com>
> 4 files changed, 46 insertions(+), 1 deletion(-)
>
> diff --git a/NEWS b/NEWS
> -index 88cf17d..9809bf4 100644
> +index 660c241..b86ec1e 100644
> --- a/NEWS
> +++ b/NEWS
> -@@ -42,6 +42,10 @@
> -
> - ** Bug Fixes
> -
> +@@ -42,6 +42,10 @@ Updated the Danish translation.
> +
> + ** Bug Fixes:
> +
> +#52981: find: the '-delete' action no longer complains about disappeared
> files
> + when the '-ignore_readdir_race' option is given, too. That
> action will
> + also returns true in such a case now.
> +
> Applied patch #8688: Spelling fixes.
> -
> +
> * Major changes in release 4.5.18, 2015-12-27
> diff --git a/doc/find.texi b/doc/find.texi
> -index 3580be7..0089193 100644
> +index fdeb841..247c19a 100644
> --- a/doc/find.texi
> +++ b/doc/find.texi
> @@ -1418,7 +1418,15 @@ gives a significant increase in search speed.
> @@ -85,11 +87,11 @@ index 3580be7..0089193 100644
>
> @node Adding Tests
> diff --git a/find/find.1 b/find/find.1
> -index 0437cd8..0d44c37 100644
> +index 7b141b8..0eec41c 100644
> --- a/find/find.1
> +++ b/find/find.1
> -@@ -479,6 +479,17 @@ this option on and part of it with this option off
> - (if you need to do that, you will need to issue two \fBfind\fR commands
> +@@ -479,6 +479,17 @@ one part of the filesystem with this option on and
> part of it with this option
> + off (if you need to do that, you will need to issue two \fBfind\fR
> commands
> instead, one with the option and one without it).
>
> +Furthermore,
> @@ -125,7 +127,7 @@ index 0437cd8..0d44c37 100644
> Execute \fIcommand\fR; true if 0 status is returned. All following
> arguments to
> diff --git a/find/pred.c b/find/pred.c
> -index 7e2a7bd..af3bacb 100644
> +index 32938fb..431f065 100644
> --- a/find/pred.c
> +++ b/find/pred.c
> @@ -324,6 +324,12 @@ pred_delete (const char *pathname, struct stat
> *stat_buf, struct predicate *pred
> @@ -141,5 +143,6 @@ index 7e2a7bd..af3bacb 100644
> if (EISDIR == errno)
> {
> if ((flags & AT_REMOVEDIR) == 0)
> ---
> -cgit v1.0-41-gc330
> +--
> +2.17.1
> +
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180622/cd741057/attachment-0002.html>
More information about the Openembedded-core
mailing list