From 5be8686e659c42985fb6ee22dd6a6152735f414e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 8 Oct 2020 18:33:41 -0400 Subject: [PATCH] kernel: fix conditional application of fragments using bb.utils.contains wasn't able to match on the substring "type=kmeta" to enable the conditional inclusion of fragments and KERNEL_FEATURES. We switch to a python string only method so we can fix the fragment application Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-%.bbappend | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-%.bbappend b/recipes-kernel/linux/linux-%.bbappend index bcd358df..5f315787 100644 --- a/recipes-kernel/linux/linux-%.bbappend +++ b/recipes-kernel/linux/linux-%.bbappend @@ -4,9 +4,7 @@ LINUX_MAJOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[0]}" LINUX_MINOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[1]}" -KERNEL_META_TYPE ?= "${@bb.utils.contains('SRC_URI', 'type=kmeta', 'yocto', '', d)}" + +KERNEL_META_TYPE = "${@'yocto' if d.getVar('SRC_URI').find('type=kmeta') > 0 else 'none'}" include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-${KERNEL_META_TYPE}_${LINUX_MAJOR}.${LINUX_MINOR}_virtualization.inc', '', d)} - - -