From 5da3c2284560a7e08ffafd03c5b5ba44a3242228 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Thu, 12 Nov 2020 12:09:57 -0600 Subject: fans:witherspoon: Disable JSON on fan control Witherspoon should still use YAML based configs for fan control instead of JSON. Once all of fan control's JSON support is available and witherspoon's YAML fan configs are converted to JSON, this can be removed to enable JSON. *Temporarily pin to 8e1b382122fed73e788d44f3a67cecbfbcc6972e to pass CI (From meta-ibm rev: 7ec9b860b5ea1d986702bb978b528ddcd28f2ce5) Change-Id: Ic31f5ab915d5478b9a2027732bd3ffd44f50b02f Signed-off-by: Matthew Barth Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor/fans') diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index cb89a3a08..834768cee 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,3 +1,5 @@ +SRCREV = "8e1b382122fed73e788d44f3a67cecbfbcc6972e" + FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # Package configuration @@ -56,7 +58,7 @@ 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" +EXTRA_OECONF_append_witherspoon = " --enable-json --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -- cgit v1.2.3