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/linux/linux-simtec.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/linux/linux-simtec.inc')
-rw-r--r-- | meta/packages/linux/linux-simtec.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/packages/linux/linux-simtec.inc b/meta/packages/linux/linux-simtec.inc index b9a65cc26b..2b7a5cc07d 100644 --- a/meta/packages/linux/linux-simtec.inc +++ b/meta/packages/linux/linux-simtec.inc | |||
@@ -1,5 +1,7 @@ | |||
1 | require linux.inc | 1 | require linux.inc |
2 | 2 | ||
3 | inherit deploy | ||
4 | |||
3 | do_prepdefconfig() { | 5 | do_prepdefconfig() { |
4 | cp ${S}/arch/arm/configs/s3c24xx_simtec_defconfig ${WORKDIR}/defconfig | 6 | cp ${S}/arch/arm/configs/s3c24xx_simtec_defconfig ${WORKDIR}/defconfig |
5 | if test -e ${WORKDIR}/${MACHINE}-defconfig-append; then | 7 | if test -e ${WORKDIR}/${MACHINE}-defconfig-append; then |
@@ -10,13 +12,10 @@ do_prepdefconfig() { | |||
10 | addtask prepdefconfig before do_configure after do_patch | 12 | addtask prepdefconfig before do_configure after do_patch |
11 | 13 | ||
12 | do_deploy() { | 14 | do_deploy() { |
13 | install -d ${DEPLOY_DIR_IMAGE} | 15 | install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin |
14 | install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin | 16 | cd ${DEPLOYDIR} |
15 | cd ${DEPLOY_DIR_IMAGE} | ||
16 | ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin | 17 | ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin |
17 | tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib | 18 | tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib |
18 | } | 19 | } |
19 | 20 | ||
20 | do_deploy[dirs] = "${S}" | ||
21 | |||
22 | addtask deploy before do_populate_sysroot after do_install | 21 | addtask deploy before do_populate_sysroot after do_install |