meta-facebook: yosemite4: Increase dbus timeout to 60 sec
Due to many services experiencing dbus connection timeouts during the
boot phase, causing GetSubtree failures, increasing the dbus request
timeout to 60 seconds for the entire system.
Additionally, removing the previous short-term solution that adjusted
the fan sensor service order to avoid GetSubtree failures.
Change-Id: Ie2dad9bab7fa02bd1d4339fcaf689b459b20d4af
Signed-off-by: Eric Yang <eric.yang.wiwynn@gmail.com>
diff --git a/meta-facebook/meta-yosemite4/recipes-core/dbus/dbus-broker_%.bbappend b/meta-facebook/meta-yosemite4/recipes-core/dbus/dbus-broker_%.bbappend
new file mode 100644
index 0000000..b8415d5
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-core/dbus/dbus-broker_%.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+FILES:${PN}:append = " \
+ ${datadir}/dbus-1/system.d/yosemite4-system.conf \
+"
+
+SRC_URI += " \
+ file://yosemite4-system.conf \
+"
+
+do_install:append() {
+ install -d ${D}${datadir}/dbus-1/system.d
+ install -m 0644 ${UNPACKDIR}/yosemite4-system.conf ${D}${datadir}/dbus-1/system.d/
+}
diff --git a/meta-facebook/meta-yosemite4/recipes-core/dbus/files/yosemite4-system.conf b/meta-facebook/meta-yosemite4/recipes-core/dbus/files/yosemite4-system.conf
new file mode 100644
index 0000000..51d09a0
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-core/dbus/files/yosemite4-system.conf
@@ -0,0 +1,3 @@
+<busconfig>
+ <limit name="reply_timeout">60000</limit>
+</busconfig>
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors/yosemite4-fansensor.conf b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors/yosemite4-fansensor.conf
deleted file mode 100644
index d8d5e4a..0000000
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors/yosemite4-fansensor.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-After=multi-user.target
\ No newline at end of file
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors_%.bbappend
deleted file mode 100644
index 2495c1f..0000000
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-# Temporary hack: Adjusting the startup sequence of xyz.openbmc_project.fansensor.service
-# to address issues during BMC startup due to a busy D-Bus causing GetSubtree to fail.
-# This change moves the service to start after multi-user.target and before phosphor-pid-control.
-# This approach is not intended for long-term use.
-FILES:${PN}:append = " \
- ${systemd_system_unitdir}/xyz.openbmc_project.fansensor.service.d/*.conf \
-"
-
-SRC_URI += " \
- file://yosemite4-fansensor.conf \
-"
-
-do_install:append() {
- install -d ${D}${systemd_system_unitdir}/xyz.openbmc_project.fansensor.service.d
- install -m 0644 ${UNPACKDIR}/yosemite4-fansensor.conf ${D}${systemd_system_unitdir}/xyz.openbmc_project.fansensor.service.d/
-}