diff options
| author | Patrick Venture <venture@google.com> | 2019-02-15 00:56:07 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2019-02-20 05:06:20 +0300 |
| commit | 7575f3aba8873acf21e5e5d3ba9251bbb29e6d29 (patch) | |
| tree | e27bf938b0e226ade3f618b04a2aaafa476d849f /meta-phosphor/classes | |
| parent | b43cf56ccef3a5de25dec0c3ee5ad10b884ed740 (diff) | |
| download | openbmc-7575f3aba8873acf21e5e5d3ba9251bbb29e6d29.tar.xz | |
meta-phosphor: phosphor-pid-control: transition away from YAML
phosphor-pid-control no longer relies on a native recipes to provide a
yaml configuration that is compiled into the binary.
To enable this, srcrev bump f72ad44140..dca2d484ee
James Feist (1):
DBusConfiguration: Fix scaling
Patrick Venture (3):
main: add json configuration path
main: if json configuration, override yaml built
build: drop support for YAML configurations
(From meta-phosphor rev: c7eef0103625e8a7381c23597165e653fc8868a4)
Change-Id: If164061e677bccdd2d3a3afa520722dd641d9f1a
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/phosphor-pid-control.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-phosphor/classes/phosphor-pid-control.bbclass b/meta-phosphor/classes/phosphor-pid-control.bbclass index 573420b9a..482b218db 100644 --- a/meta-phosphor/classes/phosphor-pid-control.bbclass +++ b/meta-phosphor/classes/phosphor-pid-control.bbclass @@ -1,2 +1,5 @@ -sensor_datadir="${datadir}/swampd/sensor" +config_datadir="${datadir}/swampd/" +# config_path is the location swampd expects to find a json configuration. +# the file is expected to be named config.json +config_path="${config_datadir}/config.json" |