diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2019-05-02 17:54:20 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-09 22:25:25 +0300 |
| commit | 91edf4bb5dde43b9acaeb171313c8e971e669c5e (patch) | |
| tree | 0dea477fdc10db551d2b2da80eaa9709b7a47b94 | |
| parent | 448d27c9d6e510a027a3d05b7da945de8fa6c897 (diff) | |
| download | openbmc-91edf4bb5dde43b9acaeb171313c8e971e669c5e.tar.xz | |
swift: Add fan-presence and fan-monitor
Swift fails to build because fan-presence is a dependency for
fan-control, and fan-monitor is a dependency for inventory.
So add them in swift with an empty yaml file. Also fix the
FILESEXTRAPATHS_append to have the colon at the beginning
(vs prepend where colon goes at the end) to be able to find
the files in the right order.
Tested: Built swift successfully.
(From meta-ibm rev: 2493fdb38e1fe8e1488ea1bcc5c723c788d92bae)
Change-Id: Ie41caf90a15c3c33ef49ce03ce1890ca9f0c7289
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 5 insertions, 5 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index 5a24fa79e..9942eca7f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # Machine specific files override shared files with the same name FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:" @@ -22,10 +22,6 @@ 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')}" -# Do not install presence and monitor applications for Swift bring-up -FAN_PACKAGES_remove_swift = "${PN}-presence-tach ${PN}-monitor" -PACKAGECONFIG_remove_swift = "presence monitor" - #These services are protected by the watchdog SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config-native/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config-native/monitor.yaml new file mode 100644 index 000000000..5b9856c46 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config-native/monitor.yaml @@ -0,0 +1,2 @@ +# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 +# Placeholder diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config-native/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config-native/config.yaml new file mode 100644 index 000000000..5b9856c46 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config-native/config.yaml @@ -0,0 +1,2 @@ +# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 +# Placeholder |