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>
This commit is contained in:
parent
4d041557e7
commit
b5e03a1a17
|
@ -249,6 +249,7 @@ addtask build after do_populate_sysroot
|
||||||
do_build = ""
|
do_build = ""
|
||||||
do_build[func] = "1"
|
do_build[func] = "1"
|
||||||
do_build[noexec] = "1"
|
do_build[noexec] = "1"
|
||||||
|
do_build[recrdeptask] += "do_deploy"
|
||||||
do_build () {
|
do_build () {
|
||||||
:
|
:
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
|
||||||
PACKAGE_INSTALL_ATTEMPTONLY ?= ""
|
PACKAGE_INSTALL_ATTEMPTONLY ?= ""
|
||||||
|
|
||||||
# We need to recursively follow RDEPENDS and RRECOMMENDS for images
|
# 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.
|
# Images are generally built explicitly, do not need to be part of world.
|
||||||
EXCLUDE_FROM_WORLD = "1"
|
EXCLUDE_FROM_WORLD = "1"
|
||||||
|
|
|
@ -492,7 +492,7 @@ kernel_do_deploy() {
|
||||||
}
|
}
|
||||||
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
|
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
|
EXPORT_FUNCTIONS do_deploy
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ do_install_perf() {
|
||||||
|
|
||||||
# perf tasks
|
# perf tasks
|
||||||
addtask compile_perf after do_compile before do_install
|
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] = "virtual/libc:do_populate_sysroot"
|
||||||
do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
|
do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
|
||||||
|
|
Loading…
Reference in New Issue