meta-ieisystem: Add phosphor-virtual-sensor
Both fp5280g3 and nf5280m7 depend on phosphor-virtual-sensor, so move
the phosphor-virtual-sensor to recipes-ieisystem/packagegroups.
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: I443c0a8df60f2e1b43c645ba827873cec8a62b93
diff --git a/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 129ab12..e622f7e 100644
--- a/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -9,6 +9,5 @@
srvcfg-manager \
biosconfig-manager \
phosphor-host-postd \
- phosphor-virtual-sensor \
libmctp \
"
diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
new file mode 100644
index 0000000..f07080e
--- /dev/null
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
@@ -0,0 +1,131 @@
+[
+ {
+ "Desc": {
+ "Name": "Total_Power",
+ "SensorType": "power"
+ },
+ "Associations": [
+ [
+ "chassis",
+ "all_sensors",
+ "/xyz/openbmc_project/inventory/system/board/chassis"
+ ]
+ ],
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "P1",
+ "Desc": {
+ "Name": "PSU0_PIN",
+ "SensorType": "power"
+ }
+ },
+ {
+ "ParamName": "P2",
+ "Desc": {
+ "Name": "PSU1_PIN",
+ "SensorType": "power"
+ }
+ },
+ {
+ "ParamName": "P3",
+ "Desc": {
+ "Name": "PSU2_PIN",
+ "SensorType": "power"
+ }
+ },
+ {
+ "ParamName": "P4",
+ "Desc": {
+ "Name": "PSU3_PIN",
+ "SensorType": "power"
+ }
+ }
+ ]
+ },
+ "Expression": "(P1 > 0 ? P1:0) + (P2 > 0 ? P2:0) + (P3 > 0 ? P3:0) + (P4 > 0 ? P4:0)"
+ },
+ {
+ "Desc": {
+ "Name": "GPU_Temp",
+ "SensorType": "temperature",
+ "MinValue": -128,
+ "MaxValue": 127
+ },
+ "Params": {
+ "DbusParam": [
+ {
+ "ParamName": "n0",
+ "Desc": {
+ "Name": "R_PCIE0_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n1",
+ "Desc": {
+ "Name": "R_PCIE1_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n2",
+ "Desc": {
+ "Name": "R_PCIE2_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n3",
+ "Desc": {
+ "Name": "R_PCIE3_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n4",
+ "Desc": {
+ "Name": "R_PCIE4_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n5",
+ "Desc": {
+ "Name": "R_PCIE5_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n6",
+ "Desc": {
+ "Name": "R_PCIE6_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n7",
+ "Desc": {
+ "Name": "R_PCIE7_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n8",
+ "Desc": {
+ "Name": "R_PCIE8_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ },
+ {
+ "ParamName": "n9",
+ "Desc": {
+ "Name": "R_PCIE9_GPU_Temp",
+ "SensorType": "temperature"
+ }
+ }
+ ]
+ },
+ "Expression": "max(0,n0, n1, n2, n3,n4,n5,n6,n7,n8,n9)"
+ }
+]
diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
new file mode 100644
index 0000000..9bfbdcb
--- /dev/null
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " file://virtual_sensor_config.json"
+
+do_install:append() {
+ install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
+}
diff --git a/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend
index e3c7b8e..0144d71 100644
--- a/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,5 +1,6 @@
RDEPENDS:${PN}-extras:append = " \
iei-ipmi-oem \
+ phosphor-virtual-sensor \
tzdata-core \
"