summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-08-19 00:42:38 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-23 18:23:32 -0700
commitc52c2acf4e0a148b0ea756de544fac2db836a0ca (patch)
tree97f3db3c57a0ead125314658785dd8a9c6181fa0 /meta/recipes-kernel
parent90d11a0faab53f15713b88a14ff737c4432d16c0 (diff)
downloadpoky-c52c2acf4e0a148b0ea756de544fac2db836a0ca.tar.gz
linux-yocto: move more default values into linux-yocto.inc
During the preparation of some linux-yocto extension documentation it was clear that some variables are being defined in each recipe, when they don't have to be. Moving the defaults into linux-yocto.in and allowing them to be overidden in recipes simpifies the reuse of the base infrastructure. (From OE-Core rev: 0ca26544efe8d650f36db9dc1c3b3a15110d7e31) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc7
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb5
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 595795bf9a..11b77cefd1 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -12,6 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
12# Set this to 'preempt_rt' in the local.conf if you want a real time kernel 12# Set this to 'preempt_rt' in the local.conf if you want a real time kernel
13LINUX_KERNEL_TYPE ?= standard 13LINUX_KERNEL_TYPE ?= standard
14 14
15KMETA ?= meta
16SRCREV_FORMAT ?= "meta_machine"
17
18LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
19KERNEL_REVISION_CHECKING ?= "t"
20YOCTO_KERNEL_META_DATA ?= t
21
15do_patch[depends] = "kern-tools-native:do_populate_sysroot" 22do_patch[depends] = "kern-tools-native:do_populate_sysroot"
16 23
17addtask kernel_configme before do_configure after do_patch 24addtask kernel_configme before do_configure after do_patch
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 44f1ebe92b..6e6f386d10 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
9KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" 9KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
10 10
11KBRANCH = ${KMACHINE} 11KBRANCH = ${KMACHINE}
12KMETA = meta
13 12
14LINUX_VERSION ?= "3.0.1" 13LINUX_VERSION ?= "3.0.1"
15LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
16 14
17SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2" 15SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
18SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134" 16SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134"
@@ -31,14 +29,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;
31COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" 29COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
32 30
33# Functionality flags 31# Functionality flags
34KERNEL_REVISION_CHECKING ?= "t"
35KERNEL_FEATURES="features/netfilter" 32KERNEL_FEATURES="features/netfilter"
36KERNEL_FEATURES_append=" features/taskstats" 33KERNEL_FEATURES_append=" features/taskstats"
37KERNEL_FEATURES_append_qemux86=" cfg/sound" 34KERNEL_FEATURES_append_qemux86=" cfg/sound"
38KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 35KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
39 36
40YOCTO_KERNEL_META_DATA=t
41
42# extra tasks 37# extra tasks
43addtask kernel_link_vmlinux after do_compile before do_install 38addtask kernel_link_vmlinux after do_compile before do_install
44addtask validate_branches before do_patch after do_kernel_checkout 39addtask validate_branches before do_patch after do_kernel_checkout