From ab79e2ad6e7dcd18a9663dfa0dca4cfef76bc13f Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Mon, 25 Jan 2021 15:25:11 -0600 Subject: ibm: Start phosphor-fan-presence at multi-user This will start phosphor-fan-presence at the multi-user target. It doesn't need to know about the power state when just checking GPIOs and tach sensors, so let it run all the time. It also avoids a race condition with phosphor-fan-monitor if it starts earlier. This commit also adds a JSON vs YAML packageconfig so service files can be installed to different places based on how it is configured. And since the service file has different contents based on when it starts, the phosphor-fan-presence-tach@.service file was moved into the repo so that the repo itself can determine which one to install based on how the JSON vs YAML configuration option is set. Signed-off-by: Matt Spinler Change-Id: I4c00f0854974c70efb5097d0344c45385dbcb085 --- meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 2b6da5946..09d4fd601 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -56,11 +56,12 @@ FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${IN SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it -EXTRA_OECONF_append_witherspoon = " --enable-json --disable-json-control" +PACKAGECONFIG_append_witherspoon = " json" +EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -EXTRA_OECONF_append_rainier = " --enable-json" +PACKAGECONFIG_append_rainier = " json" RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" -- cgit v1.2.3