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>

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 80d8db082338a7d0e3583aa09ea715d2ceaa8315..de405a54e307fca52972f08b1200fc88d8183dae 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.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 ?= "c373b342af7bcbeda346df9598a5b1e9784d362f"
 SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c"
 SRCREV_meta ?= "199943142f7e0a283240246ee6c02f4376b315f0"

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 406004f760ec63907bd0e82bb6575c2926ed88db..3b80c5326a419bf986797524d1c800c736ebb2c9 100644 (file)
--- 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"

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index a751d541179a9bb4898ed4e65d43e36d66dca8ad..76448e1ba0499ad9e918fd78122a5e13c82572ed 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -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"
 

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 2ab3e1c067f3a6075572d792d58a22addacb286c..5580e445d2219f0bf4ad074cc198cc68527a471e 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -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"

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index f2904b62a132ab63f113f0cf1a38177e1bea5c1d..125ffe7e38bcefc1995f9bd386089da897b0012e 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -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"

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 2024d8e495360e636279015124044745dc3d5c7d..e88e31a2badf943ffa75f189a26973a937224db3 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -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"