diff options
Diffstat (limited to 'recipes-kernel/linux/linux-yocto_virtualization.inc')
| -rw-r--r-- | recipes-kernel/linux/linux-yocto_virtualization.inc | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index 84a7bd84..9a6554d1 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -1,13 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:" -SRC_URI += "file://xt-checksum.scc \ - file://ebtables.scc \ - file://vswitch.scc \ - file://lxc.scc \ - file://docker.scc \ - file://cgroup-hugetlb.scc \ - " -KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'features/kvm/qemu-kvm-enable.scc', '', d)}" +KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', ' features/kvm/qemu-kvm-enable.scc', '', d)}" KERNEL_MODULE_AUTOLOAD += "nf_conntrack_ipv6 openvswitch" KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm', '', d)}" @@ -15,6 +8,9 @@ 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)}" +# 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 # features will be found at the same relative offset from a search @@ -27,7 +23,24 @@ def kernel_cache_cond_feature(src_uri,feature): return "../recipe-sysroot-native/kcfg/" + feature -KERNEL_CACHE_FEATURES ?= "${@kernel_cache_cond_feature(d.getVar('SRC_URI'),'cfg/virtio.scc')}" +# no conditional, just use the yocto-kernel-cache addition, yes +# the src_uri isn't used, but we may need to check it in the future +def kernel_cache_feature(src_uri,feature): + return "../recipe-sysroot-native/kcfg/" + 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) + +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/vswitch.scc')} \ + ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/lxc.scc')} \ + ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/docker.scc')} \ + ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/cgroup-hugetlb.scc')} \ + ${@kernel_cache_feature(d.getVar('SRC_URI'),'cfg/criu.scc')} \ + " KERNEL_FEATURES:append = " ${KERNEL_CACHE_FEATURES}" # if kernel-yocto has been inherited (how we can check for configuration @@ -37,8 +50,12 @@ KERNEL_FEATURES:append = " ${KERNEL_CACHE_FEATURES}" do_kernel_metadata[depends] += "${@['', 'yocto-cfg-fragments-native:do_populate_sysroot'][(bb.data.inherits_class('kernel-yocto', d))]}" # xen kernel support -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" +# SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" +KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/xen.scc', 'xen', d )}" # k8s and k3s kernel support -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'k8s', ' file://kubernetes.scc', '', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'k3s', ' file://kubernetes.scc', '', d)}" +# SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'k8s', ' file://kubernetes.scc', '', d)}" +# SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'k3s', ' file://kubernetes.scc', '', d)}" +KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/kubernetes.scc', 'k8s', d )}" +KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/kubernetes.scc', 'k3s', d )}" + |