[yocto] [denzil-next BREAKAGE] Silent breakage in denzil-next --- uImage*.dts no longer generated

[Leon Woestenberg]

Hello Scott,

I tested your denzil-next branch but found breakage that will not fail the
(auto) build.

poky-contrib.git$ git branch
  master
* sgarman/denzil-next
poky-contrib.git$ git log -n1
commit 6a7d4c7dfc574669ea2eeacede1b74e2f55c4675

I'm hitting the "Warning: ${DTS_FILE} is not available!" case.

I'll follow-up later. This was just a heads up that even if the autobuilds
succeed, I would consider this failing.


This is the probable related diff between denzil and denzil-next, I think
fully from commit a40d795e (Zhenhua Luo).
meta/recipes-kernel/linux/linux-dtb.inc:


+++ poky-contrib.git/meta/recipes-kernel/linux/linux-dtb.inc    2012-08-01
12:03:42.502612844 +0200
@@ -15,13 +15,35 @@

 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 ${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
+        for DTS_FILE in ${KERNEL_DEVICETREE}; do
+            if [ ! -f ${DTS_FILE} ]; then
+                echo "Warning: ${DTS_FILE} is not available!"
+                continue
+            fi
+            DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+            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
+        done
     fi
 }

+do_deploy_append() {
+    if test -n "${KERNEL_DEVICETREE}"; then
+        for DTS_FILE in ${KERNEL_DEVICETREE}; do
+            if [ ! -f ${DTS_FILE} ]; then
+                echo "Warning: ${DTS_FILE} is not available!"
+                continue
+            fi
+            DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+            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"`
+            install -d ${DEPLOYDIR}
+            install -m 0644 ${B}/${DTS_BASE_NAME}
${DEPLOYDIR}/${DTB_NAME}.dtb
+            cd ${DEPLOYDIR}
+            ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
+            cd -
+        done
+    fi
+}


Regards,

Leon.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20120801/b26c42d0/attachment.html>