diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-09 08:04:00 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-13 05:51:39 +0300 |
| commit | 8623bbe4d4a187018cc3c265aaca5fa05b78d13b (patch) | |
| tree | 92566fed6a5d963b24658f634c1cce40841c8d01 /meta-phosphor/classes | |
| parent | 250a984fc21fa6de8ae7723d59409815758b7825 (diff) | |
| download | openbmc-8623bbe4d4a187018cc3c265aaca5fa05b78d13b.tar.xz | |
Convert obmc-ubi-fs to a distro feature
As with MRW the use of the UBI image scheme is distro policy.
Convert the existing machine feature to a distro feature.
Enable the new distro feature on the systems that use
it(Witherspoon).
Add a distro override and fix-up MF checks to use this override
instead for improved readability.
Tested: Built a Witherspoon image and validated image
Change-Id: I8ab03115bbfc2ecc77cff5c9eb8628903ae88051
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
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 \ |