From 310265a55b7fc36f61befd1efd4a09ea4ed4ffea Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Wed, 17 Oct 2018 06:35:42 -0700 Subject: 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 Signed-off-by: Brad Bishop --- .../recipes-phosphor/fans/phosphor-fan.bbappend | 22 --------------------- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 23 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan.bbappend mode change 120000 => 100644 meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend (limited to 'meta-ibm/meta-romulus/recipes-phosphor') 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 86ed1d4a2e..0000000000 --- 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 deleted file mode 120000 index 01b3a054fa..0000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -phosphor-fan.bbappend \ No newline at end of file diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend new file mode 100644 index 0000000000..86ed1d4a2e --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -0,0 +1,22 @@ +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')}" + -- cgit v1.2.3