diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-08-05 13:25:20 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-19 20:06:25 +0100 |
commit | 369920107edd8ae2487d71a324072fcfaba0731e (patch) | |
tree | 14aea71394438111dd1eda29db443ce9784aa314 /meta/packages/x-load/x-load.inc | |
parent | 29ca8936493b2044c6926becca0ffcf3747b2528 (diff) | |
download | poky-369920107edd8ae2487d71a324072fcfaba0731e.tar.gz |
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>
Diffstat (limited to 'meta/packages/x-load/x-load.inc')
-rw-r--r-- | meta/packages/x-load/x-load.inc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/packages/x-load/x-load.inc b/meta/packages/x-load/x-load.inc index 01db413b12..7073b13fe7 100644 --- a/meta/packages/x-load/x-load.inc +++ b/meta/packages/x-load/x-load.inc | |||
@@ -3,6 +3,8 @@ SECTION = "bootloaders" | |||
3 | PRIORITY = "optional" | 3 | PRIORITY = "optional" |
4 | LICENSE = "GPL" | 4 | LICENSE = "GPL" |
5 | 5 | ||
6 | inherit deploy | ||
7 | |||
6 | DEPENDS = "signgp-native" | 8 | DEPENDS = "signgp-native" |
7 | 9 | ||
8 | PARALLEL_MAKE="" | 10 | PARALLEL_MAKE="" |
@@ -27,20 +29,14 @@ do_compile () { | |||
27 | 29 | ||
28 | do_deploy () { | 30 | do_deploy () { |
29 | signGP ${S}/x-load.bin | 31 | signGP ${S}/x-load.bin |
30 | install -d ${DEPLOY_DIR_IMAGE} | 32 | install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE} |
31 | install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} | 33 | install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE} |
32 | install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} | ||
33 | package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} | ||
34 | package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} | ||
35 | 34 | ||
36 | cd ${DEPLOY_DIR_IMAGE} | 35 | cd ${DEPLOYDIR} |
37 | rm -f ${XLOAD_SYMLINK} | 36 | rm -f ${XLOAD_SYMLINK} |
38 | ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} | 37 | ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} |
39 | rm -f ${MLO_SYMLINK} | 38 | rm -f ${MLO_SYMLINK} |
40 | ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} | 39 | ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} |
41 | package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_SYMLINK} | ||
42 | package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK} | ||
43 | } | 40 | } |
44 | do_deploy[dirs] = "${S}" | ||
45 | addtask deploy before do_build after do_compile | 41 | addtask deploy before do_build after do_compile |
46 | 42 | ||