dbus-sensors: change build option of Intel cpu sensor
The build option of Intel cpu sensor service in dbus-sensors
repository is changed from "cpusensor" to "intelcpusensor". Update the
build option in openbmc source to match with that change.
dbus-sensors: srcrev bump 0fe0229497..255da6b419
Thu Nguyen (1):
cpusensor: Change cpusensor to intelcpusensor
Tested:
1. No build errors.
Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
Change-Id: Ib31f7ce3dd7d5ed1bb226eb991459ec0bf233973
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
index bfd03f8..b458b0c 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG:remove = " cpusensor ipmbsensor"
+PACKAGECONFIG:remove = " intelcpusensor ipmbsensor"
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
index 438e45b..2c70a84 100644
--- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
@@ -2,7 +2,7 @@
DESCRIPTION = "Dbus Sensor Services Configured from D-Bus"
SRC_URI = "git://github.com/openbmc/dbus-sensors.git;branch=master;protocol=https"
-SRCREV = "0fe0229497e2029901b9c807cff624013e0f1a58"
+SRCREV = "255da6b419082ec1f18046e818c5c3ca678fd607"
PV = "0.1+git${SRCPV}"
@@ -11,7 +11,7 @@
PACKAGECONFIG ??= " \
adcsensor \
- cpusensor \
+ intelcpusensor \
exitairtempsensor \
fansensor \
hwmontempsensor \
@@ -23,7 +23,7 @@
"
PACKAGECONFIG[adcsensor] = "-Dadc=enabled, -Dadc=disabled"
-PACKAGECONFIG[cpusensor] = "-Dcpu=enabled, -Dcpu=disabled"
+PACKAGECONFIG[intelcpusensor] = "-Dintel-cpu=enabled, -Dintel-cpu=disabled"
PACKAGECONFIG[exitairtempsensor] = "-Dexit-air=enabled, -Dexit-air=disabled"
PACKAGECONFIG[fansensor] = "-Dfan=enabled, -Dfan=disabled"
PACKAGECONFIG[hwmontempsensor] = "-Dhwmon-temp=enabled, -Dhwmon-temp=disabled"
@@ -37,8 +37,8 @@
SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \
'xyz.openbmc_project.adcsensor.service', \
'', d)}"
-SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpusensor', \
- 'xyz.openbmc_project.cpusensor.service', \
+SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'intelcpusensor', \
+ 'xyz.openbmc_project.intelcpusensor.service', \
'', d)}"
SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'exitairtempsensor', \
'xyz.openbmc_project.exitairsensor.service', \
diff --git a/meta-yadro/meta-vegman/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-yadro/meta-vegman/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 34b6209..563fd3f 100755
--- a/meta-yadro/meta-vegman/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-yadro/meta-vegman/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,6 +1,6 @@
PACKAGECONFIG = " \
adcsensor \
- cpusensor \
+ intelcpusensor \
fansensor \
hwmontempsensor \
intrusionsensor \