diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-09-30 11:06:16 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-10-02 09:39:26 -0400 |
commit | 5b70104bf16aa2abbcfd50ad9479389a62c79d87 (patch) | |
tree | f50ac8b683e8acdcce66aa39ac49f64bcd170ce0 /recipes-kernel/linux/linux-yocto_4.12.bbappend | |
parent | bfba140b8353665e1b586c257982c4cb3f496ec3 (diff) | |
download | meta-virtualization-5b70104bf16aa2abbcfd50ad9479389a62c79d87.tar.gz |
linux-yocto: make bbappend have effect conditionally
Make these bbappend files to take effect only when DISTRO_FEATURES
contain 'virtualization'. Otherwise, we would meet failure failure
at system booting up qemux86. Related logs are as below.
systemd-modules-load[113]: Failed to insert 'kvm_amd': Operation not supported
systemd-modules-load[113]: Failed to insert 'kvm_intel': Operation not supported
Also, make kvm related settings depend on the 'kvm' distro feature.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-kernel/linux/linux-yocto_4.12.bbappend')
-rw-r--r-- | recipes-kernel/linux/linux-yocto_4.12.bbappend | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend index f163fdfc..617caccb 100644 --- a/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.12.bbappend | |||
@@ -1,20 +1 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} | |
2 | |||
3 | SRC_URI += "file://xt-checksum.scc \ | ||
4 | file://ebtables.scc \ | ||
5 | file://vswitch.scc \ | ||
6 | file://lxc.scc \ | ||
7 | file://docker.scc \ | ||
8 | " | ||
9 | KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc" | ||
10 | |||
11 | KERNEL_MODULE_AUTOLOAD += "openvswitch" | ||
12 | KERNEL_MODULE_AUTOLOAD += "kvm" | ||
13 | KERNEL_MODULE_AUTOLOAD += "kvm-amd" | ||
14 | KERNEL_MODULE_AUTOLOAD += "kvm-intel" | ||
15 | |||
16 | # aufs kernel support required for xen-image-minimal | ||
17 | KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" | ||
18 | |||
19 | # xen kernel support | ||
20 | SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" | ||