From f8dcfde59f646dd7d5a909dd5955211407ce15b3 Mon Sep 17 00:00:00 2001 From: Hains van den Bosch Date: Thu, 22 Mar 2018 21:03:47 +0100 Subject: 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 devtool finish --force-patch-refresh 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 Signed-off-by: Armin Kuster --- ...ng-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-filesystems') 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 371ab89821..6d60c9d229 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 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 -- cgit 1.2.3-korg