summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_3.10.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-09-01 02:33:44 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 13:35:42 (GMT)
commit76f05ee9d1614313ba6ab1adffb7e10f01f94854 (patch)
treeb39d853ec87e451f8e1acf3cafe1d29a75171ef7 /meta/recipes-kernel/linux/linux-yocto_3.10.bb
parent92c1ece6c347030d48995a36f4c67861356e59d3 (diff)
downloadpoky-76f05ee9d1614313ba6ab1adffb7e10f01f94854.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. (From OE-Core rev: ef48de6a4c1454c6f6e2de8636277b374ee44b50) 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_3.10.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index f2904b6..125ffe7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -1,6 +1,6 @@
1require recipes-kernel/linux/linux-yocto.inc 1KBRANCH ?= "standard/base"
2 2
3KBRANCH = "standard/base" 3require recipes-kernel/linux/linux-yocto.inc
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" 6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"