diff options
author | Maxin B. John <maxin.john@intel.com> | 2018-04-09 15:06:59 +0300 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-04-09 17:18:03 +0300 |
commit | 9239be7e6a64560bba1e136367108012350f9ca0 (patch) | |
tree | 339ecfa749197cf3fca049c48d4c7ccafb683723 /recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch | |
parent | af897090975d102d6136b2b64164b78da3b381c9 (diff) | |
download | meta-java-9239be7e6a64560bba1e136367108012350f9ca0.tar.gz |
jamvm: refresh patches
Fixes this:
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:
patching file src/Makefile.am
Hunk #1 succeeded at 23 with fuzz 1.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch')
-rw-r--r-- | recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch b/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch index f0884fd..f76da3c 100644 --- a/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch +++ b/recipes-core/jamvm/jamvm/jamvm-jni_h-noinst.patch | |||
@@ -1,9 +1,17 @@ | |||
1 | Index: jamvm-1.5.3/src/Makefile.am | 1 | From a0169a5569a0373558bd99143a02ba3ebe80b81b Mon Sep 17 00:00:00 2001 |
2 | =================================================================== | 2 | From: Henning Heinold <heinold@inf.fu-berlin.de> |
3 | --- jamvm-1.5.3.orig/src/Makefile.am 2009-09-29 09:29:13.386565473 +0200 | 3 | Date: Sat, 12 Nov 2011 20:58:34 +0100 |
4 | +++ jamvm-1.5.3/src/Makefile.am 2009-09-29 09:33:47.702565852 +0200 | 4 | |
5 | @@ -23,7 +23,7 @@ | 5 | --- |
6 | DIST_SUBDIRS = os arch interp | 6 | src/Makefile.am | 2 +- |
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
10 | index 1cf2e87..1f06fed 100644 | ||
11 | --- a/src/Makefile.am | ||
12 | +++ b/src/Makefile.am | ||
13 | @@ -23,7 +23,7 @@ SUBDIRS = os interp classlib | ||
14 | DIST_SUBDIRS = os arch interp classlib | ||
7 | 15 | ||
8 | bin_PROGRAMS = jamvm | 16 | bin_PROGRAMS = jamvm |
9 | -include_HEADERS = jni.h | 17 | -include_HEADERS = jni.h |