diff options
| author | Daiane Angolini <daiane.angolini@freescale.com> | 2013-12-12 13:35:00 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-12-13 15:25:51 -0200 |
| commit | 78d75ecb5187bde1f6695019e1aee3ddf7cd65e5 (patch) | |
| tree | 611151c4af5be0c1802a4e4925ad0a55853c5375 | |
| parent | a4a0f6f92609112e94204488ebd30ca8a10a3595 (diff) | |
| download | meta-freescale-78d75ecb5187bde1f6695019e1aee3ddf7cd65e5.tar.gz | |
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>
4 files changed, 4 insertions, 1 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc index 73af4aa3e..7b1ffeebd 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 | |||
| 13 | LOCALVERSION ?= "+yocto" | 13 | LOCALVERSION ?= "+yocto" |
| 14 | SCMVERSION ?= "y" | 14 | SCMVERSION ?= "y" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \ | 16 | SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \ |
| 17 | file://defconfig \ | 17 | file://defconfig \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
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 4941e8947..434c21e08 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)" | |||
| 10 | # Revision of imx_2.6.35_maintain branch | 10 | # Revision of imx_2.6.35_maintain branch |
| 11 | SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323" | 11 | SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323" |
| 12 | LOCALVERSION = "-maintain+yocto" | 12 | LOCALVERSION = "-maintain+yocto" |
| 13 | SRCBRANCH = "imx_2.6.35_maintain" | ||
| 13 | 14 | ||
| 14 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ | 15 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ |
| 15 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ | 16 | 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 cb71e5633..72506f2d6 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)" | |||
| 10 | # Revision of 4.1.0 branch | 10 | # Revision of 4.1.0 branch |
| 11 | SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a" | 11 | SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a" |
| 12 | LOCALVERSION = "-4.1.0+yocto" | 12 | LOCALVERSION = "-4.1.0+yocto" |
| 13 | SRCBRANCH = "imx_3.0.35_4.1.0" | ||
| 13 | 14 | ||
| 14 | # Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch | 15 | # Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch |
| 15 | SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ | 16 | 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 c7322ff11..316751e06 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" | |||
| 11 | # 3.10.9-1.0.0 rc1 commit | 11 | # 3.10.9-1.0.0 rc1 commit |
| 12 | SRCREV = "dbf364b3d0123e5328ae28455c57e588635232c7" | 12 | SRCREV = "dbf364b3d0123e5328ae28455c57e588635232c7" |
| 13 | LOCALVERSION = "-1.0.0_alpha" | 13 | LOCALVERSION = "-1.0.0_alpha" |
| 14 | SRCBRANCH = "imx_3.10.9_1.0.0_alpha" | ||
| 14 | 15 | ||
| 15 | COMPATIBLE_MACHINE = "(mx6)" | 16 | COMPATIBLE_MACHINE = "(mx6)" |
