diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-03-19 13:33:57 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-03-19 13:35:05 +0000 |
commit | 29603462e1ce53f06604115f3866618fc9f5f3e0 (patch) | |
tree | 063efff794f10fbc23e9c3e75de3e25a84e574e0 | |
parent | 54f80102b0245ae7ca37103dafcf63c52ea47c89 (diff) | |
download | meta-virtualization-29603462e1ce53f06604115f3866618fc9f5f3e0.tar.gz |
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 <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-kernel/linux/linux-yocto/extra-configs.cfg | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_virtualization.inc | 13 |
2 files changed, 4 insertions, 10 deletions
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', | |||
8 | # aufs kernel support required for xen-image-minimal | 8 | # aufs kernel support required for xen-image-minimal |
9 | KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" | 9 | KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" |
10 | 10 | ||
11 | 11 | # Always add a local/layer fragment for easy debug and enabling of options | |
12 | # SRC_URI += "file://xt-checksum.scc \ | 12 | SRC_URI += "file://extra-configs.cfg" |
13 | # file://ebtables.scc \ | ||
14 | # file://vswitch.scc \ | ||
15 | # file://lxc.scc \ | ||
16 | # file://docker.scc \ | ||
17 | # file://cgroup-hugetlb.scc \ | ||
18 | # file://criu.scc \ | ||
19 | # " | ||
20 | 13 | ||
21 | # if the kernel-yocto meta-data routine automatically starts to add the | 14 | # if the kernel-yocto meta-data routine automatically starts to add the |
22 | # recipe-sysroot-native, we can do away with this conditional, since all | 15 | # recipe-sysroot-native, we can do away with this conditional, since all |
@@ -38,7 +31,7 @@ def kernel_cache_feature(src_uri,feature): | |||
38 | def distro_cond_feature(feature_fragment,distro_feature,d): | 31 | def distro_cond_feature(feature_fragment,distro_feature,d): |
39 | import bb | 32 | import bb |
40 | feat = kernel_cache_feature("",feature_fragment) | 33 | feat = kernel_cache_feature("",feature_fragment) |
41 | return bb.utils.contains('DISTRO_FEATURES', distro_feature, feat, '', d) | 34 | return bb.utils.contains('DISTRO_FEATURES', distro_feature, ' ' + feat, ' ', d) |
42 | 35 | ||
43 | KERNEL_CACHE_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \ | 36 | KERNEL_CACHE_FEATURES ?= "${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')} \ |
44 | ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \ | 37 | ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/xt-checksum.scc')} \ |