From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Thu, 12 Dec 2013 15:35:00 +0000 (-0200)
Subject: linux-imx: Update SRC_URI for new fetcher behavior.
X-Git-Tag: 2.1~1112
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=78d75ecb5187bde1f6695019e1aee3ddf7cd65e5;p=meta-freescale.git

linux-imx: Update SRC_URI for new fetcher behavior.

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

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
index 73af4aa3..7b1ffeeb 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
@@ -13,7 +13,7 @@ inherit kernel
 LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
-SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \
+SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \
            file://defconfig \
 "
 
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 4941e894..434c21e0 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -10,6 +10,7 @@ COMPATIBLE_MACHINE = "(mx28|mx5)"
 # Revision of imx_2.6.35_maintain branch
 SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323"
 LOCALVERSION = "-maintain+yocto"
+SRCBRANCH = "imx_2.6.35_maintain"
 
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
index cb71e563..72506f2d 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -10,6 +10,7 @@ COMPATIBLE_MACHINE = "(mx6)"
 # Revision of 4.1.0 branch
 SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a"
 LOCALVERSION = "-4.1.0+yocto"
+SRCBRANCH = "imx_3.0.35_4.1.0"
 
 # Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch
 SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
index c7322ff1..316751e0 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
@@ -11,5 +11,6 @@ DEFAULT_PREFERENCE = "-1"
 # 3.10.9-1.0.0 rc1 commit
 SRCREV = "dbf364b3d0123e5328ae28455c57e588635232c7"
 LOCALVERSION = "-1.0.0_alpha"
+SRCBRANCH = "imx_3.10.9_1.0.0_alpha"
 
 COMPATIBLE_MACHINE = "(mx6)"