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

xen-guest-image-minimal: fix making PCI a x86-only dependency

Browse Source 
The logic for restricting the xen-pciback kernel module to x86-only
images was incorrect, resulting in the IMAGE_INSTALL_x86 and _x86-64
variables causing the IMAGE_INSTALL variable contents to be
overridden and incomplete.

This correction removes the specialized IMAGE_INSTALL_x86 and _x84-64
variables. The replacement logic causes a value with
conditionally-populated contents to be added to the IMAGE_INSTALL
variable.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Christopher Clark 2017-10-02 12:47:36 -07:00 committed by Bruce Ashfield
parent 44e74c9aa7
commit f0e708ea8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-extended/images/xen-image-minimal.bb
View File

@ -10,16 +10,16 @@ IMAGE_INSTALL += " \
kernel-module-xen-gntalloc \ kernel-module-xen-gntalloc \
kernel-module-xen-gntdev \ kernel-module-xen-gntdev \
kernel-module-xen-netback \ kernel-module-xen-netback \
${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
kernel-module-xen-wdt \ kernel-module-xen-wdt \
xen-base \ xen-base \
qemu \ qemu \
" "
# Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86 # Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86
IMAGE_INSTALL_x86 += " \ XEN_PCIBACK_MODULE = ""
${@bb.utils.contains('MACHINE_FEATURES', 'pci', 'kernel-module-xen-pciback', '', d)}" XEN_PCIBACK_MODULE_x86 = "kernel-module-xen-pciback"
IMAGE_INSTALL_x86-64 += " \ XEN_PCIBACK_MODULE_x86-64 = "kernel-module-xen-pciback"
${@bb.utils.contains('MACHINE_FEATURES', 'pci', 'kernel-module-xen-pciback', '', d)}"
LICENSE = "MIT" LICENSE = "MIT"