From 8f4e44d92c2a76b0cdec39f216e17ae9a4df5f71 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 9 Jul 2020 16:55:36 -0400 Subject: meta-openpower: opt out of phosphor-utils This pointless wrapper does nothing other than obfuscate intent for readers that have looked at bitbake metadata before. (From meta-openpower rev: edb2a53d9084a9040e1754cc1f681aa7961281e2) Change-Id: I1740ebccb1a6aa14e352824966619fd30ea3ca8e Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- .../recipes-phosphor/packagegroups/packagegroup-op-apps.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta-openpower') diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 04a3fbbb7b..db3967a446 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 = " \ -- cgit v1.2.3