[meta-freescale] [meta-fsl-arm][PATCH v3 03/13] u-boot-ls1: merge .inc into the recipe

[Daiane Angolini]

On Tue, Jul 7, 2015 at 5:16 AM,  <b28495 at freescale.com> wrote:
> From: Ting Liu <ting.liu at freescale.com>
>
> There is only on u-boot recipe for ls1, merge the .inc file.

s/on/one
Nice commit log, nice DESCRIPTION, nice LOCALVERSION

Daiane

>
> Signed-off-by: Ting Liu <ting.liu at freescale.com>
> ---
>  recipes-bsp/u-boot/u-boot-ls1.inc        | 17 -----------------
>  recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 20 ++++++++++++++++++--
>  2 files changed, 18 insertions(+), 19 deletions(-)
>  delete mode 100644 recipes-bsp/u-boot/u-boot-ls1.inc
>
> diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc
> deleted file mode 100644
> index ccd37c6..0000000
> --- a/recipes-bsp/u-boot/u-boot-ls1.inc
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
> -LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
> -LIC_FILES_CHKSUM = " \
> -    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> -    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
> -    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
> -    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
> -    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
> -"
> -
> -SRCBRANCH = "sdk-v1.7.x"
> -SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
> -SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
> -
> -LOCALVERSION ?= "-${SRCBRANCH}"
> -
> -S = "${WORKDIR}/git"
> diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
> index 010d2cc..ad1dd4b 100644
> --- a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
> +++ b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
> @@ -1,9 +1,25 @@
>  require recipes-bsp/u-boot/u-boot.inc
> -require u-boot-ls1.inc
> -inherit fsl-u-boot-localversion
> +
> +DESCRIPTION = "U-Boot which includes the support for QorIQ Layerscape1 series boards"
> +LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
> +LIC_FILES_CHKSUM = " \
> +    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
> +    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
> +    file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
> +    file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
> +"
> +
> +SRCBRANCH = "sdk-v1.7.x"
> +SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
> +SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
>
>  LOCALVERSION ?= "-${SRCBRANCH}"
>
> +S = "${WORKDIR}/git"
> +
> +inherit fsl-u-boot-localversion
> +
>  DEPENDS += "change-file-endianess-native"
>  PROVIDES += "u-boot"
>
> --
> 1.9.1
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale