deploy.bbclass: use new style staging for deploy tasks

All tasks which implement a do_deploy should inherit this class to have the
changes in the deploy task staged.

Update recipes which include a do_deploy function to inherit this class and
to use DEPLOYDIR rather than DEPLOY_DIR_IMAGE.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/meta/packages/uboot/u-boot.inc b/meta/packages/uboot/u-boot.inc
index 3e926a4ea6..889f6215ed 100644
--- a/meta/packages/uboot/u-boot.inc
+++ b/meta/packages/uboot/u-boot.inc
@@ -5,6 +5,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 PROVIDES = "virtual/bootloader"
 
+inherit deploy
+
 PARALLEL_MAKE=""
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
@@ -22,16 +24,12 @@ do_compile () {
 }
 
 do_deploy () {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+        install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
 
-        cd ${DEPLOY_DIR_IMAGE}
+        cd ${DEPLOYDIR}
         rm -f ${UBOOT_SYMLINK}
         ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}
 }
-do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
 
 do_install() {