kernel.bbclass, linux.inc: move do_deploy task after do_package

* Move do_deploy after do_package in kernel.bbclass as RP said
* Move devicetree_image before do_deploy in linux.inc, because
  it creates dependency loop if its between after do_package
  and before do_deploy.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 82719ac22c35aeb7f4b85ff7a10b9ff488d83d10..dedd5a696296380e865ae587b716a5f892a17329 100644 (file)
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -540,4 +540,4 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 do_deploy[depends] += "fakeroot-native:do_populate_staging"
 
-addtask deploy before do_package after do_install
+addtask deploy after do_package

diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index 044d4130c5929c58736d3cef4420029e9116a24c..0cce8336940c40b4a2436b89f631143328fdc0ba 100644 (file)
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -169,7 +169,7 @@ do_devicetree_image() {
     fi
 }
 
-addtask devicetree_image after do_deploy before do_package
+addtask devicetree_image after do_install before do_package do_deploy
 
 pkg_postinst_kernel-devicetree () {
        cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true