Patchwork linux-dtb: Ensure dtb files are covered by sstate

login
register
mail settings
Submitter Richard Purdie
Date April 12, 2012, 9:18 a.m.
Message ID <1334222338.31685.26.camel@ted>
Download mbox | patch
Permalink /patch/25653/
State Accepted
Commit 9815b7a95ac33d3234073cdd204d9389b4241189
Headers show

Comments

Richard Purdie - April 12, 2012, 9:18 a.m.
The dtb files were not being installed into a location compatible with sstate and
the do_deploy task. This means in builds just using sstate, the dtb files disappeared.

This patch fixes the code to use the correct location for deploy files.

[YOCTO #2190]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 2f0c918..9188cee 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -17,9 +17,9 @@  do_install_append() {
     if test -n "${KERNEL_DEVICETREE}"; then
 	dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE}
 	install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION}
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb
-	cd ${DEPLOY_DIR_IMAGE}
+	install -d ${DEPLOYDIR}
+	install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb
+	cd ${DEPLOYDIR}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
     fi