[gnome-continuous-yocto/gnomeostree-3.28-rocko: 93/218] kernel-yocto: make SRC_URI defconfig removal more specific

[Emmanuele Bassi <ebassi src gnome org>]

commit 0411e9d02c77ed22a95d9827f71ca6e5d7081ad0
Author: Bruce Ashfield <bruce ashfield windriver com>
Date:   Tue Jan 23 14:44:45 2018 -0500

    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: 7c5a6cd8afb7157890b30a3e19ed5c06ec5a9516)
    
    Signed-off-by: Bruce Ashfield <bruce ashfield windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-yocto.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 60979a2..663c655 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"