diff options
Diffstat (limited to 'poky/meta/classes')
| -rw-r--r-- | poky/meta/classes/grub-efi-cfg.bbclass | 3 | ||||
| -rw-r--r-- | poky/meta/classes/kernel.bbclass | 3 | ||||
| -rw-r--r-- | poky/meta/classes/systemd-boot-cfg.bbclass | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/poky/meta/classes/grub-efi-cfg.bbclass b/poky/meta/classes/grub-efi-cfg.bbclass index 5eeee6c2e..f661a69f8 100644 --- a/poky/meta/classes/grub-efi-cfg.bbclass +++ b/poky/meta/classes/grub-efi-cfg.bbclass @@ -27,6 +27,9 @@ EFIDIR = "/EFI/BOOT" GRUB_ROOT ?= "${ROOT}" APPEND ?= "" +# Uses MACHINE specific KERNEL_IMAGETYPE +PACKAGE_ARCH = "${MACHINE_ARCH}" + # Need UUID utility code. inherit fs-uuid diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index b346a6059..437b8c767 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -95,7 +95,8 @@ python __anonymous () { d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') image = d.getVar('INITRAMFS_IMAGE') - if image: + image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE') + if image and bb.utils.to_boolean(image_bundle, False): d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') # NOTE: setting INITRAMFS_TASK is for backward compatibility diff --git a/poky/meta/classes/systemd-boot-cfg.bbclass b/poky/meta/classes/systemd-boot-cfg.bbclass index 021c9f933..b3e0e6ad4 100644 --- a/poky/meta/classes/systemd-boot-cfg.bbclass +++ b/poky/meta/classes/systemd-boot-cfg.bbclass @@ -2,6 +2,9 @@ SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" SYSTEMD_BOOT_ENTRIES ?= "" SYSTEMD_BOOT_TIMEOUT ?= "10" +# Uses MACHINE specific KERNEL_IMAGETYPE +PACKAGE_ARCH = "${MACHINE_ARCH}" + # Need UUID utility code. inherit fs-uuid |