[oe-commits] [openembedded-core] 07/11: kernel-yocto: make SRC_URI defconfig removal more specific
git at git.openembedded.org
git at git.openembedded.org
Fri Jan 26 14:41:41 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit a0e211fda5e2a87028be306210535e690a6004a5
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
AuthorDate: 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]
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list