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/common/recipes-phosphor | |
| 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/common/recipes-phosphor')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb | 4 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb index 24b233f85..fcbe8ae5e 100644 --- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb +++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb @@ -161,8 +161,8 @@ python install_dreport_user_scripts() { os.symlink(srclink, destlink) } -#Enable ubifs-workaround by MACHINE_FEATURE obmc-ubi-fs. -PACKAGECONFIG_append = "${@mf_enabled(d, 'obmc-ubi-fs', 'ubifs-workaround')}" +#Enable ubifs-workaround by DISTRO_FEATURE obmc-ubi-fs. +PACKAGECONFIG_append_df-obmc-ubi-fs = " ubifs-workaround" PACKAGECONFIG[ubifs-workaround] = " \ --enable-ubifs-workaround, \ --disable-ubifs-workaround \ diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index fef72dcf8..ee6e13cb0 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -89,17 +89,20 @@ RDEPENDS_${PN}-sensors = " \ ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \ " +# These packages are not required with UBI enabled +${PN}-software-extras = " \ + obmc-flash-bmc \ + obmc-mgr-download \ + " + +${PN}-software-extras_df-obmc-ubi-fs = "" + SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ ${VIRTUAL-RUNTIME_obmc-bmc-version} \ - " -# Determine if the non-UBI flash packages are required -RDEPENDS_${PN}-software += " \ - ${@mf_enabled(d, 'obmc-ubi-fs', \ - '', \ - 'obmc-flash-bmc obmc-mgr-download')} \ + ${${PN}-software-extras} \ " SUMMARY_${PN}-debug-collector = "BMC debug collector" |