diff options
25 files changed, 28 insertions, 66 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend index 89811c4b6..04df9733b 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend @@ -1 +1 @@ -PHOSPHOR_MAPPER_CONFIGS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-dbus-interfaces-mapper-config-native')}" +PHOSPHOR_MAPPER_CONFIGS_append_df-openpower = " openpower-dbus-interfaces-mapper-config-native" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend index bbd9de086..ad56a88cd 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bbappend @@ -1 +1 @@ -OBMC_IPMI_SENSORS_PROVIDERS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem-sensor-inventory-mrw-native')}" +OBMC_IPMI_SENSORS_PROVIDERS_append_df-openpower = " openpower-ipmi-oem-sensor-inventory-mrw-native" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend index 11ac25786..00d44c886 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend @@ -1 +1 @@ -DEPENDS_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem-error-native')}" +DEPENDS_append_df-openpower = " openpower-ipmi-oem-error-native" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend index 87f2e7deb..e5de414f7 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/logging/phosphor-logging.bbappend @@ -1,5 +1,5 @@ -DEPENDS_append = " ${@cf_enabled(d, 'obmc-openpower', '\ +DEPENDS_append_df-openpower = " \ openpower-debug-collector-native \ openpower-dbus-interfaces-native \ openpower-occ-control-native \ - ')}" + " diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index 3bead5636..adccb9b12 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = " ${@cf_enabled(d, 'obmc-openpower', '\ +RDEPENDS_${PN}_append_df-openpower = " \ nativesdk-openpower-dbus-interfaces-yaml \ nativesdk-openpower-debug-collector-yaml \ - ')}" + " diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index e0e13aa73..7eb88fb71 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,24 +1,24 @@ -RDEPENDS_${PN}-extrasdevtools_append = " ${@cf_enabled(d, 'obmc-openpower', 'obmc-pydevtools')}" +RDEPENDS_${PN}-extrasdevtools_append_df-openpower = " obmc-pydevtools" # Add the deprecated /org/openbmc inventory namespace providing # obmc-mgr-inventory application to the inventory packagegroup # until all applications have been updated to use the new, # officially spec'ed xyz.openbmc_project.Inventory.Manager # provider (VIRTUAL-RUNTIME_obmc-inventory-manager). -RDEPENDS_${PN}-inventory_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-inventory')}" +RDEPENDS_${PN}-inventory_append_df-openpower = " obmc-mgr-inventory" # Add the deprecated /org/openbmc sensor namespace providing # the obmc-mgr-sensor application to the sensor # packagegroup until all applications have been updated to use # the new, officially spec'ed xyz.openbmc_project.SensorValue # providers (VIRTUAL-RUNTIME_obmc-sensor-hwmon). -RDEPENDS_${PN}-sensors_append = " ${@cf_enabled(d, 'obmc-openpower-legacy', 'obmc-mgr-sensor')}" +RDEPENDS_${PN}-sensors_append_df-openpower = " obmc-mgr-sensor" # Add checkstop monitor as part of host state management package # This will kick start a gpio monitor that will catch the # host checkstop conditions and takes necessary actions -RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'checkstop-monitor')}" +RDEPENDS_${PN}-host-state-mgmt_append_df-openpower = " checkstop-monitor" # Add openpower debug collector as a requirement for state-mgmt # since it is used during checkstop handling. -RDEPENDS_${PN}-host-state-mgmt_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-debug-collector')}" +RDEPENDS_${PN}-host-state-mgmt_append_df-openpower = " openpower-debug-collector" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend index e21ad4a00..20e12e618 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bbappend @@ -1 +1 @@ -VIRTUAL-RUNTIME_phosphor-ipmi-providers_append = " ${@cf_enabled(d, 'obmc-openpower', 'openpower-ipmi-oem')}" +VIRTUAL-RUNTIME_phosphor-ipmi-providers_append_df-openpower = " openpower-ipmi-oem" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend index a6089bb5f..5ba7c47eb 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN}_append = " ${@cf_enabled(d, 'obmc-openpower-extra', '\ +RDEPENDS_${PN}_append_df-openpower = " \ pflash \ gard \ fsidbg \ - ')}" + " diff --git a/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-distrovars.inc b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-distrovars.inc new file mode 100644 index 000000000..479e099fc --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-distrovars.inc @@ -0,0 +1,4 @@ +DISTRO_FEATURES += "openpower" +DISTRO_FEATURES_FILTER_NATIVE += "openpower" +DISTRO_FEATURES_FILTER_NATIVESDK += "openpower" +DISTROOVERRIDES .= ":df-openpower" diff --git a/meta-openbmc-machines/meta-openpower/conf/distro/openbmc-openpower.conf b/meta-openbmc-machines/meta-openpower/conf/distro/openbmc-openpower.conf new file mode 100644 index 000000000..5ee9b7c75 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/conf/distro/openbmc-openpower.conf @@ -0,0 +1,2 @@ +require conf/distro/include/phosphor-base.inc +require conf/distro/include/openpower-distrovars.inc 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 a67b7f5f2..b2927d325 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -7,9 +7,6 @@ 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/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/local.conf.sample index 02bdf502e..1b0f3c163 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/local.conf.sample @@ -85,7 +85,7 @@ MACHINE ??= "firestone" # 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-firestone/conf/machine/firestone.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf index 7035ec240..83f91e0c0 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,10 +12,4 @@ 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/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/local.conf.sample index 71919e3fc..48e27e986 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/local.conf.sample @@ -85,7 +85,7 @@ MACHINE ??= "garrison" # 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-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf index c26eb8d23..436c68a97 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,10 +11,4 @@ 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/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" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/local.conf.sample index cfc3cef7d..b2b739fce 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/local.conf.sample @@ -63,7 +63,7 @@ MACHINE ??= "romulus" # 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-romulus/conf/machine/romulus.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf index cbcda8c43..b16943a11 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,11 +13,5 @@ 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" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf index 543e7f9da..f24a74b01 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf @@ -2,3 +2,4 @@ require conf/distro/include/phosphor-base.inc 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-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 75ef28738..db6658fe5 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 @@ -15,12 +15,6 @@ require conf/machine/include/p9.inc 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 = "" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample index f0fa56b1e..f137436b5 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "zaius" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" 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 2216dc194..9b1050a08 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,12 +5,6 @@ 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/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample index f633c332d..897f5fe14 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample @@ -85,7 +85,7 @@ MACHINE ??= "barreleye" # 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-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf index 10866c8c0..2d16c2e8d 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,12 +13,6 @@ 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" |
