[OE-core] [PATCH] kernel.bbclass: Delay rm_work to run after do_bundle_initramfs

[Xufeng Zhang]

From: "Signed-off-by: Xufeng Zhang" <xufeng.zhang at windriver.com>

Since kernel will build twice when we are trying to bundle kernel
and initramfs together after commit 609d5a9ab("kernel.bbclass,
image.bbclass: Implement kernel INITRAMFS dependency and bundling"),
thus, the second building for kernel would fail if rm_work is done
previously.

To fix this problem, we need to delay the rm_work task for kernel
to run after do_bundle_initramfs task.

[YOCTO #5416]

Signed-off-by: Xufeng Zhang <xufeng.zhang at windriver.com>
---
 meta/classes/kernel.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index dedfab7..6154df0 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -29,6 +29,9 @@ python __anonymous () {
     image_task = d.getVar('INITRAMFS_TASK', True)
     if image_task:
         d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
+
+    if image or image_task:
+        d.appendVarFlag('do_rm_work', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN', True))
 }
 
 inherit kernel-arch deploy
-- 
1.8.3.3