From: Martin Jansa Date: Mon, 23 Nov 2009 10:29:05 +0000 (+0100) Subject: kernel.bbclass, linux.inc: move do_deploy task after do_package X-Git-Tag: Release-2010-05/1~1648^2~29 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55e9a527a8c9823044196d031f2da2783ff8f35;p=openembedded.git 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 --- diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 82719ac22c..dedd5a6962 100644 --- 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 044d4130c5..0cce833694 100644 --- 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