diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-29 00:53:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-29 14:01:49 +0100 |
| commit | b5e03a1a17ec95b797258aad26aa129a74bb2b69 (patch) | |
| tree | 256173ce686f4cb0fce9ffb0ec31109f691abecb /meta | |
| parent | 4d041557e7d3c6ff8fa5f2e0abae14839f4be9cf (diff) | |
| download | ast2050-yocto-poky-b5e03a1a17ec95b797258aad26aa129a74bb2b69.zip ast2050-yocto-poky-b5e03a1a17ec95b797258aad26aa129a74bb2b69.tar.gz | |
base/kernel/image.bbclass: Clean up do_deploy ordering to ensure it just happens before a build completes
(From OE-Core rev: a3b80688465ba5ba7e6d514f9a40ee224a9d3a28)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/base.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-tools.inc | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 3009810..4fd8302 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -249,6 +249,7 @@ addtask build after do_populate_sysroot do_build = "" do_build[func] = "1" do_build[noexec] = "1" +do_build[recrdeptask] += "do_deploy" do_build () { : } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index aa842c7..2938e24 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -15,7 +15,7 @@ export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" PACKAGE_INSTALL_ATTEMPTONLY ?= "" # We need to recursively follow RDEPENDS and RRECOMMENDS for images -do_rootfs[recrdeptask] += "do_deploy do_populate_sysroot" +do_rootfs[recrdeptask] += "do_populate_sysroot" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 9f014d4..3107790 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -492,7 +492,7 @@ kernel_do_deploy() { } do_deploy[dirs] = "${DEPLOYDIR} ${B}" -addtask deploy before do_package after do_install +addtask deploy before do_build after do_install EXPORT_FUNCTIONS do_deploy diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc index e42c8e3..2ac74a5 100644 --- a/meta/recipes-kernel/linux/linux-tools.inc +++ b/meta/recipes-kernel/linux/linux-tools.inc @@ -12,7 +12,7 @@ do_install_perf() { # perf tasks addtask compile_perf after do_compile before do_install -addtask install_perf after do_install before do_package do_deploy +addtask install_perf after do_install before do_package do_compile_perf[depends] = "virtual/libc:do_populate_sysroot" do_compile_perf[depends] =+ "elfutils:do_populate_sysroot" |
