[meta-virtualization][PATCH] xen-*image-minimal: Install *xen-acpi-processor package only for x86* machines

[meta-virtualization][PATCH] xen-*image-minimal: Install *xen-acpi-processor package only for x86* machines

[Kamil Dziezyk]

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 <kamil.dziezyk@arm.com>
Change-Id: I8dde00e3c78a1f9eea50b19fbc1981f5e26df133
---
 recipes-extended/images/xen-guest-image-minimal.bb | 6 +++++-
 recipes-extended/images/xen-image-minimal.bb       | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/images/xen-guest-image-minimal.bb b/recipes-extended/images/xen-guest-image-minimal.bb
index ca111b4..fced763 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 ea596ce..f6fa5ed 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"

--
2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Re: [meta-virtualization][PATCH] xen-*image-minimal: Install *xen-acpi-processor package only for x86* machines

[Bruce Ashfield]

Looks fine to me, so we have some ARM servers that have the ACPI feature that
are broken.

I've queued it to master-next, and will wait a bit to hear frmo Christopher.

Bruce

In message: [meta-virtualization][PATCH] xen-*image-minimal: Install *xen-acpi-processor package only for x86* machines
on 02/03/2022 Kamil Dziezyk wrote:

> 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 <kamil.dziezyk@arm.com>
> Change-Id: I8dde00e3c78a1f9eea50b19fbc1981f5e26df133
> ---
>  recipes-extended/images/xen-guest-image-minimal.bb | 6 +++++-
>  recipes-extended/images/xen-image-minimal.bb       | 5 ++++-
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-extended/images/xen-guest-image-minimal.bb b/recipes-extended/images/xen-guest-image-minimal.bb
> index ca111b4..fced763 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 ea596ce..f6fa5ed 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"
> 
> --
> 2.17.1
> 
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7070): https://lists.yoctoproject.org/g/meta-virtualization/message/7070
> Mute This Topic: https://lists.yoctoproject.org/mt/89501286/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>