From 29603462e1ce53f06604115f3866618fc9f5f3e0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 19 Mar 2024 13:33:57 +0000 Subject: kernel/cfg: add space before distro optional features distro optional features need to ensure that they are space separated or we'll have configuration failures. Additionally, always add a local configuration fragment for easy debug and enablement of options. Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto/extra-configs.cfg | 1 + recipes-kernel/linux/linux-yocto_virtualization.inc | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto/extra-configs.cfg diff --git a/recipes-kernel/linux/linux-yocto/extra-configs.cfg b/recipes-kernel/linux/linux-yocto/extra-configs.cfg new file mode 100644 index 00000000..a43bbcbc --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/extra-configs.cfg @@ -0,0 +1 @@ +# placeholder config fragment for local enable and debug \ No newline at end of file diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index 0ace9a75..9a6554d1 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -8,15 +8,8 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm', # aufs kernel support required for xen-image-minimal KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" - -# SRC_URI += "file://xt-checksum.scc \ -# file://ebtables.scc \ -# file://vswitch.scc \ -# file://lxc.scc \ -# file://docker.scc \ -# file://cgroup-hugetlb.scc \ -# file://criu.scc \ -# " +# Always add a local/layer fragment for easy debug and enabling of options +SRC_URI += "file://extra-configs.cfg" # if the kernel-yocto meta-data routine automatically starts to add the # recipe-sysroot-native, we can do away with this conditional, since all @@ -38,7 +31,7 @@ def kernel_cache_feature(src_uri,feature): def distro_cond_feature(feature_fragment,distro_feature,d): import bb feat = kernel_cache_feature("",feature_fragment) - return bb.utils.contains('DISTRO_FEATURES', distro_feature, feat, '', d) + return bb.utils.contains('DISTRO_FEATURES', distro_feature, ' ' + feat, ' ', 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')} \ -- cgit v1.2.3-54-g00ecf