diff options
author | Xufeng Zhang <xufeng.zhang@windriver.com> | 2013-11-01 12:25:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:14 +0000 |
commit | 5411bbcdb5f8be99bab979acbdead88275827dbb (patch) | |
tree | 9f47f3040f9e25045bddcba557e284bfd1084f9c | |
parent | 94025c05b5d1c01d4c4e5b9509340a513220b15b (diff) | |
download | poky-5411bbcdb5f8be99bab979acbdead88275827dbb.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
152 | os.environ["LDFLAGS"] = '' | 152 | os.environ["LDFLAGS"] = '' |
153 | } | 153 | } |
154 | 154 | ||
155 | addtask bundle_initramfs after do_compile | 155 | addtask bundle_initramfs after do_compile before do_build |
156 | 156 | ||
157 | kernel_do_compile() { | 157 | kernel_do_compile() { |
158 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 158 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |