summaryrefslogtreecommitdiffstats
path: root/meta-ingrasys/meta-zaius
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2018-09-21 13:23:23 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-24 18:28:42 -0400
commit350834b612bba6ccca3f3ac5797b00df054438b1 (patch)
treec982dad25fe54dfd7f95091a063e25d21abe1634 /meta-ingrasys/meta-zaius
parent90a00c974f31e8a671c6e41f94a1112f880920fc (diff)
downloadtalos-openbmc-350834b612bba6ccca3f3ac5797b00df054438b1.tar.gz
talos-openbmc-350834b612bba6ccca3f3ac5797b00df054438b1.zip
meta-zaius: phosphor-hwmon: add machine suffix
For phosphor-hwmon, add zaius machine suffix to avoid poisoning other machines using this layer. (From meta-ingrasys rev: f289fce3b14959622febcd5f137f9f06e92830af) Change-Id: I4ff294bf2a6d91454b6c5ccfdf1d12742a2deea1 Signed-off-by: Patrick Venture <venture@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys/meta-zaius')
-rw-r--r--meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index 1aaa6311b..f7e8cd525 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
ZAIUS_CHIPS = "i2c@1e78a000/i2c-bus@40/ucd90160@64"
ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf"
@@ -13,5 +13,6 @@ ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}"
ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}"
+# compose_list is not defined immediately so don't use :=
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}"
OpenPOWER on IntegriCloud