aboutsummaryrefslogtreecommitdiffstats
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:21:58 +0000
commit7c5a6cd8afb7157890b30a3e19ed5c06ec5a9516 (patch)
tree872c1c9690792731e552f0ad2935f1c50c72cf3c
parent8fd6ca0d3897e974a3f4f6687b2796add3fd9293 (diff)
downloadopenembedded-core-contrib-7c5a6cd8afb7157890b30a3e19ed5c06ec5a9516.tar.gz
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] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-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"