aboutsummaryrefslogtreecommitdiffstats
path: root/meta-extras
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-05 13:25:20 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-19 20:06:25 +0100
commit369920107edd8ae2487d71a324072fcfaba0731e (patch)
tree14aea71394438111dd1eda29db443ce9784aa314 /meta-extras
parent29ca8936493b2044c6926becca0ffcf3747b2528 (diff)
downloadopenembedded-core-contrib-369920107edd8ae2487d71a324072fcfaba0731e.tar.gz
openembedded-core-contrib-369920107edd8ae2487d71a324072fcfaba0731e.tar.bz2
openembedded-core-contrib-369920107edd8ae2487d71a324072fcfaba0731e.zip
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-extras')
-rw-r--r--meta-extras/packages/linux/linux-nokia800.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta-extras/packages/linux/linux-nokia800.inc b/meta-extras/packages/linux/linux-nokia800.inc
index a9505fab5d..540dfbb4c2 100644
--- a/meta-extras/packages/linux/linux-nokia800.inc
+++ b/meta-extras/packages/linux/linux-nokia800.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2"
-inherit kernel
+inherit kernel deploy
RPROVIDES_kernel-image = "hostap-modules"
@@ -34,13 +34,10 @@ do_configure_prepend() {
}
do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
- cd ${DEPLOY_DIR_IMAGE}
+ install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+ cd ${DEPLOYDIR}
ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin
- tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+ tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
}
-do_deploy[dirs] = "${S}"
-
addtask deploy before do_populate_sysroot after do_install