summaryrefslogtreecommitdiffstats
path: root/.templateconf
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-07-02 11:41:25 +0100
commitb22a3f4aac6677413c91268cd0a91625ee67918e (patch)
tree06c59859053dd956d86d9682561efd4123d1806a /.templateconf
parent5e03004baf342a8b2d43f2df96de8d271f7d5425 (diff)
downloadpoky-b22a3f4aac6677413c91268cd0a91625ee67918e.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) (From OE-Core rev: bd85f104d214c86e52204d0fe7e66039361d8b9f) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to '.templateconf')
0 files changed, 0 insertions, 0 deletions