From 54480c55bee218cd04e22b46f3932140b97eed75 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 24 Sep 2024 12:52:33 +0000 Subject: kernel: simplify the kernel-cfg-fragments-native dependency The routine calculating the -native depdenency for configuration fragments had issues with variations in kernel PV definitions. To avoid making the routine even more complex, this commit switches to using the same variables that include the correct virtualization include file. This way, if bitbake has located and included the file that adds the -native dependency, we know that the variables will find the correct recipe. Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto_virtualization.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index e729c3b2..f58c9f9d 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -33,6 +33,8 @@ def distro_cond_feature(feature_fragment,distro_feature,d): feat = kernel_cache_feature("",feature_fragment) return bb.utils.contains('DISTRO_FEATURES', distro_feature, ' ' + feat, ' ', d) +# kept as a reference if we go back to a dynamically calculated +# fragment dependency. def kernel_meta_ver_depends(d): yocto_enabled = bb.data.inherits_class('kernel-yocto', d) if yocto_enabled: @@ -41,7 +43,7 @@ def kernel_meta_ver_depends(d): else: return "" -KERNEL_CFG_DEPENDS ?= "${@kernel_meta_ver_depends(d)}" +KERNEL_CFG_DEPENDS ?= "yocto-cfg-fragments-${LINUX_MAJOR}.${LINUX_MINOR}-native:do_populate_sysroot" KERNEL_CACHE_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \ ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \ -- cgit v1.2.3-54-g00ecf