summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-06-06 22:07:27 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-12 23:34:24 +0100
commitc10fe58682e744ef787be2e039f2f6bfb829aa40 (patch)
tree95ecde5af05e407b9bcb7bdd3033bb2c285141a0 /meta
parent81e8a52e8e40e47c34f900db5d73e69ffc25f5d0 (diff)
downloadpoky-c10fe58682e744ef787be2e039f2f6bfb829aa40.tar.gz
kern-tools: avoid merge_config concatenation issues
Integrating the following kern-tools commit: tools/merge_config.sh: add CR after each fragment If a fragment file doesn't contain a CR at the end, two config options may be merged on the same line in the result file, leading to misconfiguration. This patch adds a CR after each fragment to ensure that config options are well separated in the result file. Bug-AGL: SPEC-1475 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> (From OE-Core rev: c36727f2cad6c2d51aff8da6e2acd5642afe9848) Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 8ccd8cee14..4ccf9b07f3 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b
4 4
5DEPENDS = "git-native" 5DEPENDS = "git-native"
6 6
7SRCREV = "b46b1c4f0973bf1eb09cf1191f5f4e69bcd0475d" 7SRCREV = "8cd13500a27c0a6a911cc83c0349dec01ef66e27"
8PR = "r12" 8PR = "r12"
9PV = "0.2+git${SRCPV}" 9PV = "0.2+git${SRCPV}"
10 10