From 6852758f9adc41c4ce9985adacfdb4f36e9a65db Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 21 May 2014 16:42:43 +1000 Subject: linux-xlnx-dev: Update recipe * Update default SRCREV * Update version * Clean up comments Signed-off-by: Nathan Rossi --- recipes-kernel/linux/linux-xlnx-dev.bb | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb b/recipes-kernel/linux/linux-xlnx-dev.bb index b1800e9c..89b26409 100644 --- a/recipes-kernel/linux/linux-xlnx-dev.bb +++ b/recipes-kernel/linux/linux-xlnx-dev.bb @@ -3,33 +3,13 @@ # # To enable this recipe, set PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" -# These variables should reflect the linux-xlnx SRCREV and Linux version of -# latest upstream linux release merge. If these are out of date, please email -# meta-xilinx@yoctoproject.org to have it corrected. The linux-xlnx-dev build -# should still function correctly with out of date values, but the naming will -# be missleading. -LINUX_XLNX_NEARTOP_SRCREV = "669ee45083e22963d7fb7b774c5d7893ed35de2e" -LINUX_XLNX_NEARTOP_VERSION = "3.10" - -# LINUX_VERSION is set to select the defconfig and dts we wish to use within -# meta-xilinx. If the build fails it may be because this defconfig is out -# of date. If that happens or if the developer desires a non meta-xilinx config -# they should add the defconfig and name it appropriately so the recipes find -# the file. -LINUX_VERSION ?= "3.8" - -LINUX_VERSION_EXTENSION ?= "-xilinx-dev" - -KBRANCH ?= "master-next" -KBRANCH_DEFAULT = "master" +KBRANCH = "master-next" +KBRANCH_DEFAULT = "${KBRANCH}" include linux-xlnx.inc -# Set default SRCREVs. SRCREVs statically set to prevent network access during -# parsing. If linux-xlnx-dev is the preferred provider, they will be overridden -# to AUTOREV in the anonymous python routine and resolved when the variables -# are finalized. -SRCREV="${LINUX_XLNX_NEARTOP_SRCREV}" +# Use the SRCREV for the last tagged revision of linux-xlnx. +SRCREV = "f27f400f43062b28d2b6f0977e50492b851d7464" python () { if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-xlnx-dev": @@ -38,5 +18,6 @@ python () { d.setVar("SRCREV", "${AUTOREV}") } -PR = "r0" -PV = "${LINUX_XLNX_NEARTOP_VERSION}+${LINUX_VERSION_EXTENSION}+git${SRCREV}" +LINUX_VERSION ?= "3.14+" +LINUX_VERSION_EXTENSION = "-xilinx-dev" +PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" -- cgit v1.2.3-54-g00ecf