[oe-commits] [meta-openembedded] 39/74: smbnetfs: refresh patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit 610d09c2d0357a8959d69a334683555fd5006699
Author: Hains van den Bosch <hainsvdbosch at ziggo.nl>
AuthorDate: Thu Mar 22 21:03:47 2018 +0100

    smbnetfs: refresh patch
    
    WARNING: smbnetfs-git-r0 do_patch:
    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:
    Applying patch Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
    patching file configure.ac
    Hunk #1 succeeded at 119 with fuzz 2 (offset -6 lines).
    patching file src/Makefile.am
    Hunk #1 succeeded at 17 (offset 1 line).
    
    Now at patch Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
    
    Signed-off-by: Hains van den Bosch <hainsvdbosch at ziggo.nl>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 ...ng-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
index 371ab89..6d60c9d 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
@@ -11,12 +11,12 @@ Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
  2 files changed, 8 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index ce21aef..ecd7119 100644
+index 4c03409..8d22e71 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData,
-     )]
- )
+@@ -119,6 +119,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUseCCache, [], [
+ LIBS="$LIBS $SMBCLIENT_LIBS"
+ CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS"
  
 +dnl *****************************************************************
 +dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags ***
@@ -27,10 +27,10 @@ index ce21aef..ecd7119 100644
  dnl *** Final step ***
  dnl ******************
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 41519d8..9fc97e9 100644
+index ccaa8c3..6598317 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -16,3 +16,6 @@ smbnetfs_SOURCES = \
+@@ -17,3 +17,6 @@ smbnetfs_SOURCES = \
  	event.c			event.h			\
  	reconfigure.c		reconfigure.h		\
  	main.c

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.