diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-20 19:17:44 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-10 21:26:33 +0300 |
commit | 2d70fcc97fa893393778a50414ef13c341d92b2e (patch) | |
tree | a966cb71148891854c6e8ac8a5b060fec45db65c /meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend | |
parent | a5f2fd4705fa685a1ba03705ab7fafecb6090385 (diff) | |
download | openbmc-2d70fcc97fa893393778a50414ef13c341d92b2e.tar.xz |
spoon: Remove wildcards from fan recipe appends
The intent of the wildcards was to match the base recipe
irrespective of version but you don't need the wildcard
to do that. Simply use the recipe name without the version
to match any version of the base recipe.
With the wildcards phosphor-fan%.bbappend for instance
matched every recipe that starts with phosphor-fan causing
strange build warnings like:
invalid packageconfig cooling-type
while building some of the native fan configuration recipes.
Tested: Built a Witherspoon image
(From meta-ibm rev: 56b4d017ce31e686694eb0b304acd6bb9a1d460e)
Change-Id: I83549464086178956405096dcec2729235e4897f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend')
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend new file mode 100644 index 000000000..8cc310e7c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -0,0 +1,33 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +# Package configuration +FAN_PACKAGES += " \ + phosphor-cooling-type \ +" + +PACKAGECONFIG += "cooling-type" + +RDEPENDS_phosphor-cooling-type += "libevdev" + +TMPL_COOLING = "phosphor-cooling-type@.service" +INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" +COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" + +FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" +SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" +SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" + +COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" + +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +#These services are protected by the watchdog +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" + +#These services need to be stopped when watchdog expires +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" |