[meta-freescale] [PATCH] dtc-145: Deploy renamed binary only and add new class

[Fabio Berton]

Merged to master.

On Mon, Jul 30, 2018 at 10:43 AM, Fabio Berton
<fabio.berton at ossystems.com.br> wrote:
> From: Max Krummenacher <max.krummenacher at toradex.com>
>
> dtc-145-native is used by older U-Boot recipes. U-Boot only depends on
> the native dtc binary. So, to not clash with files from the regular dtc native
> build do only install the dtc binary renamed to dtc-145. Also, create
> a new class to handle with dtc-145 dependency.
>
> Signed-off-by: Max Krummenacher <max.krummenacher at toradex.com>
> Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
> ---
>  classes/dtc-145.bbclass                  | 7 +++++++
>  recipes-bsp/u-boot/u-boot-imx_2017.03.bb | 3 +--
>  recipes-kernel/dtc/dtc-145_git.bb        | 6 ++++++
>  3 files changed, 14 insertions(+), 2 deletions(-)
>  create mode 100644 classes/dtc-145.bbclass
>
> diff --git a/classes/dtc-145.bbclass b/classes/dtc-145.bbclass
> new file mode 100644
> index 00000000..d4a30711
> --- /dev/null
> +++ b/classes/dtc-145.bbclass
> @@ -0,0 +1,7 @@
> +# Use this class for U-Boot 2017.03 or older.
> +
> +DEPENDS_append = " dtc-145-native"
> +
> +do_configure_prepend () {
> +    sed -i -e 's/^DTC[[:space:]]*=[[:space:]]*dtc[[:space:]]*$/DTC = dtc-145/' ${S}/Makefile
> +}
> diff --git a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> index 52ebee99..0e4ba7b3 100644
> --- a/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> +++ b/recipes-bsp/u-boot/u-boot-imx_2017.03.bb
> @@ -6,7 +6,6 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
>  require recipes-bsp/u-boot/u-boot.inc
>
>  PROVIDES += "u-boot"
> -DEPENDS_append = "dtc-145-native"
>
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> @@ -17,7 +16,7 @@ SRCREV = "b76bb1bf9fd21e21006d79552e28855ac43ad43c"
>
>  S = "${WORKDIR}/git"
>
> -inherit fsl-u-boot-localversion
> +inherit dtc-145 fsl-u-boot-localversion
>
>  LOCALVERSION ?= "-${SRCBRANCH}"
>
> diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
> index afed62fd..2776cc5e 100644
> --- a/recipes-kernel/dtc/dtc-145_git.bb
> +++ b/recipes-kernel/dtc/dtc-145_git.bb
> @@ -10,3 +10,9 @@ SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
>  S = "${WORKDIR}/git"
>
>  BBCLASSEXTEND = "native nativesdk"
> +
> +# only install the dtc binary renamed to dtc-145
> +do_install () {
> +    install -d ${D}/${bindir}
> +    install -m 755 dtc ${D}/${bindir}/dtc-145
> +}
> --
> 2.18.0
>