diff options
author | Paul Barker <pbarker@konsulko.com> | 2020-03-09 14:21:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-17 08:29:02 +0100 |
commit | 5b38b8af6afd2765fefb4ca4f3a4b6bcf61a6306 (patch) | |
tree | 983ae6e64f25d9f821c41045b60840db58f5f58a /meta/classes | |
parent | 1ee8c1b72c2816852e13ae430a395c9ab1bac850 (diff) | |
download | poky-5b38b8af6afd2765fefb4ca4f3a4b6bcf61a6306.tar.gz |
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.
(From OE-Core rev: b7ae0fa668be008e46982190553d0738a5465efe)
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 44f04c039a4d61dd18666e42b9b9865cbc3ada9e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index ed9bcfa57c..ab05ac91f4 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | # remove tasks that modify the source tree in case externalsrc is inherited | 1 | # remove tasks that modify the source tree in case externalsrc is inherited |
2 | SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" | 2 | SRCTREECOVEREDTASKS += "do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" |
3 | PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe" | 3 | PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe" |
4 | PATCH_GIT_USER_NAME ?= "OpenEmbedded" | 4 | PATCH_GIT_USER_NAME ?= "OpenEmbedded" |
5 | 5 | ||
@@ -301,6 +301,7 @@ do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" | |||
301 | do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot" | 301 | do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot" |
302 | do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" | 302 | do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" |
303 | do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" | 303 | do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" |
304 | do_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot" | ||
304 | do_kernel_configme[dirs] += "${S} ${B}" | 305 | do_kernel_configme[dirs] += "${S} ${B}" |
305 | do_kernel_configme() { | 306 | do_kernel_configme() { |
306 | set +e | 307 | set +e |