1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

kernel-yocto: make SRC_URI defconfig removal more specific

commit 7e98c295c1bb511e [kernel-yocto: ensure that only a single
defconfig is processed] has an overly broad replacement strategy
for 'defconfig' and hence will chop up any fragment name that
happens to contain that string.

If we change the processing to split on whitespace and drop
any full work 'defconfig' fragments, we'll get the behaviour
we want (no duplicate defconfigs, but fragments with defconfig
in their name are fine).

[YOCTO #12487]

(From OE-Core rev: fd2678190db6575dc909104b60c284d0c41f605f)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2018-01-23 14:44:45 -05:00
committed by Richard Purdie
parent 4bf146623b
commit be29a95bee
+1 -1
View File
@@ -128,7 +128,7 @@ do_kernel_metadata() {
# the KBUILD_DEFCONFIG processing above ?
if [ -n "$sccs" ]; then
# we did have a defconfig from above. remove any that might be in the src_uri
sccs_from_src_uri=$(echo $sccs_from_src_uri | sed 's/defconfig//g')
sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
fi
sccs="$sccs $sccs_from_src_uri"