mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-17 12:41:58 +02:00
b25363f0cd
WARNING:
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:
checking file scm/Makefile.am
Hunk #1 succeeded at 119 with fuzz 2 (offset 61 lines).
Signed-off-by: Armin Kuster <akuster808@gmail.com>
22 lines
657 B
Diff
22 lines
657 B
Diff
From d61495d3fb039842b82df44184c67eb3c1256136 Mon Sep 17 00:00:00 2001
|
|
From: Bian Naimeng <biannm@cn.fujitsu.com>
|
|
Date: Fri, 26 Jun 2015 12:57:48 +0900
|
|
|
|
---
|
|
scm/Makefile.am | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/scm/Makefile.am b/scm/Makefile.am
|
|
index 14d9393..e8a1083 100644
|
|
--- a/scm/Makefile.am
|
|
+++ b/scm/Makefile.am
|
|
@@ -119,7 +119,7 @@ if EXPAT
|
|
module_names += "yahoo-jp"
|
|
endif
|
|
|
|
-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
|
|
+UIM_MODULE_MANAGER = uim-module-manager
|
|
UIM_MODULE_MANAGER_ENV = \
|
|
LIBUIM_SYSTEM_SCM_FILES=$(abs_top_srcdir)/sigscheme/lib \
|
|
LIBUIM_SCM_FILES=$(abs_srcdir) \
|