]> code.ossystems Code Review - openembedded-core.git/commit
kern-tools: avoid merge_config concatenation issues
authorBruce Ashfield <bruce.ashfield@windriver.com>
Thu, 7 Jun 2018 02:07:27 +0000 (22:07 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 2 Jul 2018 09:40:36 +0000 (10:40 +0100)
commitbd85f104d214c86e52204d0fe7e66039361d8b9f
tree3ed63a844330da8fe10c8d2bffc68567d343ca64
parent8f18cedf2442537249483ae88cfa240aedfab5f1
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb