summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel/linux
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-22 16:21:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:46:55 +0100
commit5e8cf6e568ab90365894478a272b5c28dc941031 (patch)
tree900e7b6bb5ea786ad0f9fc2a0d91cc33225a276b /meta/recipes-kernel/linux
parentec24b6de2b8686e1f779fef3a963e66f70eeba74 (diff)
downloadopenembedded-core-5e8cf6e568ab90365894478a272b5c28dc941031.tar.gz
openembedded-core-5e8cf6e568ab90365894478a272b5c28dc941031.tar.bz2
openembedded-core-5e8cf6e568ab90365894478a272b5c28dc941031.zip
Revert "linux-yocto-dev: Handle performance regression"
This recipe no longer functions after this change, revert it. This reverts commit 3e0137113e894eb8b23cd43721c7ba26ff234c8f. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index c50b319ec6..3085263453 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -20,9 +20,6 @@ include recipes-kernel/linux/linux-yocto-dev-revisions.inc
python () {
if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev":
raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it")
- else:
- d.setVar("SRCREV_machine", "${AUTOREV}")
- d.setVar("SRCREV_meta", "${AUTOREV}")
}
KBRANCH = "standard/base"
@@ -36,8 +33,8 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
# linux-yocto-dev is the preferred provider, they will be overridden to
# AUTOREV in following anonymous python routine and resolved when the
# variables are finalized.
-SRCREV_machine ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e"
-SRCREV_meta ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e"
+SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
+SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
LINUX_VERSION ?= "4.6-rc+"
LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"