[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7390/8267] kernel-yocto: relax BSP definition test
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7390/8267] kernel-yocto: relax BSP definition test
- Date: Sun, 17 Dec 2017 06:10:52 +0000 (UTC)
commit fa664b1bba3ef8256083f4e52cafd0985d924586
Author: Bruce Ashfield <bruce ashfield windriver com>
Date: Wed Aug 23 15:20:20 2017 -0400
kernel-yocto: relax BSP definition test
commit 44aea7b873 [kernel-yocto: ensure that only valid BSPs are built]
introduced a new check to ensure that a valid BSP definition was found,
rather than building something that 'closely' matched the current
MACHINE.
This check breaks valid configurations which do not have a bsp
definition but are otherwise completely configured machines.
To allow both elements to co-exist (and not add warnings or errors
to otherwise valid builds), we first check to see if an empty bsp
definition was found, but then check to see if a defconfig was
provided.
If a defconfig has been provided, that is a sign that the board
configuration is complete and we should continue the build without
otherwise bothering the user.
Tested on meta-raspberrypi and linux-yocto*
(From OE-Core rev: 156cf9e25f875a50f907e570d9b62cbc2c051133)
Signed-off-by: Bruce Ashfield <bruce ashfield windriver com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/kernel-yocto.bbclass | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index c8ed1e9..1d44795 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -143,8 +143,11 @@ 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}."
+ if [ -z "$bsp_definition" ]; then
+ echo "$sccs" | grep -q defconfig
+ if [ $? -ne 0 ]; then
+ bberror "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no
defconfig was provided"
+ fi
fi
meta_dir=$(kgit --meta)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]