summaryrefslogtreecommitdiffabout
diff options
context:
space:
mode:
authorXufeng Zhang <xufeng.zhang@windriver.com>2013-11-01 04:25:17 (GMT)
committer Saul Wold <sgw@linux.intel.com>2013-11-04 18:01:17 (GMT)
commit8308e22a44a2dea7d1bbfb429b9df9c63714a649 (patch)
tree41a27b1348821bbf83377d00135ce966e6539034
parent212471f81d210e596798db5e5d927418090a63a2 (diff)
downloadopenembedded-core-contrib-8308e22a44a2dea7d1bbfb429b9df9c63714a649.zip
openembedded-core-contrib-8308e22a44a2dea7d1bbfb429b9df9c63714a649.tar.gz
openembedded-core-contrib-8308e22a44a2dea7d1bbfb429b9df9c63714a649.tar.bz2
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@gmail.com> Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
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