Patchwork [meta-fsl-ppc] Fix git branch references

login
register
mail settings
Submitter chunrong guo
Date Dec. 11, 2013, 8:22 a.m.
Message ID <1386750174-15084-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/63205/
State Superseded
Headers show

Comments

chunrong guo - Dec. 11, 2013, 8:22 a.m.
From: Chunrong Guo <B40290@freescale.com>

    *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>
---
 recipes-bsp/boot-format/boot-format_git.bb    |    2 +-
 recipes-bsp/rcw/rcw_git.bb                    |    2 +-
 recipes-bsp/u-boot/u-boot_git.bb              |    2 +-
 recipes-devtools/qemu/qemu_fslgit.bb          |    2 +-
 recipes-dpaa/fmc/fmc_git.bb                   |    2 +-
 recipes-extended/cst/cst_git.bb               |    2 +-
 recipes-extended/web-sysmon/web-sysmon_git.bb |    2 +-
 recipes-kernel/linux/linux-qoriq-sdk.inc      |    2 +-
 recipes-kernel/qoriq-debug/qoriq-debug_git.bb |    2 +-
 recipes-kernel/skmm/skmm_git.bb               |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
Otavio Salvador - Dec. 11, 2013, 8:28 a.m.
On Wed, Dec 11, 2013 at 6:22 AM,  <b40290@freescale.com> wrote:
> From: Chunrong Guo <B40290@freescale.com>
>
>     *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>

People has suggested to use an auxiliary variable, SRCBRANCH, to host
the value so this is easy to change using a bbappend. Can you adapt
this patch for this?

Patch

diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb
index ac1504d..093531f 100644
--- a/recipes-bsp/boot-format/boot-format_git.bb
+++ b/recipes-bsp/boot-format/boot-format_git.bb
@@ -3,7 +3,7 @@  LICENSE = "GPLv2"
 PR = "r6"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/boot-format.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/boot-format.git;branch=sdk-v1.4.x"
 SRCREV = "d9bbfaba0c9316ae33455099c47bae429479e530"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 7d87783..fd6718a 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -13,7 +13,7 @@  COMPATIBLE_HOST ?= "(none)"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=sdk-v1.4.x"
 SRCREV = "5d3c819bcca6d09dcf7b52b3f2855dda304a5997"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 3479b23..45bdcb3 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -11,7 +11,7 @@  DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
 
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git \
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v1.4.x \
 	file://Fix-the-depend-race-issue.patch"
 SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
 
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
index 921bf2f..943cef6 100644
--- a/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/recipes-devtools/qemu/qemu_fslgit.bb
@@ -6,7 +6,7 @@  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"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.4.x"
 SRCREV = "8713c58725df407dbbedb48fa315248d0100720c"
 
 SRC_URI += " \
diff --git a/recipes-dpaa/fmc/fmc_git.bb b/recipes-dpaa/fmc/fmc_git.bb
index 20f93f6..4f6da78 100644
--- a/recipes-dpaa/fmc/fmc_git.bb
+++ b/recipes-dpaa/fmc/fmc_git.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c"
 
 PR = "r2"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/fmc.git;branch=sdk-v1.4.x"
 SRCREV = "f2e1a831a96f1d04d3d5a5970d2e54c38098cf39"
 
 DEPENDS = "libxml2 fmlib tclap"
diff --git a/recipes-extended/cst/cst_git.bb b/recipes-extended/cst/cst_git.bb
index 177f23c..be6d63f 100644
--- a/recipes-extended/cst/cst_git.bb
+++ b/recipes-extended/cst/cst_git.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://RELEASENOTES;beginline=8;endline=43;md5=5a7b22a2c96b5
 
 DEPENDS += "openssl"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=sdk-v1.4.x"
 SRCREV = "e4035cbf54ed481147c6ae65c741ef75dc9ec37f"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-extended/web-sysmon/web-sysmon_git.bb b/recipes-extended/web-sysmon/web-sysmon_git.bb
index 1b2e070..6c91f4c 100644
--- a/recipes-extended/web-sysmon/web-sysmon_git.bb
+++ b/recipes-extended/web-sysmon/web-sysmon_git.bb
@@ -3,7 +3,7 @@  SECTION = "web-sysmon"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/web-sysmon.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/web-sysmon.git;branch=sdk-v1.4.x"
 SRCREV = "40b47611378ef5c07d98f0f691bb146ae52dcdc1"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc
index 1c66f9b..706e13e 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -4,7 +4,7 @@  PV = "3.8"
 INC_PR = "r11"
 
 SRCREV = "4b66366af2d77de68f4bd6548d07421e13d3df05"
-SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=sdk-v1.4.x \
 	  "
 
 KSRC ?= ""
diff --git a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
index a8d2e96..1d4f40d 100644
--- a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
+++ b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
 
 inherit module autotools
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;branch=sdk-v1.4.x"
 SRCREV = "08de2902af9a79ba9e436a284b8d7754b351f608"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/skmm/skmm_git.bb b/recipes-kernel/skmm/skmm_git.bb
index 224e556..ff07126 100644
--- a/recipes-kernel/skmm/skmm_git.bb
+++ b/recipes-kernel/skmm/skmm_git.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5
 
 DEPENDS = "libedit"
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git"
+SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-ep.git;branch=sdk-v1.4.x"
 SRCREV = "80d8393a2033b3b0cc8f885702d7b288956f3a37"
 
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds)"