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-minmax-heap.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-minmax-heap.patch')
-rw-r--r-- | recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch index bf0fda5..44fa606 100644 --- a/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch +++ b/recipes-core/jamvm/jamvm/jamvm-minmax-heap.patch | |||
@@ -1,5 +1,13 @@ | |||
1 | From 2409bdf5de64f1a6f2d8d3c738b06d394b47c198 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Luebbe <jlu@pengutronix.de> | ||
3 | Date: Tue, 15 May 2012 09:56:31 +0000 | ||
4 | |||
5 | --- | ||
6 | src/jam.c | 4 +--- | ||
7 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
8 | |||
1 | diff --git a/src/jam.c b/src/jam.c | 9 | diff --git a/src/jam.c b/src/jam.c |
2 | index b76ce8b..dc5eac3 100644 | 10 | index 052f84a..460e4d3 100644 |
3 | --- a/src/jam.c | 11 | --- a/src/jam.c |
4 | +++ b/src/jam.c | 12 | +++ b/src/jam.c |
5 | @@ -133,9 +133,7 @@ int parseCommandLine(int argc, char *argv[], InitArgs *args) { | 13 | @@ -133,9 +133,7 @@ int parseCommandLine(int argc, char *argv[], InitArgs *args) { |