diff options
| author | Patrick Venture <venture@google.com> | 2018-10-17 06:24:19 -0700 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-21 12:38:16 -0400 |
| commit | 0e2d0b2c222d69dbe18521efe2cd84b90b469954 (patch) | |
| tree | 08a4c5eb3df65319f10db71c7f3b22e655a69d23 /meta-ibm | |
| parent | 089ecdc6cef61098264a49c32d3baa50b2577b30 (diff) | |
| download | talos-openbmc-0e2d0b2c222d69dbe18521efe2cd84b90b469954.tar.gz talos-openbmc-0e2d0b2c222d69dbe18521efe2cd84b90b469954.zip | |
meta-ibm: witherspoon: gpio-monitor: drop symlink
Drop symlink and rename bbappend for phosphor-gpio-monitor.
(From meta-ibm rev: c8aebc7a296fdf6f358de03bc3a416964fe9f057)
Change-Id: I95fa5e8f4756ab1ef0526714e237ea0fa81d7e8a
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
| -rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend | 12 | ||||
| -rw-r--r--[l---------] | meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend deleted file mode 100644 index b60a64b10..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" -INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" -POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}" -FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" - -SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" - -POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" - -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence += "${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 02a53b40e..b60a64b10 120000..100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -1 +1,12 @@ -phosphor-gpio-monitor.bbappend
\ No newline at end of file +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" +INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" +POWERSUPPLY_TGT = "${SYSTEMD_DEFAULT_TARGET}" +FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" + +SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" + +POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" + +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence += "${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" |
