From fd2678190db6575dc909104b60c284d0c41f605f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 23 Jan 2018 14:44:45 -0500 Subject: 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 --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/kernel-yocto.bbclass') 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" -- cgit 1.2.3-korg