summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-extended/images/xen-guest-image-minimal.bb6
-rw-r--r--recipes-extended/images/xen-image-minimal.bb5
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 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
4 4
5IMAGE_INSTALL += " \ 5IMAGE_INSTALL += " \
6 packagegroup-core-boot \ 6 packagegroup-core-boot \
7 ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ 7 ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', '${XEN_ACPI_PROCESSOR_MODULE}', '', d)} \
8 " 8 "
9 9
10XEN_ACPI_PROCESSOR_MODULE = ""
11XEN_ACPI_PROCESSOR_MODULE:x86 = "kernel-module-xen-acpi-processor"
12XEN_ACPI_PROCESSOR_MODULE:x86-64 = "kernel-module-xen-acpi-processor"
13
10IMAGE_INSTALL += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}" 14IMAGE_INSTALL += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}"
11 15
12# Install xf86-video-vesa on x86 platforms. 16# 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"
5XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \ 5XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \
6 kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \ 6 kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \
7 ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \ 7 ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \
8 ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ 8 ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', '${XEN_ACPI_PROCESSOR_MODULE}', '', d)} \
9 " 9 "
10 10
11IMAGE_INSTALL += " \ 11IMAGE_INSTALL += " \
@@ -28,6 +28,9 @@ IMAGE_INSTALL:append:x86-64 = "kernel-module-tun"
28XEN_PCIBACK_MODULE = "" 28XEN_PCIBACK_MODULE = ""
29XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback" 29XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback"
30XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback" 30XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback"
31XEN_ACPI_PROCESSOR_MODULE = ""
32XEN_ACPI_PROCESSOR_MODULE:x86 = "kernel-module-xen-acpi-processor"
33XEN_ACPI_PROCESSOR_MODULE:x86-64 = "kernel-module-xen-acpi-processor"
31 34
32LICENSE = "MIT" 35LICENSE = "MIT"
33 36