[meta-xilinx] [meta-xilinx-tools][rel-v2016.4][PATCH] embeddedsw repo: Fix unreachable tag or branch

Manjukumar Matha manjukumar.harthikote-matha at xilinx.com
Thu Dec 22 12:33:09 PST 2016


This patch fixes the issue of unreachable tag or branch in embeddedsw
repo

Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 recipes-fsbl/fsbl/fsbl_git.bb        | 8 ++++++--
 recipes-fsboot/fsboot/fs-boot_git.bb | 8 ++++++--
 recipes-pmu/pmu/pmu-firmware_git.bb  | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/recipes-fsbl/fsbl/fsbl_git.bb b/recipes-fsbl/fsbl/fsbl_git.bb
index 31654ca..6183ab1 100644
--- a/recipes-fsbl/fsbl/fsbl_git.bb
+++ b/recipes-fsbl/fsbl/fsbl_git.bb
@@ -8,8 +8,12 @@ PROVIDES = "virtual/fsbl"
 inherit xsctapp xsctyaml deploy
 
 S = "${WORKDIR}/git"
-BRANCH = "master"
-SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;branch=${BRANCH}"
+
+# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
+ESWBRANCH ?= ""
+SRCBRANCHARG = "${@['nobranch=1', 'branch=${ESWBRANCH}'][d.getVar('ESWBRANCH', True) != '']}"
+
+SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;${SRCBRANCHARG}"
 
 # This points to xilinx-v2016.4 tag
 SRCREV ?= "a931a8d4471ad6d1e1ecdfd41f1da66d98d6f137"
diff --git a/recipes-fsboot/fsboot/fs-boot_git.bb b/recipes-fsboot/fsboot/fs-boot_git.bb
index 0d163da..59a59f6 100644
--- a/recipes-fsboot/fsboot/fs-boot_git.bb
+++ b/recipes-fsboot/fsboot/fs-boot_git.bb
@@ -11,8 +11,12 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
 
 S = "${WORKDIR}/git"
-BRANCH = "master"
-SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;branch=${BRANCH}"
+
+# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
+ESWBRANCH ?= ""
+SRCBRANCHARG = "${@['nobranch=1', 'branch=${ESWBRANCH}'][d.getVar('ESWBRANCH', True) != '']}"
+
+SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;${SRCBRANCHARG}"
 
 # This points to xilinx-v2016.4 tag
 SRCREV ?= "a931a8d4471ad6d1e1ecdfd41f1da66d98d6f137"
diff --git a/recipes-pmu/pmu/pmu-firmware_git.bb b/recipes-pmu/pmu/pmu-firmware_git.bb
index bf5a271..8d79f95 100644
--- a/recipes-pmu/pmu/pmu-firmware_git.bb
+++ b/recipes-pmu/pmu/pmu-firmware_git.bb
@@ -8,8 +8,12 @@ PROVIDES = "virtual/pmufw"
 inherit xsctapp xsctyaml deploy
 
 S = "${WORKDIR}/git"
-BRANCH = "master"
-SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;branch=${BRANCH}"
+
+# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
+ESWBRANCH ?= ""
+SRCBRANCHARG = "${@['nobranch=1', 'branch=${ESWBRANCH}'][d.getVar('ESWBRANCH', True) != '']}"
+
+SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;${SRCBRANCHARG}"
 
 # This points to xilinx-v2016.4 tag
 SRCREV ?= "a931a8d4471ad6d1e1ecdfd41f1da66d98d6f137"
-- 
2.7.4




More information about the meta-xilinx mailing list