meta-ieisystem: Add dbus-sensor
Since all IEI machines depend on dbus-sensors instead of
phosphor-hwmon by default, phosphor-hwmon is disabled and
dbus-sensors is enabled by default.
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: Ib1d7624327790419d30c27c7b965995bbd11bd79
diff --git a/meta-ieisystem/conf/machine/include/ieisystem.inc b/meta-ieisystem/conf/machine/include/ieisystem.inc
new file mode 100644
index 0000000..627aab0
--- /dev/null
+++ b/meta-ieisystem/conf/machine/include/ieisystem.inc
@@ -0,0 +1 @@
+VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
diff --git a/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
index 4c99703..555a648 100644
--- a/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
@@ -10,6 +10,7 @@
require conf/distro/include/phosphor-mmc.inc
require conf/machine/include/ast2600.inc
+require conf/machine/include/ieisystem.inc
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/openpower.inc
require conf/distro/include/pldm.inc
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 d166a01..129ab12 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
@@ -6,7 +6,6 @@
"
RDEPENDS:${PN}-extras:append = " \
- dbus-sensors \
srvcfg-manager \
biosconfig-manager \
phosphor-host-postd \
diff --git a/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend
new file mode 100644
index 0000000..71dd783
--- /dev/null
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -0,0 +1,8 @@
+PACKAGECONFIG = " \
+ adcsensor \
+ fansensor \
+ hwmontempsensor \
+ nvmesensor \
+ psusensor \
+ "
+
diff --git a/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
index 5a47f0e..ea06862 100644
--- a/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -15,3 +15,5 @@
FLASH_SIZE = "65536"
SOCSEC_SIGN_ENABLE = "0"
+
+require conf/machine/include/ieisystem.inc
diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend
new file mode 100644
index 0000000..0cd9e07
--- /dev/null
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -0,0 +1,10 @@
+PACKAGECONFIG = " \
+ adcsensor \
+ fansensor \
+ hwmontempsensor \
+ intelcpusensor \
+ ipmbsensor \
+ nvmesensor \
+ pciesensor \
+ psuensor \
+ "