aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2014-10-10 16:30:48 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2014-10-27 17:58:50 +1000
commit365b8854bf9e088f54da5c439335d8a298cbf618 (patch)
treef5171efdc53113a2cb61f5f0a113187263f530c4
parentce2e468ef79cb566ba330287a325ac241fa4b916 (diff)
downloadmeta-xilinx-365b8854bf9e088f54da5c439335d8a298cbf618.tar.gz
meta-xilinx-365b8854bf9e088f54da5c439335d8a298cbf618.tar.bz2
meta-xilinx-365b8854bf9e088f54da5c439335d8a298cbf618.zip
linux-xlnx: Fix up value of SRCREV
* Force SRCREV_machine = SRCREV as the linux-yocto recipe/scripts use the SRCREV_machine variable * Fix up the SRCREV setting for linux-xlnx-dev Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r--recipes-kernel/linux/linux-xlnx-dev.bb4
-rw-r--r--recipes-kernel/linux/linux-xlnx.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb b/recipes-kernel/linux/linux-xlnx-dev.bb
index 4ef20275..cf4c5c78 100644
--- a/recipes-kernel/linux/linux-xlnx-dev.bb
+++ b/recipes-kernel/linux/linux-xlnx-dev.bb
@@ -6,13 +6,11 @@
KBRANCH ?= "master-next"
# Use the SRCREV for the last tagged revision of linux-xlnx.
-SRCREV ?= "f27f400f43062b28d2b6f0977e50492b851d7464"
+SRCREV ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-xlnx-dev", "${AUTOREV}", "f27f400f43062b28d2b6f0977e50492b851d7464", d)}'
python () {
if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-xlnx-dev":
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-xlnx-dev to enable it")
- else:
- d.setVar("SRCREV", "${AUTOREV}")
}
LINUX_VERSION ?= "3.14+"
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 4c30438b..0111ea9d 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -11,6 +11,8 @@ SRC_URI = " \
file://xilinx-base;type=kmeta;destsuffix=xilinx-base \
"
+SRCREV_machine ?= "${SRCREV}"
+
require recipes-kernel/linux/linux-yocto.inc
DESCRIPTION = "Xilinx Kernel"