[oe-commits] Xufeng Zhang : kernel.bbclass: Delay rm_work to run after do_bundle_initramfs
git at git.openembedded.org
git at git.openembedded.org
Fri Nov 8 17:26:26 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 8308e22a44a2dea7d1bbfb429b9df9c63714a649
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8308e22a44a2dea7d1bbfb429b9df9c63714a649
Author: Xufeng Zhang <xufeng.zhang at windriver.com>
Date: Fri Nov 1 12:25:17 2013 +0800
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]
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Xufeng Zhang <xufeng.zhang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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 dedfab7..a4db9f5 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
More information about the Openembedded-commits
mailing list