[oe-commits] Mike Looijmans : linux-dtb.inc: Replace /boot/ with /${KERNEL_IMAGEDEST}/

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 0f589b9a38397fdf55025062a45889b19d1c83c4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0f589b9a38397fdf55025062a45889b19d1c83c4

Author: Mike Looijmans <mike.looijmans at topic.nl>
Date:   Fri Aug  9 12:53:39 2013 +0200

linux-dtb.inc: Replace /boot/ with /${KERNEL_IMAGEDEST}/

Devicetree files were installed hard-coded in /boot. When KERNEL_IMAGEDEST
is anything else but "boot", the postinstall script and the file locations
no longer match and the postinstall will fail.

Replace "boot" with "${KERNEL_IMAGEDEST}" to fix this problem, and to allow
the devicetree files to be installed in another location.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-kernel/linux/linux-dtb.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 7747718..41dd599 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -1,5 +1,5 @@
 # Support for device tree generation
-FILES_kernel-devicetree = "/boot/devicetree*"
+FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/devicetree*"
 KERNEL_DEVICETREE_FLAGS ?= "-R 8 -p 0x3000"
 
 python __anonymous () {
@@ -22,7 +22,7 @@ do_install_append() {
 			DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
 			DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
 			dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE}
-			install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb
+			install -m 0644 ${DTS_BASE_NAME} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb
 		done
 	fi
 }