Remove obmc-openpower-* machine features
The openpower layer supports a usage pattern of building non
openpower systems with the openpower layer included in the layer
configuration (introduced with 008b81bb).
As a part of 008b81bb a number of distro and machine features
were added. As with MRW and UBI before it, these features
are distro policy and not machine features. As such remove the
machine features.
Additionally converge the three feature variants down to a single
openpower feature since there aren't any in-tree systems that don't
enable all three.
Add a distro override and fix up combined feature checks to use
this override instead for improved readability.
Add a new distro configuration that enables these features and
point all Openpower sample local.conf files to this new distro
config.
Tested: Built and validated Witherspoon, Palmetto images
Change-Id: Ifa3df61fbe1803f00c38956c265604ba91d7d127
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-firestone/conf/local.conf.sample b/meta-firestone/conf/local.conf.sample
index 02bdf50..1b0f3c1 100644
--- a/meta-firestone/conf/local.conf.sample
+++ b/meta-firestone/conf/local.conf.sample
@@ -85,7 +85,7 @@
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
# As an example of a subclass there is a "bleeding" edge policy configuration
# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
diff --git a/meta-firestone/conf/machine/firestone.conf b/meta-firestone/conf/machine/firestone.conf
index 7035ec2..83f91e0 100644
--- a/meta-firestone/conf/machine/firestone.conf
+++ b/meta-firestone/conf/machine/firestone.conf
@@ -12,10 +12,4 @@
FLASH_SIZE = "32768"
-DISTRO_FEATURES_append = " \
- obmc-openpower \
- obmc-openpower-extra \
- obmc-openpower-legacy \
- "
-
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "firestone-ipmi-inventory-map-native"
diff --git a/meta-garrison/conf/local.conf.sample b/meta-garrison/conf/local.conf.sample
index 71919e3..48e27e9 100644
--- a/meta-garrison/conf/local.conf.sample
+++ b/meta-garrison/conf/local.conf.sample
@@ -85,7 +85,7 @@
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
# As an example of a subclass there is a "bleeding" edge policy configuration
# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
diff --git a/meta-garrison/conf/machine/garrison.conf b/meta-garrison/conf/machine/garrison.conf
index c26eb8d..436c68a 100644
--- a/meta-garrison/conf/machine/garrison.conf
+++ b/meta-garrison/conf/machine/garrison.conf
@@ -11,10 +11,4 @@
FLASH_SIZE = "32768"
-DISTRO_FEATURES_append = " \
- obmc-openpower \
- obmc-openpower-extra \
- obmc-openpower-legacy \
- "
-
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "garrison-ipmi-inventory-map-native"
diff --git a/meta-palmetto/conf/local.conf.sample b/meta-palmetto/conf/local.conf.sample
index e4b89fe..8627007 100644
--- a/meta-palmetto/conf/local.conf.sample
+++ b/meta-palmetto/conf/local.conf.sample
@@ -85,7 +85,7 @@
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
# As an example of a subclass there is a "bleeding" edge policy configuration
# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
diff --git a/meta-palmetto/conf/machine/palmetto.conf b/meta-palmetto/conf/machine/palmetto.conf
index cae2774..5d71bf4 100644
--- a/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-palmetto/conf/machine/palmetto.conf
@@ -15,12 +15,6 @@
PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml"
PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f"
-DISTRO_FEATURES_append = " \
- obmc-openpower \
- obmc-openpower-extra \
- obmc-openpower-legacy \
- "
-
PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory"
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "palmetto-led-manager-config-native"
diff --git a/meta-romulus/conf/local.conf.sample b/meta-romulus/conf/local.conf.sample
index cfc3cef..b2b739f 100644
--- a/meta-romulus/conf/local.conf.sample
+++ b/meta-romulus/conf/local.conf.sample
@@ -63,7 +63,7 @@
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "openbmc-openpower"
# As an example of a subclass there is a "bleeding" edge policy configuration
# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
diff --git a/meta-romulus/conf/machine/romulus.conf b/meta-romulus/conf/machine/romulus.conf
index cbcda8c..b16943a 100644
--- a/meta-romulus/conf/machine/romulus.conf
+++ b/meta-romulus/conf/machine/romulus.conf
@@ -13,11 +13,5 @@
PHOSPHOR_MRW_URI = "git://github.com/open-power/romulus-xml"
PHOSPHOR_MRW_REV = "14b471fbf37f5fb60261de001df83caf5f96d81f"
-DISTRO_FEATURES_append = " \
- obmc-openpower \
- obmc-openpower-extra \
- obmc-openpower-legacy \
- "
-
PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native"
PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native"
diff --git a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
index 543e7f9..f24a74b 100644
--- a/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ b/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -2,3 +2,4 @@
require conf/distro/include/phosphor-ubi.inc
require conf/distro/include/openpower-mrw.inc
require conf/distro/include/openpower-ubi.inc
+require conf/distro/include/openpower-distrovars.inc
diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 75ef287..db6658f 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -15,12 +15,6 @@
PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181"
-DISTRO_FEATURES_append = " \
- obmc-openpower \
- obmc-openpower-extra \
- obmc-openpower-legacy \
- "
-
# Inhibit phosphor-hwmon-config-mrw
VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""