From 44aea7b87307795fe4e089c51d45afccaa2f6525 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 20 Aug 2017 22:58:21 -0400 Subject: kernel-yocto: ensure that only valid BSPs are built There was a bug in the search routines responsible for locating BSP definitions which returned a valid match if only the ktype matched. This meant that someone looking for "qemux86foo" (which is an invalid definition) would potentially end up building "qemuarm" and be none the wiser (until it didn't boot). With this fix to the tools search routine, and improved return code testing, we will now stop the build and report and error to the user. [YOCTO: #11878] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 3 +++ meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 1ca0756c49..3c6df92131 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -143,6 +143,9 @@ do_kernel_metadata() { # expand kernel features into their full path equivalents bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE}) + if [ $? -ne 0 ] || [ -z "${bsp_definition}" ]; then + bbfatal_log "Could not locate BSP definiton for ${KMACHINE}/${LINUX_KERNEL_TYPE}." + fi meta_dir=$(kgit --meta) # run1: pull all the configuration fragments, no matter where they come from diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 2217a31076..4a78b897d3 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b DEPENDS = "git-native" -SRCREV = "9cd2b626d652bec10c6bc75275b35bfee74d447c" +SRCREV = "0571411cc033c11df7827508dd786876ce2f8c83" PR = "r12" PV = "0.2+git${SRCPV}" -- cgit 1.2.3-korg