commit 213de9498d778088bee159d24dd229a8dddec5be
author Patrick Williams <patrick@stwcx.xyz> Wed Aug 09 17:09:13 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Aug 10 17:04:21 2017 +0000
tree 271118a61d1127df1f511a15ad5910a42f76cbbf
parent a3afda87fc233d04837ba6d70ec0294deca5d774

meta-openpower: Convert MACHINE_FEATURE openpower-pflash to openpower-ubi-fs

Since pflash is no longer used when openpower-ubi-fs is enabled and
the only use of the openpower-pflash feature was to enable a pflash
dependency in obmc-op-flasher, remove obmc-op-flasher when
openpower-ubi-fs is enabled (thus removing pflash from the machine).

Change-Id: Ia11d2b11ac201a139e1c4d014d539d346e0c2479
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb

diff --git a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 9b48cf1..2741ef7 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -47,7 +47,7 @@
         obmc-flash-bios \
         obmc-flash-bmc \
         obmc-mgr-download \
-        obmc-op-flasher \
+        ${@mf_enabled(d, 'openpower-ubi-fs', '', 'obmc-op-flasher')} \
         obmc-control-bmc \
         openpower-software-manager \
         "

conf/machine/include/openpower.inc

diff --git a/conf/machine/include/openpower.inc b/conf/machine/include/openpower.inc
index 74b3268..984a377 100644
--- a/conf/machine/include/openpower.inc
+++ b/conf/machine/include/openpower.inc
@@ -4,7 +4,6 @@
         obmc-phosphor-flash-mgmt \
         obmc-host-ipmi \
         obmc-host-ctl \
-        openpower-pflash \
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
         obmc-bmc-state-mgmt \