Fix up recipes to address missing fan apps
Change to use the "softer" default value for PACKAGECONFIG by default.
Change to append extra paths in bbappend for Witherspoon.
Fix up/change some names in bbappend file for Witherspoon.
Resolves openbmc/openbmc#1765
Change-Id: I316e1e857b008ccd67e922698ee7e0a9c5d222fc
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
index 48bad3d..b9fc663 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
@@ -1,23 +1,24 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PACKAGECONFIG += "cooling-type"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
# Package configuration
FAN_PACKAGES += " \
phosphor-cooling-type \
"
+
+PACKAGECONFIG += "cooling-type"
+
RDEPENDS_phosphor-cooling-type += "libevdev"
-COOLING_TMPL = "phosphor-cooling-type@.service"
-COOLING_INSTFMT = "phosphor-cooling-type@{0}.service"
+TMPL_COOLING = "phosphor-cooling-type@.service"
+INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-COOLING_FMT = "../${COOLING_TMPL}:${COOLING_TGT}.requires/${COOLING_INSTFMT}"
+FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type += "${COOLING_TMPL}"
-SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'COOLING_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+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-chassis-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"