MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel/cfg: add space before distro optional features

Browse Source 
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 <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2024-03-19 13:33:57 +00:00
parent 54f80102b0
commit 29603462e1
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
recipes-kernel/linux/linux-yocto/extra-configs.cfg Normal file
View File

@ -0,0 +1 @@
# placeholder config fragment for local enable and debug

13
recipes-kernel/linux/linux-yocto_virtualization.inc
View File

@ -8,15 +8,8 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm',
# aufs kernel support required for xen-image-minimal # aufs kernel support required for xen-image-minimal
KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}"
# Always add a local/layer fragment for easy debug and enabling of options
# SRC_URI += "file://xt-checksum.scc \ SRC_URI += "file://extra-configs.cfg"
# file://ebtables.scc \
# file://vswitch.scc \
# file://lxc.scc \
# file://docker.scc \
# file://cgroup-hugetlb.scc \
# file://criu.scc \
# "
# if the kernel-yocto meta-data routine automatically starts to add the # if the kernel-yocto meta-data routine automatically starts to add the
# recipe-sysroot-native, we can do away with this conditional, since all # 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): def distro_cond_feature(feature_fragment,distro_feature,d):
import bb import bb
feat = kernel_cache_feature("",feature_fragment) 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_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \
${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \ ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \