summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Looijmans <mike.looijmans@topic.nl>2013-08-09 12:53:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 23:06:01 +0100
commit5bac0df20117984cb5c9a47c9934c29fa28e972f (patch)
treeb509731e18740f2c70d6d3639a23185433fa58a6
parent693e6a3613c8732c59ef747600549286e7bbdaa9 (diff)
downloadpoky-5bac0df20117984cb5c9a47c9934c29fa28e972f.tar.gz
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. (From OE-Core rev: 0f589b9a38397fdf55025062a45889b19d1c83c4) Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-dtb.inc4
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 7747718391..41dd599cae 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -1,5 +1,5 @@
1# Support for device tree generation 1# Support for device tree generation
2FILES_kernel-devicetree = "/boot/devicetree*" 2FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/devicetree*"
3KERNEL_DEVICETREE_FLAGS ?= "-R 8 -p 0x3000" 3KERNEL_DEVICETREE_FLAGS ?= "-R 8 -p 0x3000"
4 4
5python __anonymous () { 5python __anonymous () {
@@ -22,7 +22,7 @@ do_install_append() {
22 DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` 22 DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
23 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` 23 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
24 dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE} 24 dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE}
25 install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb 25 install -m 0644 ${DTS_BASE_NAME} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb
26 done 26 done
27 fi 27 fi
28} 28}