diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-09 01:02:10 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
| commit | 509842add85b53e13164c1569a1fd43d5b8d91c5 (patch) | |
| tree | 76924605047acac2a2877210cd37cbd23851d4e0 /meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto | |
| parent | 09806a566ce7af38691ec9a9b9c26ebe3463f746 (diff) | |
| download | talos-openbmc-509842add85b53e13164c1569a1fd43d5b8d91c5.tar.gz talos-openbmc-509842add85b53e13164c1569a1fd43d5b8d91c5.zip | |
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>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample | 2 | ||||
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample index e4b89fea6..8627007f7 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -85,7 +85,7 @@ MACHINE ??= "palmetto" # 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-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index cae277426..5d71bf4c3 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -15,12 +15,6 @@ FLASH_SIZE = "32768" 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" |
