The linux-yocto recipe and metadata tools handle branchless source.
Letting KBRANCH = "master" for nobranch checkouts is not needed any
more.
Change all uses of SRCBRANCH to KBRANCH and set KBRANCH to the branch or
empty by default.
Signed-off-by: Nathan Rossi <nat...@nathanrossi.com>
---
recipes-kernel/linux/linux-xlnx-dev.bb | 1 -
recipes-kernel/linux/linux-xlnx.inc | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb
b/recipes-kernel/linux/linux-xlnx-dev.bb
index 42979bab04..27dfd39e74 100644
--- a/recipes-kernel/linux/linux-xlnx-dev.bb
+++ b/recipes-kernel/linux/linux-xlnx-dev.bb
@@ -4,7 +4,6 @@
# To enable this recipe, set PREFERRED_PROVIDER_virtual/kernel =
"linux-xlnx-dev"
KBRANCH ?= "master"
-SRCBRANCH = "${KBRANCH}"
# Use the SRCREV for the last tagged revision of linux-xlnx.
SRCREV ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel",
"linux-xlnx-dev", "${AUTOREV}", "629041605b93343ad2e8971ceaac3edcef0b043b", d)}'
diff --git a/recipes-kernel/linux/linux-xlnx.inc
b/recipes-kernel/linux/linux-xlnx.inc
index 073070f6b6..4ec8826fc9 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -4,8 +4,8 @@ LINUX_VERSION_EXTENSION ?= "-xilinx"
PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
# Sources, by default allow for the use of SRCREV pointing to orphaned
tags/commits
-SRCBRANCH ?= ""
-SRCBRANCHARG = "${@['nobranch=1', 'branch=${SRCBRANCH}'][d.getVar('SRCBRANCH',
True) != '']}"
+KBRANCH ?= ""
+SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH',
True) != '']}"
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
SRC_URI = " \
--
2.9.3
--
_______________________________________________
meta-xilinx mailing list
meta-xilinx@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-xilinx
