From baf30af86f0da867f688246b8af37713986228a7 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 21 Sep 2020 17:42:28 -0700 Subject: xen: make kernel modules an override possible variable Sometimes Xen is built with different mixes of kernel modules and built-in values. If we put our expected/default modules in a variable, they can be overriden by a different kernel provider as required Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-image-minimal.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index 1b45397b..6733801c 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -2,16 +2,16 @@ DESCRIPTION = "A minimal xen image" INITRD_IMAGE = "core-image-minimal-initramfs" +XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \ + kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \ + ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ + " + IMAGE_INSTALL += " \ packagegroup-core-boot \ packagegroup-core-ssh-openssh \ - ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ - kernel-module-xen-blkback \ - 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_KERNEL_MODULES} \ xen-tools \ qemu \ " -- cgit v1.2.3-54-g00ecf