diff options
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend | 1 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb (renamed from meta-phosphor/classes/phosphor-hwmon-mrw.bbclass) | 8 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb | 2 | ||||
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 7 |
4 files changed, 15 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend deleted file mode 100644 index 9b0171290..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit phosphor-hwmon-mrw diff --git a/meta-phosphor/classes/phosphor-hwmon-mrw.bbclass b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb index 0821a2240..d72d5036b 100644 --- a/meta-phosphor/classes/phosphor-hwmon-mrw.bbclass +++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb @@ -1,5 +1,9 @@ -#Common code to generate the hwmon conf files from the MRW. -#Can be pulled in on a per system basis. +SUMMARY = "Phosphor hwmon configuration generator" +DESCRIPTION = "Generate phosphor-hwmon configuration from an MRW." +PR = "r1" + +inherit obmc-phosphor-license +inherit allarch DEPENDS += "mrw-perl-tools-native mrw-native" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb index d7a2d6df6..11e968feb 100644 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb +++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb @@ -23,6 +23,8 @@ RDEPENDS_${PN} += "\ phosphor-logging \ " +RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" + SRC_URI += "git://github.com/openbmc/phosphor-hwmon" SRC_URI += "file://70-hwmon.rules" diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 64309d15a..28e04ef3a 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -54,6 +54,13 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd" PREFERRED_PROVIDER_virtual/obmc-user-mgmt ?= "obmc-phosphor-user" PREFERRED_PROVIDER_virtual/obmc-wsgihost ?= "phosphor-gevent" +# phosphor-hwmon-config +# +# The phosphor-hwmon package can have its configuration generated +# automatically if the MRW feature is enabled. +VIRTUAL-RUNTIME_phosphor-hwmon-config ?= \ + "${@cf_enabled(d, 'obmc-mrw', 'phosphor-hwmon-config-mrw')}" + # virtual/phosphor-ipmi-fru-hostfw-config # # The phosphor-ipmi-fru application is data-driven and requires an input |
