| commit | 439742134230dac180d13d1f10a19eb2c677f797 | [log] [tgz] |
|---|---|---|
| author | Deepak Kodihalli <dkodihal@in.ibm.com> | Tue Feb 06 06:58:06 2018 -0600 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Feb 16 14:39:15 2018 +0000 |
| tree | 77bc5840c7a3f9a954aa722a4b429bf0c8c7b46f | |
| parent | 8f16a4f751478ac0849485b7b5b9b707473ce25c [diff] |
dcmi: rename get temp readings json Rename dcmi_temp_readings.json as dcmi_sensors.json. This will serve as the dcmi sensor config information to cater both the 'get temperature readings' and 'get sensor info' commands. Change-Id: Ia6f79330a4568be94555d8cb3f57eac23e486317 Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend index d47847d..ea809c1 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend
@@ -1,6 +1,6 @@ FILESEXTRAPATHS_append_witherspoon := ":${THISDIR}/${PN}" SRC_URI_append_witherspoon = " file://occ_sensors.hardcoded.yaml \ file://dev_id.json \ - file://dcmi_temp_readings.json \ + file://dcmi_sensors.json \ file://power_reading.json \ "
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_temp_readings.json b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_sensors.json similarity index 100% rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_temp_readings.json rename to meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_sensors.json
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb index 180d70d..91ceff9 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
@@ -71,7 +71,7 @@ file://dev_id.json \ file://dcmi_cap.json \ file://power_reading.json \ - file://dcmi_temp_readings.json \ + file://dcmi_sensors.json \ " HOSTIPMI_PROVIDER_LIBRARY += "libapphandler.so" @@ -85,7 +85,7 @@ FILES_${PN}_append = " ${datadir}/ipmi-providers/dev_id.json" FILES_${PN}_append = " ${datadir}/ipmi-providers/dcmi_cap.json" FILES_${PN}_append = " ${datadir}/ipmi-providers/power_reading.json" -FILES_${PN}_append = " ${datadir}/ipmi-providers/dcmi_temp_readings.json" +FILES_${PN}_append = " ${datadir}/ipmi-providers/dcmi_sensors.json" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" # Soft Power Off @@ -131,8 +131,8 @@ ${D}${datadir}/ipmi-providers/dcmi_cap.json install -m 0644 -D ${WORKDIR}/power_reading.json \ ${D}${datadir}/ipmi-providers/power_reading.json - install -m 0644 -D ${WORKDIR}/dcmi_temp_readings.json \ - ${D}${datadir}/ipmi-providers/dcmi_temp_readings.json + install -m 0644 -D ${WORKDIR}/dcmi_sensors.json \ + ${D}${datadir}/ipmi-providers/dcmi_sensors.json } # python-pyyaml-native is installed by do_configure, so put this task after addtask merge_sensors after do_configure before do_compile
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_temp_readings.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_sensors.json similarity index 100% rename from meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_temp_readings.json rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/dcmi_sensors.json