From f0e708ea8c88ff9efce91bdd70432acbe53fec87 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Mon, 2 Oct 2017 12:47:36 -0700 Subject: xen-guest-image-minimal: fix making PCI a x86-only dependency 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 Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-image-minimal.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index a01976e7..827cc879 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -10,16 +10,16 @@ IMAGE_INSTALL += " \ kernel-module-xen-gntalloc \ kernel-module-xen-gntdev \ kernel-module-xen-netback \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \ kernel-module-xen-wdt \ xen-base \ qemu \ " # Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86 -IMAGE_INSTALL_x86 += " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pci', 'kernel-module-xen-pciback', '', d)}" -IMAGE_INSTALL_x86-64 += " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'pci', 'kernel-module-xen-pciback', '', d)}" +XEN_PCIBACK_MODULE = "" +XEN_PCIBACK_MODULE_x86 = "kernel-module-xen-pciback" +XEN_PCIBACK_MODULE_x86-64 = "kernel-module-xen-pciback" LICENSE = "MIT" -- cgit v1.2.3-54-g00ecf