diff options
| author | Patrick Venture <venture@google.com> | 2018-10-17 06:35:42 -0700 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-22 07:14:48 -0400 |
| commit | 310265a55b7fc36f61befd1efd4a09ea4ed4ffea (patch) | |
| tree | 1019c26092d1550c39fa836e24c370f3a485d9d1 /meta-ibm/meta-romulus/recipes-phosphor | |
| parent | e122713bb082d61e704786720b9425c62474c7ea (diff) | |
| download | talos-openbmc-310265a55b7fc36f61befd1efd4a09ea4ed4ffea.tar.gz talos-openbmc-310265a55b7fc36f61befd1efd4a09ea4ed4ffea.zip | |
meta-ibm: romulus: phosphor-fan: drop symlink
Drop symlink and rename bbappend for phosphor-fan.
(From meta-ibm rev: c2cff867a39ea68c246687137d1cfae2a16252a6)
Change-Id: I86496512904227954d4086a7dd43402c9870ca17
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-romulus/recipes-phosphor')
| -rw-r--r-- | meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend | 22 | ||||
| -rw-r--r--[l---------] | meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend | 23 |
2 files changed, 22 insertions, 23 deletions
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend deleted file mode 100644 index 86ed1d4a2..000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend +++ /dev/null @@ -1,22 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -# Package configuration -FAN_PACKAGES += " \ - phosphor-cooling-type \ -" - -PACKAGECONFIG += "cooling-type" - -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')}" - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend index 01b3a054f..86ed1d4a2 120000..100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1 +1,22 @@ -phosphor-fan.bbappend
\ No newline at end of file +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +# Package configuration +FAN_PACKAGES += " \ + phosphor-cooling-type \ +" + +PACKAGECONFIG += "cooling-type" + +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')}" + |
