[meta-fsl-arm-extra][PATCH v2 1/4] u-boot-boundary : Update SRC_URI for new fetcher behavior.

[meta-fsl-arm-extra][PATCH v2 1/4] u-boot-boundary : Update SRC_URI for new fetcher behavior.

[Philip Balister]

If SRC_REV is not in the master branch, the SRC_URI must specify the
branch.

Signed-off-by: Philip Balister <philip@balister.org>
---
 recipes-bsp/u-boot/u-boot-boundary_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-boundary_git.bb b/recipes-bsp/u-boot/u-boot-boundary_git.bb
index f612b3f..323cfdf 100644
--- a/recipes-bsp/u-boot/u-boot-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary_git.bb
@@ -9,7 +9,8 @@ PROVIDES = "u-boot"
 PV = "v2013.07+git${SRCPV}"
 
 SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
+SRCBRANCH = "production-before-20131107"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
-- 
1.8.3.1

[meta-fsl-arm-extra][PATCH v2 2/4] u-boot-script-boundary : Update SRC_URI for new fetcher behavior.

[Philip Balister]

If SRCREV is not in the master branch, the SRC_URI must specify the
branch.

Signed-off-by: Philip Balister <philip@balister.org>
---
 recipes-bsp/u-boot/u-boot-script-boundary_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
index 06ad438..d14e094 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -6,7 +6,8 @@ DEPENDS = "u-boot-mkimage-native"
 PV = "v2013.01+git${SRCPV}"
 
 SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
+SRCBRANCH = "production-before-20131107"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
-- 
1.8.3.1

[meta-fsl-arm-extra][PATCH v2 3/4] linux-boundary : Update SRC_URI for new fetcher behavior.

[Philip Balister]

If SRCREV is not in the master branch, the SRC_URI must specify the
branch.

Signed-off-by: Philip Balister <philip@balister.org>
---
 recipes-kernel/linux/linux-boundary_3.0.35.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-boundary_3.0.35.bb b/recipes-kernel/linux/linux-boundary_3.0.35.bb
index 7875f93..cc8b495 100644
--- a/recipes-kernel/linux/linux-boundary_3.0.35.bb
+++ b/recipes-kernel/linux/linux-boundary_3.0.35.bb
@@ -5,10 +5,11 @@ require recipes-kernel/linux/linux-imx.inc
 
 DESCRIPTION = "Linux kernel for Boundary Devices boards"
 
-SRC_URI = "git://github.com/boundarydevices/linux-imx6.git \
+SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH} \
            file://defconfig"
 
 LOCALVERSION = "-4.1.0+yocto"
+SRCBRANCH = "boundary-imx_3.0.35_4.1.0"
 SRCREV = "58099389255add7c17ce6babf37a50ce5d11d6b8"
 
 
-- 
1.8.3.1

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

[Philip Balister]

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"
 
-- 
1.8.3.1

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

[John Weber]

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.