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