diff options
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 5 |
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 |
13 | LINUX_KERNEL_TYPE ?= standard | 13 | LINUX_KERNEL_TYPE ?= standard |
14 | 14 | ||
15 | KMETA ?= meta | ||
16 | SRCREV_FORMAT ?= "meta_machine" | ||
17 | |||
18 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | ||
19 | KERNEL_REVISION_CHECKING ?= "t" | ||
20 | YOCTO_KERNEL_META_DATA ?= t | ||
21 | |||
15 | do_patch[depends] = "kern-tools-native:do_populate_sysroot" | 22 | do_patch[depends] = "kern-tools-native:do_populate_sysroot" |
16 | 23 | ||
17 | addtask kernel_configme before do_configure after do_patch | 24 | addtask 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" | |||
9 | KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" | 9 | KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" |
10 | 10 | ||
11 | KBRANCH = ${KMACHINE} | 11 | KBRANCH = ${KMACHINE} |
12 | KMETA = meta | ||
13 | 12 | ||
14 | LINUX_VERSION ?= "3.0.1" | 13 | LINUX_VERSION ?= "3.0.1" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | ||
16 | 14 | ||
17 | SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2" | 15 | SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2" |
18 | SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134" | 16 | SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134" |
@@ -31,14 +29,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1; | |||
31 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" | 29 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" |
32 | 30 | ||
33 | # Functionality flags | 31 | # Functionality flags |
34 | KERNEL_REVISION_CHECKING ?= "t" | ||
35 | KERNEL_FEATURES="features/netfilter" | 32 | KERNEL_FEATURES="features/netfilter" |
36 | KERNEL_FEATURES_append=" features/taskstats" | 33 | KERNEL_FEATURES_append=" features/taskstats" |
37 | KERNEL_FEATURES_append_qemux86=" cfg/sound" | 34 | KERNEL_FEATURES_append_qemux86=" cfg/sound" |
38 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" | 35 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" |
39 | 36 | ||
40 | YOCTO_KERNEL_META_DATA=t | ||
41 | |||
42 | # extra tasks | 37 | # extra tasks |
43 | addtask kernel_link_vmlinux after do_compile before do_install | 38 | addtask kernel_link_vmlinux after do_compile before do_install |
44 | addtask validate_branches before do_patch after do_kernel_checkout | 39 | addtask validate_branches before do_patch after do_kernel_checkout |