diff options
| author | Matthew Barth <msbarth@us.ibm.com> | 2021-08-19 18:55:57 +0300 |
|---|---|---|
| committer | Matthew Barth <msbarth@linux.ibm.com> | 2021-09-13 18:39:16 +0300 |
| commit | 9a6d1185cfd782e326292705330e69566e3bfa7d (patch) | |
| tree | b8cbf6db0019ae0ee6d1acafcf5d66258dacf5ce /meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | |
| parent | 810504de6665d0c48040787c7bbd52d1c90ee0cc (diff) | |
| download | openbmc-9a6d1185cfd782e326292705330e69566e3bfa7d.tar.xz | |
meta-ibm:fans:control: Use JSON config files installed from repo
The `p10bmc` machine's JSON config files should now use the JSON config
files installed from the repository.
Change-Id: Ibd9bbc055e4d00a5f799a291e9fd3a9955d774c5
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend')
| -rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index aa1925b7f..f9b26135f 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -63,49 +63,6 @@ EXTRA_OECONF:append:witherspoon = " --disable-json-control" PACKAGECONFIG:append:p10bmc = " json sensor-monitor" FAN_PACKAGES:append:p10bmc = " sensor-monitor" -# Install fan control JSON config files -SRC_URI:append:p10bmc = " \ - file://manager.json \ - file://rainier/fans.json \ - file://rainier-1s4u/fans.json \ - file://rainier-2u/zones.json \ - file://rainier-4u/zones.json \ - file://rainier-1s4u/zones.json \ - file://everest/fans.json \ - file://everest/zones.json" -do_install:append:p10bmc() { - # Install fan control manager config file - install -d ${D}/${datadir}/phosphor-fan-presence/control/ - install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/ - - # Install Rainier-2U/4U fan config files - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u - install -m 0644 ${WORKDIR}/rainier/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier/ - install -m 0644 ${WORKDIR}/rainier-1s4u/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - install -m 0644 ${WORKDIR}/rainier-2u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ - install -m 0644 ${WORKDIR}/rainier-4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ - install -m 0644 ${WORKDIR}/rainier-1s4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - - # Install Everest fan config files - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest - install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ - install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ -} -FILES:${PN}-control:append:p10bmc = " \ - ${datadir}/phosphor-fan-presence/control/manager.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/fans.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/zones.json" - # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines SYSTEMD_SUBSTITUTIONS:witherspoon = "ADDR:100:phosphor-fan-control@.service" |