meta-openpower: Predicate packages on MACHINE_FEATURES
Change packages enabled by meta-openpower to be enabled if and only if
both its corresponding feature string (obmc-openpower,
obmc-openpower-extra, obmc-openpower-legacy) are present in both
MACHINE_FEATURES and DISTRO_FEATURES.
Fixes openbmc/openbmc#2652.
Change-Id: Ife1a9b08e94bd85a888d584a0caa4dbfa6a172c0
Signed-off-by: Xo Wang <xow@google.com>
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index cd61060..e0e13aa 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,24 +1,24 @@
-RDEPENDS_${PN}-extrasdevtools += "obmc-pydevtools"
+RDEPENDS_${PN}-extrasdevtools_append = " ${@cf_enabled(d, 'obmc-openpower', 'obmc-pydevtools')}"
# Add the deprecated /org/openbmc inventory namespace providing
# obmc-mgr-inventory application to the inventory packagegroup
# until all applications have been updated to use the new,
# officially spec'ed xyz.openbmc_project.Inventory.Manager
# provider (VIRTUAL-RUNTIME_obmc-inventory-manager).
-RDEPENDS_${PN}-inventory += "obmc-mgr-inventory"
+RDEPENDS_${PN}-inventory_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-inventory')}"
# Add the deprecated /org/openbmc sensor namespace providing
# the obmc-mgr-sensor application to the sensor
# packagegroup until all applications have been updated to use
# the new, officially spec'ed xyz.openbmc_project.SensorValue
# providers (VIRTUAL-RUNTIME_obmc-sensor-hwmon).
-RDEPENDS_${PN}-sensors += "obmc-mgr-sensor"
+RDEPENDS_${PN}-sensors_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-sensor')}"
# Add checkstop monitor as part of host state management package
# This will kick start a gpio monitor that will catch the
# host checkstop conditions and takes necessary actions
-RDEPENDS_${PN}-host-state-mgmt += "checkstop-monitor"
+RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'checkstop-monitor')}"
# Add openpower debug collector as a requirement for state-mgmt
# since it is used during checkstop handling.
-RDEPENDS_${PN}-host-state-mgmt += "openpower-debug-collector"
+RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-debug-collector')}"