diff options
author | Hains van den Bosch <hainsvdbosch@ziggo.nl> | 2018-03-22 21:03:47 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | f8dcfde59f646dd7d5a909dd5955211407ce15b3 (patch) | |
tree | 005bb14c339975c5abfdf8163da7845724f2ae8f /meta-filesystems | |
parent | bd44421f579269f2b37cab8149beb7ae844eb92d (diff) | |
download | meta-openembedded-f8dcfde59f646dd7d5a909dd5955211407ce15b3.tar.gz |
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@ziggo.nl>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-filesystems')
-rw-r--r-- | meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch | 12 |
1 files 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 371ab8982..6d60c9d22 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@cn.fujitsu.com> | |||
11 | 2 files changed, 8 insertions(+) | 11 | 2 files changed, 8 insertions(+) |
12 | 12 | ||
13 | diff --git a/configure.ac b/configure.ac | 13 | diff --git a/configure.ac b/configure.ac |
14 | index ce21aef..ecd7119 100644 | 14 | index 4c03409..8d22e71 100644 |
15 | --- a/configure.ac | 15 | --- a/configure.ac |
16 | +++ b/configure.ac | 16 | +++ b/configure.ac |
17 | @@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, | 17 | @@ -119,6 +119,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUseCCache, [], [ |
18 | )] | 18 | LIBS="$LIBS $SMBCLIENT_LIBS" |
19 | ) | 19 | CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS" |
20 | 20 | ||
21 | +dnl ***************************************************************** | 21 | +dnl ***************************************************************** |
22 | +dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** | 22 | +dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** |
@@ -27,10 +27,10 @@ index ce21aef..ecd7119 100644 | |||
27 | dnl *** Final step *** | 27 | dnl *** Final step *** |
28 | dnl ****************** | 28 | dnl ****************** |
29 | diff --git a/src/Makefile.am b/src/Makefile.am | 29 | diff --git a/src/Makefile.am b/src/Makefile.am |
30 | index 41519d8..9fc97e9 100644 | 30 | index ccaa8c3..6598317 100644 |
31 | --- a/src/Makefile.am | 31 | --- a/src/Makefile.am |
32 | +++ b/src/Makefile.am | 32 | +++ b/src/Makefile.am |
33 | @@ -16,3 +16,6 @@ smbnetfs_SOURCES = \ | 33 | @@ -17,3 +17,6 @@ smbnetfs_SOURCES = \ |
34 | event.c event.h \ | 34 | event.c event.h \ |
35 | reconfigure.c reconfigure.h \ | 35 | reconfigure.c reconfigure.h \ |
36 | main.c | 36 | main.c |