bcm2835-bootfiles: Use deploy as it should be used

Change-Id: Ia90f01e037286647fdfafdd54ccb47c1ad9cbab2
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>

1 files changed, 20 insertions, 14 deletions

diff --git a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
index 36cbcf5..9751f95 100644
--- a/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
+++ b/recipes-bcm/bootfiles/bcm2835-bootfiles.bb
@@ -3,6 +3,8 @@ LICENSE = "Proprietary"
 
 LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=e86e693d19572ee64cc8b17fb062faa9"
 
+inherit deploy
+
 include ../common/firmware.inc
 
 RDEPENDS_${PN} = "rpi-config"
@@ -13,21 +15,25 @@ S = "${RPIFW_S}/boot"
 
 PR = "r3"
 
-addtask deploy before do_package after do_install
-
 do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-        for i in *.elf ; do
-                cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-        done
-        for i in *.dat ; do
-                cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-        done
-        for i in *.bin ; do
-                cp $i ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
-        done
-        # Add stamp in deploy directory
-        touch ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/${PN}-${PV}.stamp
+    install -d ${DEPLOYDIR}/${PN}
+
+    for i in ${S}/*.elf ; do
+        cp $i ${DEPLOYDIR}/${PN}
+    done
+    for i in ${S}/*.dat ; do
+        cp $i ${DEPLOYDIR}/${PN}
+    done
+    for i in ${S}/*.bin ; do
+        cp $i ${DEPLOYDIR}/${PN}
+    done
+
+    # Add stamp in deploy directory
+    touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp
 }
 
+addtask deploy before do_package after do_install
+do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
+