From 47425c21c7314a258752004eb75c72f724c3c2e0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Oct 2020 14:16:24 -0400 Subject: config: make kernel meta data include more specific Rather than only matching on the major/minor version, we should also check that the SRC_URI contains a "type=kmeta", to indicate that a kernel-meta data repository is available. This allows fragment enabled kernels, that don't want to use the main kernel meta data repository to not throw an error (when their version matches one of the reference kernels). This can potentially mask runtime issues (since kernel configuration options may not be present in the final kernel), but it makes the layer more usable, so we take the tradeoff. Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-%.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-%.bbappend b/recipes-kernel/linux/linux-%.bbappend index 2a2335bc..bcd358df 100644 --- a/recipes-kernel/linux/linux-%.bbappend +++ b/recipes-kernel/linux/linux-%.bbappend @@ -4,7 +4,9 @@ LINUX_MAJOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[0]}" LINUX_MINOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[1]}" -include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-yocto_${LINUX_MAJOR}.${LINUX_MINOR}_virtualization.inc', '', d)} +KERNEL_META_TYPE ?= "${@bb.utils.contains('SRC_URI', 'type=kmeta', 'yocto', '', d)}" + +include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-${KERNEL_META_TYPE}_${LINUX_MAJOR}.${LINUX_MINOR}_virtualization.inc', '', d)} -- cgit v1.2.3-54-g00ecf