summaryrefslogtreecommitdiff
path: root/meta-openpower/recipes-phosphor/packagegroups
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openpower/recipes-phosphor/packagegroups')
-rw-r--r--meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend5
-rw-r--r--meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb5
2 files changed, 7 insertions, 3 deletions
diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend
new file mode 100644
index 000000000..e2e4c6c02
--- /dev/null
+++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend
@@ -0,0 +1,5 @@
+OBMC_YAML_PROVIDER_RECIPES += " \
+ openpower-debug-collector-yaml-provider \
+ openpower-ipmi-oem-yaml-provider \
+ openpower-occ-control-yaml-provider \
+ "
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 = " \