commit d6b62637dc5203821c87aeb0145fb8c7f9d607c7
author Ed Tanous <etanous@nvidia.com> Fri Mar 14 15:30:07 2025 -0700
committer Ed Tanous <etanous@nvidia.com> Wed Mar 26 16:11:37 2025 +0000
tree 936620434daf8bfcce34707117dc2cac231c73c9
parent 7a531ff443c5ab48e5a6dfbdfd28f41a18dcb308

Fix some json schema validation bugs

There were a couple of places where we would add null objects when
they were not allowed.  Fix them.

Change-Id: I7c4c12ea1fa2913014e79603995267a9e560e288
Signed-off-by: Ed Tanous <etanous@nvidia.com>

meson.build

diff --git a/meson.build b/meson.build
index 8c7319a..a946d11 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@
 
 add_project_arguments(
     '-DLIBCPER_JSON_SPEC="'
-    + meson.current_source_dir() + '/specification/json/cper-json.json"',
+    + meson.current_source_dir() + '/specification/json"',
     language: ['c', 'cpp'],
 )
 
@@ -53,7 +53,7 @@
 
 edk_sources = files('Cper.c')
 
-generator_section_sources = files(
+libcper_generate_sources = files(
     'generator/sections/gen-section-ampere.c',
     'generator/sections/gen-section-arm.c',
     'generator/sections/gen-section-ccix-per.c',
@@ -114,16 +114,14 @@
     link_with: [libcper_parse],
 )
 
-libcper_generate_sources = [
-    'common-utils.c',
+libcper_generate_sources += files(
     'generator/cper-generate.c',
     'generator/gen-utils.c',
-]
+)
 
 libcper_generate = library(
     'cper-generate',
     libcper_generate_sources,
-    generator_section_sources,
     version: meson.project_version(),
     include_directories: libcper_include_dir,
     dependencies: [json_c_dep],