[OE-core] [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

[Thomas PERROT]

Hi,

It is an issue with the fitImage generation when UBOOT_SIGN_ENABLE is
enabled, unrelated to extlinux.

I just update the commit message and push a v3 of this patch.

Best regards,
Thomas P.



On Tue, Oct 24, 2017 at 10:08 AM, André Draszik <git at andred.net> wrote:

> Hi,
>
> On Mon, 2017-10-23 at 18:23 +0200, Thomas Perrot wrote:
> > Signed-off-by: Thomas Perrot <thomas.perrot at tupi.fr>
>
> Your commit message doesn't explain what problem you're trying to solve.
>
> I can only guess that it's the same as this:
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142619.html
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142621.html
>
> ? If so, just submit requests for backporting, or explain why this doesn't
> work in pyro.
>
>
> > ---
> >  meta/classes/kernel-fitimage.bbclass |  2 +-
> >  meta/classes/uboot-sign.bbclass      | 21 +++++++++------------
> >  2 files changed, 10 insertions(+), 13 deletions(-)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> > fitimage.bbclass
> > index abbc309b09..5ad439e82d 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -31,7 +31,7 @@ python __anonymous () {
> >          # the fitImage:
> >          if d.getVar('UBOOT_SIGN_ENABLE') == "1":
> >              uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or
> 'u-boot'
> > -            d.appendVarFlag('do_assemble_fitimage', 'depends', '
> > %s:do_deploy' % uboot_pn)
> > +            d.appendVarFlag('do_assemble_fitimage', 'depends', '
> > %s:do_deploy_dtb' % uboot_pn)
>
> You should also update the description of the executed tasks at the top of
> uboot-sign.bbclass if you're changing this.
>
> Cheers,
> Andre'
>
>
> >  }
> >
> >  # Options for the device tree compiler passed to mkimage '-D' feature:
> > diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-
> > sign.bbclass
> > index 8ee904e7df..2f616bf2a9 100644
> > --- a/meta/classes/uboot-sign.bbclass
> > +++ b/meta/classes/uboot-sign.bbclass
> > @@ -47,16 +47,14 @@ do_deploy_dtb () {
> >       cd ${DEPLOYDIR}
> >
> >       if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
> > -             install ${B}/${UBOOT_DTB_BINARY}
> > ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> > -             rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
> > -             ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
> > -             ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
> > +             install ${B}/${UBOOT_DTB_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > +             ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
> > +             ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
> >       fi
> >       if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
> > -             install ${B}/${UBOOT_NODTB_BINARY}
> > ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
> > -             rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
> > -             ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
> > -             ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
> > +             install ${B}/${UBOOT_NODTB_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > +             ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
> > +             ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
> >       fi
> >  }
> >
> > @@ -70,11 +68,10 @@ do_concat_dtb () {
> >                       oe_runmake
> > EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> >                       install ${B}/${UBOOT_BINARY}
> > ${DEPLOYDIR}/${UBOOT_IMAGE}
> >                       install ${B}/${UBOOT_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
> > -             elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e
> > "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
> > -                     cd ${DEPLOYDIR}
> > -                     cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee
> > ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
> > +             elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a
> > -e "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
> > +                     cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} >
> > ${UBOOT_IMAGE}
> >               else
> > -                     bbwarn "Failure while adding public key to u-boot
> > binary. Verified boot won't be available."
> > +                     bbfatal "Failure while adding public key to u-
> > boot binary. Verified boot won't be available."
> >               fi
> >       fi
> >  }
> > --
> > 2.13.6
> >
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20171025/0d9d5034/attachment-0002.html>