On Tue, 2017-10-17 at 17:56 +0100, Burton, Ross wrote: > Is this *only* for Pyro or should it be applied to master too?
I've posted backport requests from master to pyro recently which touch similar locations. Can those be applied first please. Namely... > On 17 October 2017 at 17:54, Thomas Perrot <[email protected]> wrote: > > > - Bad image type replacement for aarch64 > > - Fix DTB path in fitimage.its > > - Ignore fitImage type during the packaging of the initramfs > > > > Signed-off-by: Thomas Perrot <[email protected]> > > --- > > meta/classes/kernel-fitimage.bbclass | 6 +++++- > > meta/classes/kernel.bbclass | 4 +++- > > 2 files changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel- > > fitimage.bbclass > > index 2630b47316..abbc309b09 100644 > > --- a/meta/classes/kernel-fitimage.bbclass > > +++ b/meta/classes/kernel-fitimage.bbclass > > @@ -7,8 +7,11 @@ python __anonymous () { > > depends = "%s u-boot-mkimage-native dtc-native" % depends > > d.setVar("DEPENDS", depends) > > > > - if d.getVar("UBOOT_ARCH") == "x86": > > + uarch = d.getVar("UBOOT_ARCH") > > + if uarch == "x86": > > replacementtype = "bzImage" > > + elif uarch == "arm64": > > + replacementtype = "Image" > > else: > > replacementtype = "zImage" here > > > > @@ -351,6 +354,7 @@ fitimage_assemble() { > > DTB_PATH="arch/${ARCH}/boot/${DTB}" > > fi > > > > + DTB=$(echo "${DTB}" | tr '/' '_') > > DTBS="${DTBS} ${DTB}" > > fitimage_emit_section_dtb ${1} ${DTB} > > ${DTB_PATH} > > done and here. Cheers, Andre' > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > > index ce2cab65ae..a8b0d0a061 100644 > > --- a/meta/classes/kernel.bbclass > > +++ b/meta/classes/kernel.bbclass > > @@ -219,7 +219,9 @@ do_bundle_initramfs () { > > # Backing up kernel image relies on its type(regular > > file > > or symbolic link) > > tmp_path="" > > for type in ${KERNEL_IMAGETYPES} ; do > > - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then > > + if [ "$type" == "fitImage" ] ; then > > + continue > > + elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then > > linkpath=`readlink -n > > ${KERNEL_OUTPUT_DIR}/$type` > > realpath=`readlink -fn > > ${KERNEL_OUTPUT_DIR}/$type` > > mv -f $realpath $realpath.bak > > -- > > 2.13.6 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > [email protected] > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
