summaryrefslogtreecommitdiffstats
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:35:42 +0100
commit76f05ee9d1614313ba6ab1adffb7e10f01f94854 (patch)
treeb39d853ec87e451f8e1acf3cafe1d29a75171ef7
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>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb4
6 files changed, 12 insertions, 11 deletions
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 80d8db0823..de405a54e3 100644
--- 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 @@
1require recipes-kernel/linux/linux-yocto.inc
2
3KBRANCH ?= "standard/preempt-rt/base" 1KBRANCH ?= "standard/preempt-rt/base"
4KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" 2KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
5 3
4require recipes-kernel/linux/linux-yocto.inc
5
6SRCREV_machine ?= "c373b342af7bcbeda346df9598a5b1e9784d362f" 6SRCREV_machine ?= "c373b342af7bcbeda346df9598a5b1e9784d362f"
7SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c" 7SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c"
8SRCREV_meta ?= "199943142f7e0a283240246ee6c02f4376b315f0" 8SRCREV_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 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 @@
1require recipes-kernel/linux/linux-yocto.inc
2
3KBRANCH ?= "standard/preempt-rt/base" 1KBRANCH ?= "standard/preempt-rt/base"
4KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" 2KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
5 3
4require recipes-kernel/linux/linux-yocto.inc
5
6SRCREV_machine ?= "12f9e966eb249c3bdcc935612e2a372e90bad950" 6SRCREV_machine ?= "12f9e966eb249c3bdcc935612e2a372e90bad950"
7SRCREV_machine_qemuppc ?= "52ceb28926768c49f06db4e7e08d2226c2a473fd" 7SRCREV_machine_qemuppc ?= "52ceb28926768c49f06db4e7e08d2226c2a473fd"
8SRCREV_meta ?= "ccad961c4cb6be245ed198bd2c17c27ab33cfcd7" 8SRCREV_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 a751d54117..76448e1ba0 100644
--- 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 @@
1KBRANCH ?= "standard/tiny/base"
2
1require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
2 4
3KBRANCH ?= "standard/tiny/base"
4LINUX_KERNEL_TYPE = "tiny" 5LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 6KCONFIG_MODE = "--allnoconfig"
6 7
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 2ab3e1c067..5580e445d2 100644
--- 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 @@
1require recipes-kernel/linux/linux-yocto.inc
2
3KBRANCH ?= "standard/tiny/base" 1KBRANCH ?= "standard/tiny/base"
4LINUX_KERNEL_TYPE = "tiny" 2LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 3KCONFIG_MODE = "--allnoconfig"
6 4
5require recipes-kernel/linux/linux-yocto.inc
6
7LINUX_VERSION ?= "3.14.17" 7LINUX_VERSION ?= "3.14.17"
8 8
9KMETA = "meta" 9KMETA = "meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index f2904b62a1..125ffe7e38 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"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 2024d8e495..e88e31a2ba 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -1,7 +1,7 @@
1require recipes-kernel/linux/linux-yocto.inc
2
3KBRANCH ?= "standard/base" 1KBRANCH ?= "standard/base"
4 2
3require recipes-kernel/linux/linux-yocto.inc
4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" 6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"
7KBRANCH_qemumips ?= "standard/mti-malta32" 7KBRANCH_qemumips ?= "standard/mti-malta32"