commit | 559017307cd076a282bc38ccfc1fb25754a35330 | [log] [tgz] |
---|---|---|
author | William A. Kennington III <wak@google.com> | Tue Dec 10 13:03:03 2019 -0800 |
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Dec 12 09:08:50 2019 -0500 |
tree | 14af40f98f4daf0b077d398914b66dcfd98a2a72 | |
parent | 264dcc04d6affbb78098d01fa83200a7a058a26d [diff] |
Fixup hwmon filenames Our previous start_hwmon.sh script was not escaping the filenames properly, resulting in configuration filepaths that differed from the actual filepaths. (From meta-ingrasys rev: 66419549bc438ce800b9149ccae0ef02bf7e3bca) Change-Id: I4d7c634c8cbe0987ae4407d9fd1431ff16064119 Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf similarity index 100% rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf similarity index 100% rename from meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf rename to meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf
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 b5b0fbc..5260498 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -25,10 +25,10 @@ ZAIUS_ITEMS += " onewire3.conf" ZAIUS_OCCS = " \ - 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00:00:00:06/sbefifo1-dev0/occ-hwmon.1 \ + 00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2 \ " -ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +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}"