From 350834b612bba6ccca3f3ac5797b00df054438b1 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 21 Sep 2018 13:23:23 -0700 Subject: 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 Signed-off-by: Brad Bishop --- .../meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-ingrasys') 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')}" -- cgit v1.2.1