diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-06-06 22:07:27 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-02 11:41:25 +0100 |
| commit | b22a3f4aac6677413c91268cd0a91625ee67918e (patch) | |
| tree | 06c59859053dd956d86d9682561efd4123d1806a /meta/recipes-kernel | |
| parent | 5e03004baf342a8b2d43f2df96de8d271f7d5425 (diff) | |
| download | poky-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 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 4 | 4 | ||
| 5 | DEPENDS = "git-native" | 5 | DEPENDS = "git-native" |
| 6 | 6 | ||
| 7 | SRCREV = "b46b1c4f0973bf1eb09cf1191f5f4e69bcd0475d" | 7 | SRCREV = "8cd13500a27c0a6a911cc83c0349dec01ef66e27" |
| 8 | PR = "r12" | 8 | PR = "r12" |
| 9 | PV = "0.2+git${SRCPV}" | 9 | PV = "0.2+git${SRCPV}" |
| 10 | 10 | ||