Install zone conditions yaml for fan control
Updated the fan control recipe files to include the zone conditions
config yaml file.
Change-Id: I5322cb397c2c58df4d6b2e9672ac28ed51e6be59
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb b/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
new file mode 100644
index 0000000..065efa5
--- /dev/null
+++ b/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Phosphor zone conditions definition default data"
+PR = "r1"
+
+inherit native
+inherit obmc-phosphor-license
+inherit phosphor-fan
+
+SRC_URI += "file://zone_conditions.yaml"
+
+S = "${WORKDIR}"
+
+do_install() {
+ DEST=${D}${control_datadir}
+ install -D zone_conditions.yaml ${DEST}/zone_conditions.yaml
+}
diff --git a/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml b/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
new file mode 100644
index 0000000..1340620
--- /dev/null
+++ b/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml
@@ -0,0 +1,2 @@
+#Default zone conditions definition YAML - empty.
+#For format, see documentation in fan control code repository example yaml.
diff --git a/common/recipes-phosphor/fans/phosphor-fan.bb b/common/recipes-phosphor/fans/phosphor-fan.bb
index 7e002b7..fd07908 100644
--- a/common/recipes-phosphor/fans/phosphor-fan.bb
+++ b/common/recipes-phosphor/fans/phosphor-fan.bb
@@ -59,11 +59,13 @@
FAN_DEF_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/fans.yaml \
FAN_ZONE_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/zones.yaml \
ZONE_EVENTS_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/events.yaml \
+ ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/zone_conditions.yaml \
FAN_ZONE_OUTPUT_DIR=${S}/control, \
--disable-control, \
virtual/phosphor-fan-control-fan-config \
phosphor-fan-control-zone-config-native \
phosphor-fan-control-events-config-native \
+ phosphor-fan-control-zone-conditions-config-native \
, \
"
diff --git a/common/recipes-phosphor/fans/phosphor-fan.inc b/common/recipes-phosphor/fans/phosphor-fan.inc
index 50b4f83..37335b0 100644
--- a/common/recipes-phosphor/fans/phosphor-fan.inc
+++ b/common/recipes-phosphor/fans/phosphor-fan.inc
@@ -2,4 +2,4 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
SRC_URI += "git://github.com/openbmc/phosphor-fan-presence"
-SRCREV = "a5763ff8f08dd9e3e52cf37d684fbe512658f87e"
+SRCREV = "bb12c926dca2215bccfbd270da11f0c2b5822878"