From 88c6be81a5fbed098999fbef5576c5e0bb90cc21 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 4 Aug 2019 21:03:06 +0800 Subject: opensbi: handle deploy task under sstate Inherit deploy bbclass and install files to DEPLOYDIR rather than in DEPLOY_DIR_IMAGE. (From OE-Core rev: f03ab9b21c2aeeae0bd020ee94ec9bb1d903500d) Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/recipes-bsp/opensbi/opensbi_0.4.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-bsp/opensbi/opensbi_0.4.bb b/meta/recipes-bsp/opensbi/opensbi_0.4.bb index 068ae762d4..382752895c 100644 --- a/meta/recipes-bsp/opensbi/opensbi_0.4.bb +++ b/meta/recipes-bsp/opensbi/opensbi_0.4.bb @@ -6,7 +6,7 @@ DEPENDS += "dtc-native" require opensbi-payloads.inc -inherit autotools-brokensep +inherit autotools-brokensep deploy SRCREV = "ce228ee0919deb9957192d723eecc8aaae2697c6" SRC_URI = "git://github.com/riscv/opensbi.git \ @@ -35,13 +35,12 @@ do_install_append() { } do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOY_DIR_IMAGE}/ - install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOY_DIR_IMAGE}/ - install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOY_DIR_IMAGE}/ + install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/ + install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/ + install -m 755 ${D}/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ } -addtask deploy after do_install +addtask deploy before do_build after do_install FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" -- cgit 1.2.3-korg