Ocp wo json #2503
Ocp wo json #2503
Conversation
|
I was wondering if we should move the json code into a separate files and only include them when the json library is available, like we have with |
|
Okay will try to do it. Thank you. |
ikegami-t
force-pushed
the
ocp-wo-json
branch
2 times, most recently
from
a0c0cdf
to
b76ae83
Compare
plugins/ocp/meson.build
Outdated
| @@ -6,5 +6,9 @@ sources += [ | |||
| 'plugins/ocp/ocp-fw-activation-history.c', | |||
| 'plugins/ocp/ocp-telemetry-decode.c', | |||
| 'plugins/ocp/ocp-hardware-component-log.c', | |||
| 'plugins/ocp/ocp-print.c', | |||
| 'plugins/ocp/ocp-print-stdout.c', | |||
| 'plugins/ocp/ocp-print-json.c', | |||
There was a problem hiding this comment.
The json file should only be added when the json library is available. And then you could update the plugins/meson.build file to always build the ocp plugin.
The rest looks good!
There was a problem hiding this comment.
Update the meson.build files by the additional commit. Thank you.
Note: Still some exisitng ocp commands files needed to split json code.
There was a problem hiding this comment.
So do you want me to wait with merging this and wait until you finished the json code splitting?
There was a problem hiding this comment.
No need to wait for me. Still working on this but I am okay to do it by additional PRs. Thank you.
ikegami-t
force-pushed
the
ocp-wo-json
branch
3 times, most recently
from
f498907
to
86d149f
Compare
At first only hwcomp print code moved. Signed-off-by: Tokunori Ikegami <[email protected]>
Still ocp-nvme.c and some other ocp commands files depended on json. Signed-off-by: Tokunori Ikegami <[email protected]>
Moved into print stdout and json files. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Still the ocp-telemetry-decode used by print functions combined json code. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
|
All OCP |
ikegami-t
force-pushed
the
ocp-wo-json
branch
2 times, most recently
from
eb93edc
to
906aed0
Compare
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Move into ocp-print-stdout.c and ocp-print-json.c. Signed-off-by: Tokunori Ikegami <[email protected]>
Still ocp-telemetry-decode.c includes json code so check CONFIG_JSON. Signed-off-by: Tokunori Ikegami <[email protected]>
ikegami-t
force-pushed
the
ocp-wo-json
branch
2 times, most recently
from
b7d6053
to
5fa9f08
Compare
Also fix to use cpu_to_le64 to output __le64 values. Signed-off-by: Tokunori Ikegami <[email protected]>
Fix also some build warnings. Signed-off-by: Tokunori Ikegami <[email protected]>
No description provided.