Patchwork [meta-fsl-arm-extra] linux-wandboard: Add branch name

login
register
mail settings
Submitter John Weber
Date Dec. 9, 2013, 4:11 p.m.
Message ID <1386605519-19836-1-git-send-email-rjohnweber@gmail.com>
Download mbox | patch
Permalink /patch/63047/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

John Weber - Dec. 9, 2013, 4:11 p.m.
From: Dan McGregor <danismostlikely@gmail.com>

New bitbake checks for SRCREV in the branch to be checked out.
That defaults to master, but SRCREV may not be in master.  Set the
branch so bitbake doesn't die.

Amended by John Weber to use GITBRANCH instead of BRANCH.

Signed-off-by: John Weber <rjohnweber@gmail.com>
---
 recipes-kernel/linux/linux-wandboard.inc       |    4 +++-
 recipes-kernel/linux/linux-wandboard_3.0.35.bb |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index d2b743f..fa73b4a 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -11,8 +11,10 @@  require recipes-kernel/linux/linux-imx.inc
 LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
+GITBRANCH ??= "master"
+
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git \
+SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${GITBRANCH} \
            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 a990556..fc4fea4 100644
--- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
@@ -4,6 +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"
 SRCREV = "d35902c77a077a25e4dfedc6aac11ba49c52c586"
 LOCALVERSION = "-4.0.0-wandboard"