From 5411bbcdb5f8be99bab979acbdead88275827dbb Mon Sep 17 00:00:00 2001 From: Xufeng Zhang Date: Fri, 1 Nov 2013 12:25:17 +0800 Subject: [PATCH] kernel.bbclass: Delay rm_work to run after do_bundle_initramfs 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 make do_bundle_initramfs task run before do_rm_work task. [YOCTO #5416] (From OE-Core master rev: 8308e22a44a2dea7d1bbfb429b9df9c63714a649) (From OE-Core rev: fef443f1c40a3847cac08f4885d046acf6ede023) Signed-off-by: Martin Jansa Signed-off-by: Xufeng Zhang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index f40ea8985d..1374e68d1a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -152,7 +152,7 @@ python do_devshell_prepend () { os.environ["LDFLAGS"] = '' } -addtask bundle_initramfs after do_compile +addtask bundle_initramfs after do_compile before do_build kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE