From c36727f2cad6c2d51aff8da6e2acd5642afe9848 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 6 Jun 2018 22:07:27 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Stephane Desneux Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 DEPENDS = "git-native" -SRCREV = "b46b1c4f0973bf1eb09cf1191f5f4e69bcd0475d" +SRCREV = "8cd13500a27c0a6a911cc83c0349dec01ef66e27" PR = "r12" PV = "0.2+git${SRCPV}" -- cgit 1.2.3-korg