mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 23:02:22 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
81e8a52e8e
commit
c10fe58682
@@ -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}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user