aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-08-31 22:33:44 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 14:34:28 +0100
commitef48de6a4c1454c6f6e2de8636277b374ee44b50 (patch)
tree35ea2de44c37d0e70632e9058e07671edbe5aa68 /meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
parent2ddfffe52720d1df70b04131eac553776da7bc73 (diff)
downloadopenembedded-core-contrib-ef48de6a4c1454c6f6e2de8636277b374ee44b50.tar.gz
linux-yocto: ensure that recipe specific defaults take precedence
In order to make KBRANCH assignments more flexible and easy to override the default in each recipe as changed to a conditional assignment. But the common include file, sets its own branch default to master. This results in the recipes not overriding KBRANCH and master always being used. By putting the include after the default assignment, we now get the proper default branch. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 406004f760..3b80c5326a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -1,8 +1,8 @@
-require recipes-kernel/linux/linux-yocto.inc
-
KBRANCH ?= "standard/preempt-rt/base"
KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
+require recipes-kernel/linux/linux-yocto.inc
+
SRCREV_machine ?= "12f9e966eb249c3bdcc935612e2a372e90bad950"
SRCREV_machine_qemuppc ?= "52ceb28926768c49f06db4e7e08d2226c2a473fd"
SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7"