[oe-commits] [openembedded-core] 14/17: kern-tools: avoid merge_config concatenation issues

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b095a8ac38058b4c51583b66da805f3ad96eab68
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
AuthorDate: Wed Jun 6 22:07:27 2018 -0400

    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 at iot.bzh>
        Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
    
    Signed-off-by: Stephane Desneux <stephane.desneux at iot.bzh>
    Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 8ccd8ce..4ccf9b0 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}"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.