summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/kernel-yocto.bbclass21
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc21
2 files changed, 21 insertions, 21 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 141eeafeb9..a0362f6acb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -3,6 +3,22 @@ SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_config
3PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe" 3PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe"
4PATCH_GIT_USER_NAME ?= "OpenEmbedded" 4PATCH_GIT_USER_NAME ?= "OpenEmbedded"
5 5
6# The distro or local.conf should set this, but if nobody cares...
7LINUX_KERNEL_TYPE ??= "standard"
8
9# KMETA ?= ""
10KBRANCH ?= "master"
11KMACHINE ?= "${MACHINE}"
12SRCREV_FORMAT ?= "meta_machine"
13
14# LEVELS:
15# 0: no reporting
16# 1: report options that are specified, but not in the final config
17# 2: report options that are not hardware related, but set by a BSP
18KCONF_AUDIT_LEVEL ?= "1"
19KCONF_BSP_AUDIT_LEVEL ?= "0"
20KMETA_AUDIT ?= "yes"
21
6# returns local (absolute) path names for all valid patches in the 22# returns local (absolute) path names for all valid patches in the
7# src_uri 23# src_uri
8def find_patches(d,subdir): 24def find_patches(d,subdir):
@@ -475,3 +491,8 @@ python () {
475 if 'do_diffconfig' in d: 491 if 'do_diffconfig' in d:
476 bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d) 492 bb.build.addtask('do_diffconfig', None, 'do_kernel_configme', d)
477} 493}
494
495# extra tasks
496addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile
497addtask validate_branches before do_patch after do_kernel_checkout
498addtask kernel_configcheck after do_configure before do_compile
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index f191946f2a..91df9c1cd5 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -39,22 +39,6 @@ KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'fea
39# and it can be specific to the machine or shared 39# and it can be specific to the machine or shared
40# KMACHINE = "UNDEFINED" 40# KMACHINE = "UNDEFINED"
41 41
42# The distro or local.conf should set this, but if nobody cares...
43LINUX_KERNEL_TYPE ??= "standard"
44
45# KMETA ?= ""
46KBRANCH ?= "master"
47KMACHINE ?= "${MACHINE}"
48SRCREV_FORMAT ?= "meta_machine"
49
50# LEVELS:
51# 0: no reporting
52# 1: report options that are specified, but not in the final config
53# 2: report options that are not hardware related, but set by a BSP
54KCONF_AUDIT_LEVEL ?= "1"
55KCONF_BSP_AUDIT_LEVEL ?= "0"
56KMETA_AUDIT ?= "yes"
57
58LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}" 42LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}"
59 43
60# Pick up shared functions 44# Pick up shared functions
@@ -69,10 +53,5 @@ do_install_append(){
69 fi 53 fi
70} 54}
71 55
72# extra tasks
73addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile
74addtask validate_branches before do_patch after do_kernel_checkout
75addtask kernel_configcheck after do_configure before do_compile
76
77# enable kernel-sample for oeqa/runtime/cases's ksample.py test 56# enable kernel-sample for oeqa/runtime/cases's ksample.py test
78KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" 57KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc"