[oe-commits] [openembedded-core] 14/19: kernel-yocto: fix defconfig detection in find_sccs()

git at git.openembedded.org git at git.openembedded.org
Wed Feb 5 23:56:30 UTC 2020


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 f8de8d4f2ddb0c8a59a0f5c44a5537c009c357e8
Author: Gavin Li <gavinli at thegavinli.com>
AuthorDate: Wed Feb 5 18:12:50 2020 -0500

    kernel-yocto: fix defconfig detection in find_sccs()
    
    The current code would cause a file like "config.bin" to added to the
    config sources list. I am sure the intention was to add any files with
    defconfig in its name and not the other way around.
    
    Signed-off-by: Gavin Li <gavinli at thegavinli.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 d961901..918d101 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -47,7 +47,7 @@ def find_sccs(d):
         base, ext = os.path.splitext(os.path.basename(s))
         if ext and ext in [".scc", ".cfg"]:
             sources_list.append(s)
-        elif base and base in 'defconfig':
+        elif base and 'defconfig' in base:
             sources_list.append(s)
 
     return sources_list

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list