From 4369415b91387d873d6cb9364ba7961bd2d85435 Mon Sep 17 00:00:00 2001 From: Kamil Dziezyk Date: Wed, 2 Mar 2022 14:56:24 +0100 Subject: xen-*image-minimal: Install *xen-acpi-processor package only for x86* machines Kernel module xen_acpi_processor is built only for x86* architectures, therefore 'kernel-module-xen-acpi-processor' package is compatible only with x86* machines. Issue-Id: SCM-3892 Signed-off-by: Kamil Dziezyk Change-Id: I8dde00e3c78a1f9eea50b19fbc1981f5e26df133 Signed-off-by: Bruce Ashfield --- recipes-extended/images/xen-guest-image-minimal.bb | 6 +++++- recipes-extended/images/xen-image-minimal.bb | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/images/xen-guest-image-minimal.bb b/recipes-extended/images/xen-guest-image-minimal.bb index ca111b49..fced7639 100644 --- a/recipes-extended/images/xen-guest-image-minimal.bb +++ b/recipes-extended/images/xen-guest-image-minimal.bb @@ -4,9 +4,13 @@ inherit core-image features_check IMAGE_INSTALL += " \ packagegroup-core-boot \ - ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', '${XEN_ACPI_PROCESSOR_MODULE}', '', d)} \ " +XEN_ACPI_PROCESSOR_MODULE = "" +XEN_ACPI_PROCESSOR_MODULE:x86 = "kernel-module-xen-acpi-processor" +XEN_ACPI_PROCESSOR_MODULE:x86-64 = "kernel-module-xen-acpi-processor" + IMAGE_INSTALL += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}" # Install xf86-video-vesa on x86 platforms. diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index ea596ceb..f6fa5eda 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -5,7 +5,7 @@ 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)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', '${XEN_ACPI_PROCESSOR_MODULE}', '', d)} \ " IMAGE_INSTALL += " \ @@ -28,6 +28,9 @@ IMAGE_INSTALL:append:x86-64 = "kernel-module-tun" XEN_PCIBACK_MODULE = "" XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback" XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback" +XEN_ACPI_PROCESSOR_MODULE = "" +XEN_ACPI_PROCESSOR_MODULE:x86 = "kernel-module-xen-acpi-processor" +XEN_ACPI_PROCESSOR_MODULE:x86-64 = "kernel-module-xen-acpi-processor" LICENSE = "MIT" -- cgit v1.2.3-54-g00ecf