[oe] [PATCH 15/15] cppunit: fix patch fuzz warning

Andreas Müller schnitzeltony at gmail.com
Wed Mar 27 15:35:09 UTC 2019


| Applying patch 0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
| patching file doc/Makefile.am
| Hunk #1 succeeded at 8 with fuzz 2 (offset -14 lines).

Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 ...akefile.am-do-not-preserve-file-flags-when-copy.patch | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch b/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
index 6a20c1283..441876e40 100644
--- a/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
+++ b/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
@@ -17,15 +17,12 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am
 index 8815476..3237499 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -22,7 +22,7 @@ htmldir += $(pkgdatadir)/html
+@@ -8,7 +8,7 @@ htmldir += $(pkgdatadir)/html
  html_DATA += $(static_pages) html/index.html
  
  install-data-hook:
 -	cp -pR html/* $(DESTDIR)$(htmldir)
 +	cp -R html/* $(DESTDIR)$(htmldir)
  
- # Automake's "distcheck" is sensitive to having files left over
- # after "make uninstall", so we have to clean up the install hook.
--- 
-2.5.0
-
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(htmldir)
-- 
2.20.1



More information about the Openembedded-devel mailing list