Fix git branch references

   *Ensure the right branches are set in SRC_URI to match the revisions used.
    This resolves certain fetch failures.

Signed-off-by: Chunrong Guo <B40290@freescale.com>

diff --git a/meta-fsl-ppc/recipes-bsp/boot-format/boot-format_git.bb b/meta-fsl-ppc/recipes-bsp/boot-format/boot-format_git.bb
index ac1504d4254fa46316f215c3e6e071eec76de922..9259e78f20ced1075c7a061aeb288608c52ffdbd 100644 (file)
--- a/meta-fsl-ppc/recipes-bsp/boot-format/boot-format_git.bb
+++ b/meta-fsl-ppc/recipes-bsp/boot-format/boot-format_git.bb
@@ -3,7 +3,8 @@ LICENSE = "GPLv2"
 PR = "r6"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/boot-format.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/boot-format.git;branch=${SRCBRANCH}"
 SRCREV = "d9bbfaba0c9316ae33455099c47bae429479e530"
 
 S = "${WORKDIR}/git"

diff --git a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
index 7d87783c7602d4729c8c89f46523c246632f1ceb..8da72ea8d2c1a447b9f0d1cca06bbcd01ddb7e1e 100644 (file)
--- a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
+++ b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
@@ -13,7 +13,8 @@ COMPATIBLE_HOST ?= "(none)"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH}"
 SRCREV = "5d3c819bcca6d09dcf7b52b3f2855dda304a5997"
 
 S = "${WORKDIR}/git"

diff --git a/meta-fsl-ppc/recipes-bsp/u-boot/u-boot_git.bb b/meta-fsl-ppc/recipes-bsp/u-boot/u-boot_git.bb
index 3479b231965422f26cfb347d27fee141dc446179..e5820f704c17ca7bec1eb0b41dc93eec73278abf 100644 (file)
--- a/meta-fsl-ppc/recipes-bsp/u-boot/u-boot_git.bb
+++ b/meta-fsl-ppc/recipes-bsp/u-boot/u-boot_git.bb
@@ -11,7 +11,8 @@ DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \
        file://Fix-the-depend-race-issue.patch"
 SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
 

diff --git a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
index 921bf2fb401a44f2f98a253d20e286506deef04d..356103d4eb3fabc4a0cca5e707074ef463f3a9ac 100644 (file)
--- a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
 # This means v1.4 with FSL specific patches applied
 PV = "1.4+fsl"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=${SRCBRANCH}"
 SRCREV = "8713c58725df407dbbedb48fa315248d0100720c"
 
 SRC_URI += " \

diff --git a/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb b/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb
index 20f93f6563a702682d0fad8f0c343b71d9cef06e..016906268649ac8081222e95222cc3a74f42e584 100644 (file)
--- a/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb
+++ b/meta-fsl-ppc/recipes-dpaa/fmc/fmc_git.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c"
 
 PR = "r2"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;branch=${SRCBRANCH}"
 SRCREV = "f2e1a831a96f1d04d3d5a5970d2e54c38098cf39"
 
 DEPENDS = "libxml2 fmlib tclap"

diff --git a/meta-fsl-ppc/recipes-extended/cst/cst_git.bb b/meta-fsl-ppc/recipes-extended/cst/cst_git.bb
index 177f23ce3c4b69545beea3d4806ab53830d889ac..9d2d2974f0aab689658e4bf78605fac7f99d9c67 100644 (file)
--- a/meta-fsl-ppc/recipes-extended/cst/cst_git.bb
+++ b/meta-fsl-ppc/recipes-extended/cst/cst_git.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://RELEASENOTES;beginline=8;endline=43;md5=5a7b22a2c96b5
 
 DEPENDS += "openssl"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=${SRCBRANCH}"
 SRCREV = "e4035cbf54ed481147c6ae65c741ef75dc9ec37f"
 
 S = "${WORKDIR}/git"

diff --git a/meta-fsl-ppc/recipes-extended/web-sysmon/web-sysmon_git.bb b/meta-fsl-ppc/recipes-extended/web-sysmon/web-sysmon_git.bb
index 1b2e070db1cf2bec1da638fc6671acc622b97e81..d9df8e43a38cc03f21f00379b2f1e8222e1f6bc1 100644 (file)
--- a/meta-fsl-ppc/recipes-extended/web-sysmon/web-sysmon_git.bb
+++ b/meta-fsl-ppc/recipes-extended/web-sysmon/web-sysmon_git.bb
@@ -3,7 +3,8 @@ SECTION = "web-sysmon"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/web-sysmon.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/web-sysmon.git;branch=${SRCBRANCH}"
 SRCREV = "40b47611378ef5c07d98f0f691bb146ae52dcdc1"
 
 S = "${WORKDIR}/git"

diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
index 1c66f9bc51e5b7cf5dcc936dabaebde679cfe9f8..0be61090693d60e1742c4a81f28747e6d6cae5df 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -3,8 +3,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 PV = "3.8"
 INC_PR = "r11"
 
+SRCBRANCH = "sdk-v1.4.x"
 SRCREV = "4b66366af2d77de68f4bd6548d07421e13d3df05"
-SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=${SRCBRANCH} \
          "
 
 KSRC ?= ""

diff --git a/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
index a8d2e9634c0364a192a98bb3dab8a30db64b6bf4..5b0256f4526bed474f239440b8bb84913c1b636f 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
 
 inherit module autotools
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;branch=${SRCBRANCH}"
 SRCREV = "08de2902af9a79ba9e436a284b8d7754b351f608"
 
 S = "${WORKDIR}/git"

diff --git a/meta-fsl-ppc/recipes-kernel/skmm/skmm_git.bb b/meta-fsl-ppc/recipes-kernel/skmm/skmm_git.bb
index 224e55645f3fa98766e07be850161c39b734b07b..31e4489f04de47631703f00a5ffe464ce564edb6 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/skmm/skmm_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/skmm/skmm_git.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5
 
 DEPENDS = "libedit"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git"
+SRCBRANCH = "sdk-v1.4.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;branch=${SRCBRANCH}"
 SRCREV = "80d8393a2033b3b0cc8f885702d7b288956f3a37"
 
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds)"