sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Bruce Ashfield 2014-08-31 22:33:44 -04:00 committed by Richard Purdie
parent 92c1ece6c3
commit 76f05ee9d1
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
View File

@ -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 ?= "c373b342af7bcbeda346df9598a5b1e9784d362f"
SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c"
SRCREV_meta ?= "199943142f7e0a283240246ee6c02f4376b315f0"

4
meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
View File

@ -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"

3
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
View File

@ -1,6 +1,7 @@
KBRANCH ?= "standard/tiny/base"
require recipes-kernel/linux/linux-yocto.inc
KBRANCH ?= "standard/tiny/base"
LINUX_KERNEL_TYPE = "tiny"
KCONFIG_MODE = "--allnoconfig"

4
meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
View File

@ -1,9 +1,9 @@
require recipes-kernel/linux/linux-yocto.inc
KBRANCH ?= "standard/tiny/base"
LINUX_KERNEL_TYPE = "tiny"
KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
LINUX_VERSION ?= "3.14.17"
KMETA = "meta"

4
meta/recipes-kernel/linux/linux-yocto_3.10.bb
View File

@ -1,6 +1,6 @@
require recipes-kernel/linux/linux-yocto.inc
KBRANCH ?= "standard/base"
KBRANCH = "standard/base"
require recipes-kernel/linux/linux-yocto.inc
# board specific branches
KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"

4
meta/recipes-kernel/linux/linux-yocto_3.14.bb
View File

@ -1,7 +1,7 @@
require recipes-kernel/linux/linux-yocto.inc
KBRANCH ?= "standard/base"
require recipes-kernel/linux/linux-yocto.inc
# board specific branches
KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"
KBRANCH_qemumips ?= "standard/mti-malta32"