diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-22 16:21:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:56:25 +0100 |
commit | e1fcb032e2356fa54d9f15b819660c3fb60b85fa (patch) | |
tree | 8c55f713af5a73f63adc6edd2b8e608d22115444 | |
parent | 31cef0d518c16b97c5013b6c073dd2987086ff6a (diff) | |
download | poky-e1fcb032e2356fa54d9f15b819660c3fb60b85fa.tar.gz |
Revert "linux-yocto-dev: Handle performance regression"
This recipe no longer functions after this change, revert it.
This reverts commit 3e0137113e894eb8b23cd43721c7ba26ff234c8f.
(From OE-Core rev: 5e8cf6e568ab90365894478a272b5c28dc941031)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-dev.bb | 7 |
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 | |||
20 | python () { | 20 | python () { |
21 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": | 21 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": |
22 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") | 22 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") |
23 | else: | ||
24 | d.setVar("SRCREV_machine", "${AUTOREV}") | ||
25 | d.setVar("SRCREV_meta", "${AUTOREV}") | ||
26 | } | 23 | } |
27 | 24 | ||
28 | KBRANCH = "standard/base" | 25 | KBRANCH = "standard/base" |
@@ -36,8 +33,8 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name | |||
36 | # linux-yocto-dev is the preferred provider, they will be overridden to | 33 | # linux-yocto-dev is the preferred provider, they will be overridden to |
37 | # AUTOREV in following anonymous python routine and resolved when the | 34 | # AUTOREV in following anonymous python routine and resolved when the |
38 | # variables are finalized. | 35 | # variables are finalized. |
39 | SRCREV_machine ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" | 36 | SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' |
40 | SRCREV_meta ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" | 37 | SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' |
41 | 38 | ||
42 | LINUX_VERSION ?= "4.6-rc+" | 39 | LINUX_VERSION ?= "4.6-rc+" |
43 | LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" | 40 | LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" |