diff options
author | Xo Wang <xow@google.com> | 2017-11-18 03:09:56 +0300 |
---|---|---|
committer | Xo Wang <xow@google.com> | 2018-01-10 22:41:12 +0300 |
commit | e4277ae851accf6574f906c00e808bc9ad9f9545 (patch) | |
tree | 849c78405734eeee917e75224cd47cde284f3693 | |
parent | e7728772a9305cc6220b824a85adc92411079b81 (diff) | |
download | openbmc-e4277ae851accf6574f906c00e808bc9ad9f9545.tar.xz |
Organize OpenPOWER BMC support as features
Add OBMC_MACHINE_FEATURES for OpenPOWER support under openpower.inc.
Select OpenPOWER features in the POWER machines' DISTRO_FEATURES so that
the features are built.
The features are:
obmc-openpower for required base support
obmc-openpower-extra for non-essential tools
obmc-openpower-legacy for deprecated packages like org.openbmc and
skeleton packages
Part of openbmc/openbmc#2652.
Change-Id: Ib9f44a0c2e243eebb6594de6554cdc3fa0d076af
Signed-off-by: Xo Wang <xow@google.com>
8 files changed, 46 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index cc9202742..cbabdbe74 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -7,6 +7,9 @@ OBMC_MACHINE_FEATURES += "\ obmc-host-state-mgmt \ obmc-chassis-state-mgmt \ obmc-bmc-state-mgmt \ + obmc-openpower \ + obmc-openpower-extra \ + obmc-openpower-legacy \ " VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf index 83f91e0c0..34abe31a1 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf @@ -12,4 +12,10 @@ UBOOT_LOADADDRESS = "0x40008000" 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-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf index 436c68a97..089c31233 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf @@ -11,4 +11,10 @@ UBOOT_LOADADDRESS = "0x40008000" 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-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 5d71bf4c3..3beb5857e 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,6 +15,12 @@ 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" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf index e5e98e992..06572a8e9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -13,5 +13,11 @@ require conf/machine/include/p9.inc 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"
\ No newline at end of file +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index a3b25fd2e..fe951e4c0 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -17,6 +17,12 @@ require conf/machine/include/p9.inc PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" PHOSPHOR_MRW_REV = "d25ba72d544b2878e322421b33a130836619664c" +DISTRO_FEATURES_append = "\ + obmc-openpower \ + obmc-openpower-extra \ + obmc-openpower-legacy \ + " + # Inhibit phosphor-hwmon-config-mrw VIRTUAL-RUNTIME_phosphor-hwmon-config = "" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 9b1050a08..f3371136d 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -5,6 +5,12 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" +DISTRO_FEATURES_append = "\ + obmc-openpower \ + obmc-openpower-extra \ + obmc-openpower-legacy \ + " + PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf index 2d16c2e8d..06262df1e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf @@ -13,6 +13,12 @@ FLASH_SIZE = "32768" OBMC_FAN_INSTANCES = "0 1 2 3 4 5" +DISTRO_FEATURES_append = "\ + obmc-openpower \ + obmc-openpower-extra \ + obmc-openpower-legacy \ + " + PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "barreleye-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "barreleye-led-manager-config-native" |