meta-ampere: mtjade: clean up phosphor-hwmon configs
Disable phosphor-hwmon from compilation and clean up sensor inventory
which added before for phosphor-hwmon.
Tested:
1. Check if no phosphor-hwmon compiled and run
2. Check all S0 and S1 ADC sensors are still available in Redfish.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Ic6ac13963e755e6ef0d93b3f6486546c61b1abe0
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
index e7b3256..5e535d5 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
@@ -72,68 +72,7 @@
"/xyz/openbmc_project/sensors/fan_tach/FAN8_1",
"/xyz/openbmc_project/sensors/fan_tach/FAN8_2",
"/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1",
- "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1",
-
- "/xyz/openbmc_project/sensors/temperature/TS1_Temp",
- "/xyz/openbmc_project/sensors/temperature/TS2_Temp",
- "/xyz/openbmc_project/sensors/temperature/TS3_Temp",
- "/xyz/openbmc_project/sensors/temperature/TS4_Temp",
- "/xyz/openbmc_project/sensors/temperature/TS5_Temp",
- "/xyz/openbmc_project/sensors/temperature/TS6_Temp",
- "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP",
- "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP",
-
- "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC",
- "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP",
- "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123",
- "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123",
- "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123",
- "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567",
- "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567",
- "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567",
- "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA",
- "/xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH",
- "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH",
- "/xyz/openbmc_project/sensors/voltage/S0_1V8_SOC",
- "/xyz/openbmc_project/sensors/voltage/S0_1V8_PCP",
- "/xyz/openbmc_project/sensors/voltage/S0_3V3_SOC",
- "/xyz/openbmc_project/sensors/voltage/S0_CPU_VCORE",
- "/xyz/openbmc_project/sensors/voltage/S0_DIMM_DDR_Volt",
- "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR1_Volt",
- "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR2_Volt",
- "/xyz/openbmc_project/sensors/voltage/S0_RCA_VR_Volt",
- "/xyz/openbmc_project/sensors/voltage/S0_SOC_Volt",
- "/xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC",
- "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP",
- "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123",
- "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123",
- "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123",
- "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567",
- "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567",
- "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567",
- "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA",
- "/xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH",
- "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH",
- "/xyz/openbmc_project/sensors/voltage/S1_1V8_SOC",
- "/xyz/openbmc_project/sensors/voltage/S1_1V8_PCP",
- "/xyz/openbmc_project/sensors/voltage/S1_3V3_SOC",
- "/xyz/openbmc_project/sensors/voltage/3V3_SB",
- "/xyz/openbmc_project/sensors/voltage/VBAT_RTC",
- "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT",
- "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT",
- "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT",
- "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT",
-
- "/xyz/openbmc_project/sensors/power/PSU0_PINPUT",
- "/xyz/openbmc_project/sensors/power/PSU1_PINPUT",
- "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT",
- "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT",
- "/xyz/openbmc_project/sensors/power/total_power",
-
- "/xyz/openbmc_project/sensors/current/PSU0_IINPUT",
- "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT",
- "/xyz/openbmc_project/sensors/current/PSU1_IINPUT",
- "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT"
+ "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1"
]
}
]
diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 56db568..7b27a7e 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -3,13 +3,17 @@
phosphor-image-signing \
phosphor-virtual-sensor \
phosphor-misc-usb-ctrl \
- "
+ fault-monitor \
+ id-button \
+ psu-hotswap-reset \
+ "
RDEPENDS:${PN}-inventory:append:mtjade = " \
- fault-monitor \
- id-button \
- psu-hotswap-reset \
host-gpio-handling \
dbus-sensors \
entity-manager \
- "
+ "
+
+RDEPENDS:${PN}-extras:remove:mtjade = " phosphor-hwmon"
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
+RDEPENDS:${PN}-extras:append:mtjade = " phosphor-virtual-sensor"