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.
Change-Id: I28fdfdd90f7935eb072d2fdfaa207517701ebbb3
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 5a24fa7..9942eca 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/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 @@
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-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config-native/monitor.yaml b/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config-native/monitor.yaml
new file mode 100644
index 0000000..5b9856c
--- /dev/null
+++ b/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-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config-native/config.yaml b/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config-native/config.yaml
new file mode 100644
index 0000000..5b9856c
--- /dev/null
+++ b/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