diff options
3 files changed, 12 insertions, 11 deletions
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 48bad3d14..b9fc6631b 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')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service index 62fd43804..850a8836a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service @@ -5,7 +5,7 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service ConditionPathExists={envfiledir}/phosphor-cooling-type-%i.conf [Service] -EnvironmentFile={envfiledir}/phosphor-cooling-type-%i.conf +EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf ExecStart={sbindir}/phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} [Install] diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb index e7f8dc719..7e002b793 100644 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb +++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb @@ -27,7 +27,7 @@ FAN_PACKAGES = " \ PACKAGES_remove = "${PN}" PACKAGES += "${FAN_PACKAGES}" -PACKAGECONFIG ??= "presence control monitor" +PACKAGECONFIG ?= "presence control monitor" SYSTEMD_PACKAGES = "${FAN_PACKAGES}" RDEPENDS_${PN}-dev = "${FAN_PACKAGES}" RDEPENDS_${PN}-staticdev = "${FAN_PACKAGES}" |
