[OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage generation

[Denys Dmytriyenko]

On Tue, Oct 17, 2017 at 09:35:12PM +0000, Manjukumar Harthikote Matha wrote:
> Hi Denys,
> 
> > -----Original Message-----
> > From: openembedded-core-bounces at lists.openembedded.org
> > [mailto:openembedded-core-bounces at lists.openembedded.org] On Behalf Of
> > Denys Dmytriyenko
> > Sent: Tuesday, October 17, 2017 12:09 PM
> > To: Thomas Perrot <thomas.perrot at tupi.fr>
> > Cc: openembedded-core at lists.openembedded.org
> > Subject: Re: [OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage
> > generation
> > 
> > On Tue, Oct 17, 2017 at 06:54:24PM +0200, Thomas Perrot wrote:
> > > - Bad image type replacement for aarch64
> > > - Fix DTB path in fitimage.its
> > 
> > I've seen the above 2 fixes before, but they never made it.
> > 
> > 
> > > - Ignore fitImage type during the packaging of the initramfs
> > 
> > Can you please explain this one a bit more?
> > 
> > And in general, commit message should rather explain "why" and not "what"
> > 
> I see this behavior:
> https://lists.yoctoproject.org/pipermail/yocto/2017-October/038438.html
> 
> When you build using initramfs and fitimage, we see a failure in kernel deploy.

Please provide any relevant logs for the failure.


> I think we need even fixes to deploy class as well.
> 
> 
> Thanks,
> Manju
> 
> > 
> > > Signed-off-by: Thomas Perrot <thomas.perrot at tupi.fr>
> > > ---
> > >  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"
> > >
> > > @@ -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
> > > 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
> > > Openembedded-core at lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>