summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2018-09-26 19:26:43 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-09-30 21:31:16 -0400
commit2dc1de2286bbf72afd8009188e1e1ec9fb35f804 (patch)
tree254737dac3815676c831307be12049d2019a0cba
parent6e3fb05e2a67f0a21971357b2459ac59e03e352e (diff)
downloadmeta-virtualization-2dc1de2286bbf72afd8009188e1e1ec9fb35f804.tar.gz
kernel: forcedly load nf_conntrack_ipv6 to work around kernel module loading failure
In the v4.18 kernel, there is a problem with the locking and init sequence of the kernel modules. This would cause nf_conntrack_ipv6 failed to be loaded. In kernel v4.19, nf_conntrack_ipv6 has been merged to nf_conntrack and the problematic code has gone. This patch just works around by forcedly loading nf_conntrack_ipv6. Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-kernel/linux/linux-yocto_virtualization.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc
index c09b07c2..5d3cbc66 100644
--- a/recipes-kernel/linux/linux-yocto_virtualization.inc
+++ b/recipes-kernel/linux/linux-yocto_virtualization.inc
@@ -8,7 +8,7 @@ SRC_URI += "file://xt-checksum.scc \
8 " 8 "
9KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'features/kvm/qemu-kvm-enable.scc', '', d)}" 9KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'features/kvm/qemu-kvm-enable.scc', '', d)}"
10 10
11KERNEL_MODULE_AUTOLOAD += "openvswitch" 11KERNEL_MODULE_AUTOLOAD += "nf_conntrack_ipv6 openvswitch"
12KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm', '', d)}" 12KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm', '', d)}"
13 13
14# aufs kernel support required for xen-image-minimal 14# aufs kernel support required for xen-image-minimal