summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-01-23 14:44:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-27 13:15:28 +0000
commitbe29a95bee055a114a7c7f369ac5dbf316810590 (patch)
treea6f7ddc839b6a60222899e9d301c6d2ae9eaec96 /meta/classes/kernel-yocto.bbclass
parent4bf146623bec3e7c9484f16c5cda6f442849525d (diff)
downloadpoky-be29a95bee055a114a7c7f369ac5dbf316810590.tar.gz
poky-be29a95bee055a114a7c7f369ac5dbf316810590.tar.bz2
poky-be29a95bee055a114a7c7f369ac5dbf316810590.zip
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>
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 60979a218f..663c6557d9 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -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"