summaryrefslogtreecommitdiffstats
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-28 10:14:01 +0000
commit0411e9d02c77ed22a95d9827f71ca6e5d7081ad0 (patch)
treeb9efb42a46c0d86ae05f900d67cffe98c62cd1af
parent40ac639048c4bd3e29ab515babeec02f8ebc3c2d (diff)
downloadpoky-0411e9d02c77ed22a95d9827f71ca6e5d7081ad0.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] (From OE-Core rev: 7c5a6cd8afb7157890b30a3e19ed5c06ec5a9516) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
128 # the KBUILD_DEFCONFIG processing above ? 128 # the KBUILD_DEFCONFIG processing above ?
129 if [ -n "$sccs" ]; then 129 if [ -n "$sccs" ]; then
130 # we did have a defconfig from above. remove any that might be in the src_uri 130 # we did have a defconfig from above. remove any that might be in the src_uri
131 sccs_from_src_uri=$(echo $sccs_from_src_uri | sed 's/defconfig//g') 131 sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
132 fi 132 fi
133 sccs="$sccs $sccs_from_src_uri" 133 sccs="$sccs $sccs_from_src_uri"
134 134