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

Thomas PERROT thomas.perrot at tupi.fr
Mon Oct 23 16:30:02 UTC 2017


Sorry, there is a bad copy/paste into this patch, I just pushed a version 2.

Still sorry for my mistake

Thomas P.

On Mon, Oct 23, 2017 at 5:59 PM, Thomas Perrot <thomas.perrot at tupi.fr>
wrote:

> Signed-off-by: Thomas Perrot <thomas.perrot at tupi.fr>
> ---
>  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)
>  }
>
>  # 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..86d531abc4 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_DTB_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
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20171023/46ca0224/attachment-0002.html>


More information about the Openembedded-core mailing list