[oe-commits] [openembedded-core] 05/06: kernel-yocto.bbclass: Support config fragments with externalsrc

[git at git.openembedded.org]

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 3e72ed833d0a0a9167ba6271a050a347980ca65f
Author: Paul Barker <pbarker at konsulko.com>
AuthorDate: Mon Mar 9 14:21:39 2020 +0000

    kernel-yocto.bbclass: Support config fragments with externalsrc
    
    The merging of config fragments is performend in the do_kernel_configme
    task and so config fragments will not be supported when this task is
    removed from the dependency tree.
    
    kernel-yocto adds additional tasks which may modify the source directory
    to SRCTREECOVEREDTASKS so that they are removed when using externalsrc.
    However, do_kernel_configme should be safe to use, the only modification
    to the source tree is the potential creation of the '.kernel-meta'
    directory and the '.metadir' file.
    
    Signed-off-by: Paul Barker <pbarker at konsulko.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-yocto.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d71ce21..6792c9a 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -1,5 +1,5 @@
 # remove tasks that modify the source tree in case externalsrc is inherited
-SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch"
+SRCTREECOVEREDTASKS += "do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch"
 PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe"
 PATCH_GIT_USER_NAME ?= "OpenEmbedded"
 
@@ -325,6 +325,7 @@ do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot"
 do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
 do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
+do_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot"
 do_kernel_configme[dirs] += "${S} ${B}"
 do_kernel_configme() {
 	# translate the kconfig_mode into something that merge_config.sh

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