<div dir="ltr">Is this *only* for Pyro or should it be applied to master too?<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 17 October 2017 at 17:54, Thomas Perrot <span dir="ltr">&lt;<a href="mailto:thomas.perrot@tupi.fr" target="_blank">thomas.perrot@tupi.fr</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">- Bad image type replacement for aarch64<br>
- Fix DTB path in fitimage.its<br>
- Ignore fitImage type during the packaging of the initramfs<br>
<br>
Signed-off-by: Thomas Perrot &lt;<a href="mailto:thomas.perrot@tupi.fr">thomas.perrot@tupi.fr</a>&gt;<br>
---<br>
 meta/classes/kernel-fitimage.<wbr>bbclass | 6 +++++-<br>
 meta/classes/kernel.bbclass          | 4 +++-<br>
 2 files changed, 8 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/meta/classes/kernel-<wbr>fitimage.bbclass b/meta/classes/kernel-<wbr>fitimage.bbclass<br>
index 2630b47316..abbc309b09 100644<br>
--- a/meta/classes/kernel-<wbr>fitimage.bbclass<br>
+++ b/meta/classes/kernel-<wbr>fitimage.bbclass<br>
@@ -7,8 +7,11 @@ python __anonymous () {<br>
         depends = &quot;%s u-boot-mkimage-native dtc-native&quot; % depends<br>
         d.setVar(&quot;DEPENDS&quot;, depends)<br>
<br>
-        if d.getVar(&quot;UBOOT_ARCH&quot;) == &quot;x86&quot;:<br>
+        uarch = d.getVar(&quot;UBOOT_ARCH&quot;)<br>
+        if uarch == &quot;x86&quot;:<br>
             replacementtype = &quot;bzImage&quot;<br>
+        elif uarch == &quot;arm64&quot;:<br>
+            replacementtype = &quot;Image&quot;<br>
         else:<br>
             replacementtype = &quot;zImage&quot;<br>
<br>
@@ -351,6 +354,7 @@ fitimage_assemble() {<br>
                                DTB_PATH=&quot;arch/${ARCH}/boot/${<wbr>DTB}&quot;<br>
                        fi<br>
<br>
+                       DTB=$(echo &quot;${DTB}&quot; | tr &#39;/&#39; &#39;_&#39;)<br>
                        DTBS=&quot;${DTBS} ${DTB}&quot;<br>
                        fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}<br>
                done<br>
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass<br>
index ce2cab65ae..a8b0d0a061 100644<br>
--- a/meta/classes/kernel.bbclass<br>
+++ b/meta/classes/kernel.bbclass<br>
@@ -219,7 +219,9 @@ do_bundle_initramfs () {<br>
                # Backing up kernel image relies on its type(regular file or symbolic link)<br>
                tmp_path=&quot;&quot;<br>
                for type in ${KERNEL_IMAGETYPES} ; do<br>
-                       if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then<br>
+                       if [ &quot;$type&quot; == &quot;fitImage&quot; ] ; then<br>
+                               continue<br>
+                       elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then<br>
                                linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$type`<br>
                                realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$type`<br>
                                mv -f $realpath $realpath.bak<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.13.6<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>