Patchwork [meta-fsl-arm-extra,v2,4/4] linux-wandboard : Use SRCBRANCH instead of GITBRANCH.

login
register
mail settings
Submitter Philip Balister
Date Dec. 10, 2013, 9:53 p.m.
Message ID <1386712430-27534-4-git-send-email-philip@balister.org>
Download mbox | patch
Permalink /patch/63195/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Philip Balister - Dec. 10, 2013, 9:53 p.m.
Be consistent across all recipes.

Signed-off-by: Philip Balister <philip@balister.org>
---
 recipes-kernel/linux/linux-wandboard.inc       | 4 ++--
 recipes-kernel/linux/linux-wandboard_3.0.35.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
John Weber - Dec. 11, 2013, 3:52 a.m.
On 12/10/13 3:53 PM, Philip Balister wrote:
> Be consistent across all recipes.
>
> Signed-off-by: Philip Balister <philip@balister.org>
> ---
>   recipes-kernel/linux/linux-wandboard.inc       | 4 ++--
>   recipes-kernel/linux/linux-wandboard_3.0.35.bb | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
> index fa73b4a..57e5517 100644
> --- a/recipes-kernel/linux/linux-wandboard.inc
> +++ b/recipes-kernel/linux/linux-wandboard.inc
> @@ -11,10 +11,10 @@ require recipes-kernel/linux/linux-imx.inc
>   LOCALVERSION ?= "+yocto"
>   SCMVERSION ?= "y"
>   
> -GITBRANCH ??= "master"
> +SRCBRANCH ??= "master"
>   
>   # SRC_URI for wandboard kernel
> -SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${GITBRANCH} \
> +SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
>              file://defconfig \
>   "
>   
> diff --git a/recipes-kernel/linux/linux-wandboard_3.0.35.bb b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
> index fc4fea4..b443d42 100644
> --- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
> +++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
> @@ -4,7 +4,7 @@
>   include linux-wandboard.inc
>   
>   # Wandboard branch - based on 4.0.0 from Freescale git
> -GITBRANCH = "wandboard_imx_3.0.35_4.0.0"
> +SRCBRANCH = "wandboard_imx_3.0.35_4.0.0"
>   SRCREV = "d35902c77a077a25e4dfedc6aac11ba49c52c586"
>   LOCALVERSION = "-4.0.0-wandboard"
>   
Fine by me.

Patch

diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index fa73b4a..57e5517 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -11,10 +11,10 @@  require recipes-kernel/linux/linux-imx.inc
 LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
-GITBRANCH ??= "master"
+SRCBRANCH ??= "master"
 
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${GITBRANCH} \
+SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${SRCBRANCH} \
            file://defconfig \
 "
 
diff --git a/recipes-kernel/linux/linux-wandboard_3.0.35.bb b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
index fc4fea4..b443d42 100644
--- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
@@ -4,7 +4,7 @@ 
 include linux-wandboard.inc
 
 # Wandboard branch - based on 4.0.0 from Freescale git
-GITBRANCH = "wandboard_imx_3.0.35_4.0.0"
+SRCBRANCH = "wandboard_imx_3.0.35_4.0.0"
 SRCREV = "d35902c77a077a25e4dfedc6aac11ba49c52c586"
 LOCALVERSION = "-4.0.0-wandboard"