[oe-commits] org.oe.dev linux.inc: optionally generate a kernel-devicetree package

[jeremy_laine commit]

linux.inc: optionally generate a kernel-devicetree package
 * if KERNEL_DEVICETREE is set, the devicetree will get shipped in a package
   called "kernel-devicetree" as /boot/devicetree-${KERNEL_VERSION}

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 1abf45060969a10bc56fc8dfaf8fdc87df3b3dfa
ViewMTN: http://monotone.openembedded.org/revision/info/1abf45060969a10bc56fc8dfaf8fdc87df3b3dfa
Files:
1
packages/linux/linux.inc
Diffs:

#
# mt diff -r48c629fa97cc4e39439c32f7846e8bb8fe604e64 -r1abf45060969a10bc56fc8dfaf8fdc87df3b3dfa
#
#
#
# patch "packages/linux/linux.inc"
#  from [2d4e2851e31c00ffa8a1225499423c951b36971d]
#    to [84e23d6654d03f41189dedbe431e5923276dbe6e]
#
============================================================
--- packages/linux/linux.inc	2d4e2851e31c00ffa8a1225499423c951b36971d
+++ packages/linux/linux.inc	84e23d6654d03f41189dedbe431e5923276dbe6e
@@ -20,6 +20,8 @@ CMDLINE_append = " ${CMDLINE_DEBUG} "
 
 # Support for binary device tree generation
 
+FILES_kernel-devicetree = "/boot/devicetree*"
+
 KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
 KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts"
 KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
@@ -35,8 +37,9 @@ python __anonymous () {
     devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
     if devicetree:
     	depends = bb.data.getVar("DEPENDS", d, 1)
-    	depends = "%s dtc-native" % depends
-    	bb.data.setVar("DEPENDS", depends, d)
+    	bb.data.setVar("DEPENDS", "%s dtc-native" % depends, d)
+    	packages = bb.data.getVar("PACKAGES", d, 1)
+    	bb.data.setVar("PACKAGES", "%s kernel-devicetree" % packages, d)
 }
 
 do_configure_prepend() {
@@ -128,13 +131,14 @@ do_devicetree_image() {
 }
 
 do_devicetree_image() {
-        if test -n "${KERNEL_DEVICETREE}" ; then
-            dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
+    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 -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb
+        cd ${DEPLOY_DIR_IMAGE}
+        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+    fi
 }
 
 addtask devicetree_image after do_deploy before do_package