summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-03-02 16:36:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-02 22:05:34 +0000
commite02016e73bca0ea0ceee14eb794eb8c477dbb3ad (patch)
tree890726a6b77798d830f0e48d5154d59913876103
parentdd1d4e55c6198586eb83f7850f597fbdf69edbaf (diff)
downloadpoky-e02016e73bca0ea0ceee14eb794eb8c477dbb3ad.tar.gz
kernel-yocto: inhibit BSP description warnings for custom linux-yocto kernels
We don't require that a yocto custom kernel + defconfig have a full BSP description (but of course it would be better if they did). Since this isn't a requirement, we shouldn't alarm users by generating a BSP description warning. To implement this, we add a bsp audit level flag (like the one that exists for kconfig audits), and only set it to activate in the versioned linux-yocto recipes. [YOCTO: #7370] (From OE-Core rev: d2fb7fff291b83700d487be093223c1533d915ce) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass13
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.19.bb1
7 files changed, 13 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index c8d1e95df3..8db489964e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -265,6 +265,7 @@ python do_kernel_configcheck() {
265 ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) 265 ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd))
266 266
267 config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) 267 config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0)
268 bsp_check_visibility = int(d.getVar( "KCONF_BSP_AUDIT_LEVEL", True ) or 0)
268 269
269 # if config check visibility is non-zero, report dropped configuration values 270 # if config check visibility is non-zero, report dropped configuration values
270 mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg" 271 mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg"
@@ -283,13 +284,13 @@ python do_kernel_configcheck() {
283 bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results) 284 bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results)
284 285
285 bsp_desc = "${S}/" + kmeta + "/" + "top_tgt" 286 bsp_desc = "${S}/" + kmeta + "/" + "top_tgt"
286 if os.path.exists(bsp_desc): 287 if os.path.exists(bsp_desc) and bsp_check_visibility > 1:
287 with open (bsp_desc, "r") as myfile: 288 with open (bsp_desc, "r") as myfile:
288 bsp_tgt = myfile.read() 289 bsp_tgt = myfile.read()
289 m = re.match("^(.*)scratch.obj(.*)$", bsp_tgt) 290 m = re.match("^(.*)scratch.obj(.*)$", bsp_tgt)
290 if not m is None: 291 if not m is None:
291 bb.warn( "[kernel]: An auto generated BSP description was used, this normally indicates a misconfiguration.\n" + 292 bb.warn( "[kernel]: An auto generated BSP description was used, this normally indicates a misconfiguration.\n" +
292 "Check that your machine (%s) has an associated kernel description." % "${MACHINE}" ) 293 "Check that your machine (%s) has an associated kernel description." % "${MACHINE}" )
293} 294}
294 295
295# Ensure that the branches (BSP and meta) are on the locations specified by 296# Ensure that the branches (BSP and meta) are on the locations specified by
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 8e2189654b..bd61c4a927 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -14,6 +14,7 @@ LINUX_VERSION ?= "3.14.29"
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
16KMETA = "meta" 16KMETA = "meta"
17KCONF_BSP_AUDIT_LEVEL = "2"
17 18
18LINUX_KERNEL_TYPE = "preempt-rt" 19LINUX_KERNEL_TYPE = "preempt-rt"
19 20
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 db9ad738c3..d110297246 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -7,6 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc
7LINUX_VERSION ?= "3.14.29" 7LINUX_VERSION ?= "3.14.29"
8 8
9KMETA = "meta" 9KMETA = "meta"
10KCONF_BSP_AUDIT_LEVEL = "2"
10 11
11SRCREV_machine ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" 12SRCREV_machine ?= "f65678ef48c5d41af914d2769e4dd01411c1df96"
12SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b" 13SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index 1997e30a25..d10449aab3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -7,6 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc
7LINUX_VERSION ?= "3.19" 7LINUX_VERSION ?= "3.19"
8 8
9KMETA = "meta" 9KMETA = "meta"
10KCONF_BSP_AUDIT_LEVEL = "2"
10 11
11SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" 12SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711"
12SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb" 13SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb"
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 79b3f256f4..c62f8ca97d 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -28,6 +28,7 @@ SRCREV_FORMAT ?= "meta_machine"
28# 1: report options that are specified, but not in the final config 28# 1: report options that are specified, but not in the final config
29# 2: report options that are not hardware related, but set by a BSP 29# 2: report options that are not hardware related, but set by a BSP
30KCONF_AUDIT_LEVEL ?= "1" 30KCONF_AUDIT_LEVEL ?= "1"
31KCONF_BSP_AUDIT_LEVEL ?= "0"
31 32
32LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" 33LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
33 34
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index ac01430897..9cdd3eea0d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -28,6 +28,7 @@ LINUX_VERSION ?= "3.14.29"
28PV = "${LINUX_VERSION}+git${SRCPV}" 28PV = "${LINUX_VERSION}+git${SRCPV}"
29 29
30KMETA = "meta" 30KMETA = "meta"
31KCONF_BSP_AUDIT_LEVEL = "2"
31 32
32COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 33COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
33 34
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index f856d19f93..f1bf3bea90 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -28,6 +28,7 @@ LINUX_VERSION ?= "3.19"
28PV = "${LINUX_VERSION}+git${SRCPV}" 28PV = "${LINUX_VERSION}+git${SRCPV}"
29 29
30KMETA = "meta" 30KMETA = "meta"
31KCONF_BSP_AUDIT_LEVEL = "2"
31 32
32COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 33COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
33 34