diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 23:40:56 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:43 -0700 |
| commit | 7579acbbc479fe8ee631ea7e21a92961055d04a2 (patch) | |
| tree | 41ade434ff90c73904f6b7c3049d0ae5c6c808a5 | |
| parent | 807b102f9f2faa3e23b79e5b6219c01bf6990e11 (diff) | |
| download | meta-openembedded-contrib-7579acbbc479fe8ee631ea7e21a92961055d04a2.tar.gz | |
libdivecomputer: refresh patches
WARNING: libdivecomputer-0.4.2+gitrAUTOINC+5f765f9143-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 fix-ar.patch
patching file configure.ac
Hunk #1 succeeded at 54 with fuzz 1 (offset 30 lines).
Now at patch fix-ar.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch index cc3f5d4786..f65d26aaea 100644 --- a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch @@ -2,11 +2,11 @@ configure.ac | 1 + 1 file changed, 1 insertion(+) +Index: git/configure.ac +=================================================================== --- git.orig/configure.ac +++ git/configure.ac -@@ -24,10 +24,11 @@ LT_INIT([win32-dll]) - LT_PROG_RC - +@@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 @@ -14,5 +14,3 @@ # Enable automake silent build rules. m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - # Checks for native Windows. |