diff options
| author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-03-30 15:20:13 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 23:22:12 +0100 |
| commit | 5e3a636b20f3bdb62d78a2ec6978b4ae0eb8b51b (patch) | |
| tree | 67b2a2337eecdc52a9a3d3ebfd197f24632f8431 | |
| parent | 0ffc7b8d2e72265a5a206cd3229112566d96d2f9 (diff) | |
| download | poky-5e3a636b20f3bdb62d78a2ec6978b4ae0eb8b51b.tar.gz | |
kernel.bbclass: move in addtask kernel_link_images statement from linux-yocto.inc
Add kernel_link_images task in kernel.bbclass instead of adding it in
linux-yocto.inc, or else the recipes inheriting kernel.bbclass might
run into implicit dependency issues.
(From OE-Core rev: 3211d43d80f69d9c200a0e4f90fd37736046aafe)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel.bbclass | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index b7f5fce360..8954b28b2c 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
| @@ -539,6 +539,7 @@ do_kernel_link_images() { | |||
| 539 | ln -sf ../../../vmlinuz.bin | 539 | ln -sf ../../../vmlinuz.bin |
| 540 | fi | 540 | fi |
| 541 | } | 541 | } |
| 542 | addtask kernel_link_images after do_compile before do_strip | ||
| 542 | 543 | ||
| 543 | do_strip() { | 544 | do_strip() { |
| 544 | if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then | 545 | if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 556546f1e7..637506a2a8 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
| @@ -65,6 +65,5 @@ do_install_append(){ | |||
| 65 | 65 | ||
| 66 | # extra tasks | 66 | # extra tasks |
| 67 | addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile | 67 | addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile |
| 68 | addtask kernel_link_images after do_compile before do_strip | ||
| 69 | addtask validate_branches before do_patch after do_kernel_checkout | 68 | addtask validate_branches before do_patch after do_kernel_checkout |
| 70 | addtask kernel_configcheck after do_configure before do_compile | 69 | addtask kernel_configcheck after do_configure before do_compile |
