From 369920107edd8ae2487d71a324072fcfaba0731e Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 5 Aug 2010 13:25:20 +0000 Subject: 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 --- meta/packages/x-load/x-load.inc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'meta/packages/x-load/x-load.inc') diff --git a/meta/packages/x-load/x-load.inc b/meta/packages/x-load/x-load.inc index 01db413b1..7073b13fe 100644 --- a/meta/packages/x-load/x-load.inc +++ b/meta/packages/x-load/x-load.inc @@ -3,6 +3,8 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" +inherit deploy + DEPENDS = "signgp-native" PARALLEL_MAKE="" @@ -27,20 +29,14 @@ do_compile () { do_deploy () { signGP ${S}/x-load.bin - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} - install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE} - cd ${DEPLOY_DIR_IMAGE} + cd ${DEPLOYDIR} rm -f ${XLOAD_SYMLINK} ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} rm -f ${MLO_SYMLINK} ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_SYMLINK} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK} } -do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile -- cgit v1.2.3