diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb')
| -rw-r--r-- | meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 04a3fbbb7..db3967a44 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -2,7 +2,6 @@ SUMMARY = "OpenBMC for OpenPOWER - Applications" PR = "r1" inherit packagegroup -inherit obmc-phosphor-utils PROVIDES = "${PACKAGES}" PACKAGES = " \ @@ -30,10 +29,10 @@ RDEPENDS_${PN}-chassis = " \ obmc-host-failure-reboots \ " #Pull in obmc-fsi on all P9 OpenPOWER systems -RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'op-fsi', 'op-fsi')}" +RDEPENDS_${PN}-chassis += "${@bb.utils.contains('MACHINE_FEATURES', 'op-fsi', 'op-fsi', '', d)}" #Pull in p9-cfam-override on all P9 OpenPOWER systems -RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'p9-cfam-override', 'p9-cfam-override')}" +RDEPENDS_${PN}-chassis += "${@bb.utils.contains('MACHINE_FEATURES', 'p9-cfam-override', 'p9-cfam-override', '', d)}" SUMMARY_${PN}-fans = "OpenPOWER Fans" RDEPENDS_${PN}-fans = " \ |