From df856b9b73de8d43643e787bb531c456aeaa267a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 2 Oct 2024 03:33:44 +0000 Subject: [PATCH] kernel: make yocto-cfg-fragment dependency conditional There's no sense adding a fragment dependency to kernels that don't support merging. This commit restores the check we previously had for an inherit of kernel-yocto before adding the configuration fragmment dependency. Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto_virtualization.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index 1426cd55..283be0f8 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -43,7 +43,7 @@ def kernel_meta_ver_depends(d): else: return "" -KERNEL_CFG_DEPENDS ?= "yocto-cfg-fragments-${LINUX_MAJOR}.${LINUX_MINOR}-native:do_populate_sysroot" +KERNEL_CFG_DEPENDS ?= "${@['', 'yocto-cfg-fragments-${LINUX_MAJOR}.${LINUX_MINOR}-native:do_populate_sysroot'][(bb.data.inherits_class('kernel-yocto', d))]}" KERNEL_CACHE_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \ ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \