<div dir="ltr"><div>Sorry, there is a bad copy/paste into this patch, I just pushed a version 2.</div><div><br></div><div><span id="m_2659944830119045434gmail-result_box" class="m_2659944830119045434gmail-short_text" lang="en"><span>Still sorry for my mistake</span></span></div><div><br></div><div>Thomas P.<br></div><br>On Mon, Oct 23, 2017 at 5:59 PM, Thomas Perrot <span dir="ltr">&lt;<a href="mailto:thomas.perrot@tupi.fr" target="_blank">thomas.perrot@tupi.fr</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Thomas Perrot &lt;<a href="mailto:thomas.perrot@tupi.fr" target="_blank">thomas.perrot@tupi.fr</a>&gt;<br>
---<br>
 meta/classes/kernel-fitimage.<wbr>bbclass |  2 +-<br>
 meta/classes/uboot-sign.bbcla<wbr>ss      | 21 +++++++++------------<br>
 2 files changed, 10 insertions(+), 13 deletions(-)<br>
<br>
diff --git a/meta/classes/kernel-fitimage<wbr>.bbclass b/meta/classes/kernel-fitimage<wbr>.bbclass<br>
index abbc309b09..5ad439e82d 100644<br>
--- a/meta/classes/kernel-fitimage<wbr>.bbclass<br>
+++ b/meta/classes/kernel-fitimage<wbr>.bbclass<br>
@@ -31,7 +31,7 @@ python __anonymous () {<br>
         # the fitImage:<br>
         if d.getVar(&#39;UBOOT_SIGN_ENABLE&#39;) == &quot;1&quot;:<br>
             uboot_pn = d.getVar(&#39;PREFERRED_PROVIDER_u<wbr>-boot&#39;) or &#39;u-boot&#39;<br>
-            d.appendVarFlag(&#39;do_assemble_f<wbr>itimage&#39;, &#39;depends&#39;, &#39; %s:do_deploy&#39; % uboot_pn)<br>
+            d.appendVarFlag(&#39;do_assemble_f<wbr>itimage&#39;, &#39;depends&#39;, &#39; %s:do_deploy_dtb&#39; % uboot_pn)<br>
 }<br>
<br>
 # Options for the device tree compiler passed to mkimage &#39;-D&#39; feature:<br>
diff --git a/meta/classes/uboot-sign.bbcl<wbr>ass b/meta/classes/uboot-sign.bbcl<wbr>ass<br>
index 8ee904e7df..86d531abc4 100644<br>
--- a/meta/classes/uboot-sign.bbcl<wbr>ass<br>
+++ b/meta/classes/uboot-sign.bbcl<wbr>ass<br>
@@ -47,16 +47,14 @@ do_deploy_dtb () {<br>
        cd ${DEPLOYDIR}<br>
<br>
        if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then<br>
-               install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE<wbr>}<br>
-               rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}<br>
-               ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}<br>
-               ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}<br>
+               install ${B}/${UBOOT_DTB_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_IMAGE}<br>
+               ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_SYMLINK}<br>
+               ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_BINARY}<br>
        fi<br>
        if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then<br>
-               install ${B}/${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMA<wbr>GE}<br>
-               rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}<br>
-               ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}<br>
-               ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}<br>
+               install ${B}/${UBOOT_DTB_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_IMAGE}<br>
+               ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_SYMLINK}<br>
+               ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_BINARY}<br>
        fi<br>
 }<br>
<br>
@@ -70,11 +68,10 @@ do_concat_dtb () {<br>
                        oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_D<wbr>TB_IMAGE}<br>
                        install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}<br>
                        install ${B}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IM<wbr>AGE}<br>
-               elif [ -e &quot;${DEPLOYDIR}/${UBOOT_NODTB_IM<wbr>AGE}&quot; -a -e &quot;${DEPLOYDIR}/${UBOOT_DTB_IMAG<wbr>E}&quot; ]; then<br>
-                       cd ${DEPLOYDIR}<br>
-                       cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} &gt; ${UBOOT_IMAGE}<br>
+               elif [ -e &quot;${DEPLOY_DIR_IMAGE}/${UBOOT_N<wbr>ODTB_IMAGE}&quot; -a -e &quot;${DEPLOY_DIR_IMAGE}/${UBOOT_D<wbr>TB_IMAGE}&quot; ]; then<br>
+                       cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NO<wbr>DTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DT<wbr>B_IMAGE} | tee ${B}/${UBOOT_BINARY} &gt; ${UBOOT_IMAGE}<br>
                else<br>
-                       bbwarn &quot;Failure while adding public key to u-boot binary. Verified boot won&#39;t be available.&quot;<br>
+                       bbfatal &quot;Failure while adding public key to u-boot binary. Verified boot won&#39;t be available.&quot;<br>
                fi<br>
        fi<br>
 }<br>
<span class="m_2659944830119045434gmail-HOEnZb"><font color="#888888">--<br>
2.13.6<br>
<br>
</font></span></blockquote></div><br></div></div>