summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-09-13 18:26:22 -0400
committerPatrick Williams <patrick@stwcx.xyz>2016-09-14 20:15:06 +0000
commit4a74ec997e4877303a943630f33b7510dd3bb000 (patch)
tree3a73571459849b0d3895ea06c32783438e9d5f95
parent2c007aa99fcecdecfa989e188abea306a0e479c7 (diff)
downloadtalos-openbmc-4a74ec997e4877303a943630f33b7510dd3bb000.tar.gz
talos-openbmc-4a74ec997e4877303a943630f33b7510dd3bb000.zip
Fix incorrect features check
For machine features, ensure the feature is enabled in both the distro config and the machine config before creating the pkggroup. Change-Id: Ibd041cd78c6167efb3463b21e4eb3eef64e3b6cb Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index d4f636cca..183db43db 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -9,10 +9,10 @@ PROVIDES = "${PACKAGES}"
PACKAGES = " \
packagegroup-obmc-phosphor-apps-extras \
packagegroup-obmc-phosphor-apps-extrasdev \
- ${@mf_enabled("obmc-phosphor-fan-mgmt", "packagegroup-obmc-phosphor-apps-fan-mgmt", d)} \
- ${@mf_enabled("obmc-phosphor-chassis-mgmt", "packagegroup-obmc-phosphor-apps-chassis-mgmt", d)} \
- ${@mf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \
- ${@mf_enabled("obmc-phosphor-flash-mgmt", "packagegroup-obmc-phosphor-apps-flash-mgmt", d)} \
+ ${@cf_enabled("obmc-phosphor-fan-mgmt", "packagegroup-obmc-phosphor-apps-fan-mgmt", d)} \
+ ${@cf_enabled("obmc-phosphor-chassis-mgmt", "packagegroup-obmc-phosphor-apps-chassis-mgmt", d)} \
+ ${@cf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \
+ ${@cf_enabled("obmc-phosphor-flash-mgmt", "packagegroup-obmc-phosphor-apps-flash-mgmt", d)} \
${@df_enabled("obmc-phosphor-event-mgmt", "packagegroup-obmc-phosphor-apps-event-mgmt", d)} \
${@df_enabled("obmc-phosphor-user-mgmt", "packagegroup-obmc-phosphor-apps-user-mgmt", d)} \
${@df_enabled("obmc-phosphor-system-mgmt", "packagegroup-obmc-phosphor-apps-system-mgmt", d)} \
OpenPOWER on IntegriCloud