diff options
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 6 | ||||
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 35843ea81..78ff846f6 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -19,9 +19,9 @@ inherit image_version # The reference BMC software update implementation. # Image composition -FLASH_KERNEL_IMAGE ?= "${@bb.utils.contains('MACHINE_FEATURES', \ - 'obmc-ubi-fs', 'fitImage-${MACHINE}.bin', \ - 'fitImage-${INITRAMFS_IMAGE}-${MACHINE}.bin', d)}" +FLASH_KERNEL_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.bin" +FLASH_KERNEL_IMAGE_df-obmc-ubi-fs ?= "fitImage-${MACHINE}.bin" + IMAGE_BASETYPE ?= "squashfs-xz" OVERLAY_BASETYPE ?= "jffs2" FLASH_UBI_BASETYPE ?= "${IMAGE_BASETYPE}" diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5391257fa..95a915261 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -76,9 +76,10 @@ IMAGE_FEATURES += " \ obmc-debug-collector \ obmc-network-mgmt \ obmc-settings-mgmt \ - ${@mf_enabled(d, 'obmc-ubi-fs', 'read-only-rootfs')} \ " +IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs" + CORE_IMAGE_EXTRA_INSTALL_append = " bash \ packagegroup-obmc-apps-extras \ packagegroup-obmc-apps-extrasdev \ |