fault-monitor: remove locally generated errors
Switch fault-monitor to use Common.Errors instead of locally defined
ones. This greatly simplifies the build structure and follows the
expected phosphor-logging patterns better.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idb3473989c86b3a505f3c0a238735db6f3a4349e
diff --git a/meson.build b/meson.build
index 492ab26..59c8a0a 100644
--- a/meson.build
+++ b/meson.build
@@ -25,18 +25,7 @@
conf_data.set('USE_LAMP_TEST', get_option('use-lamp-test').enabled())
conf_data.set('MONITOR_OPERATIONAL_STATUS', get_option('monitor-operational-status').enabled())
-sdbusplus_dep = dependency('sdbusplus', required: false)
-if sdbusplus_dep.found()
- sdbusplusplus_prog = find_program('sdbus++')
- sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson')
-else
- sdbusplus_proj = subproject('sdbusplus', required: true)
- sdbusplus_dep = sdbusplus_proj.get_variable('sdbusplus_dep')
- sdbusplusplus_prog = sdbusplus_proj.get_variable('sdbusplusplus_prog')
- sdbuspp_gen_meson_prog = sdbusplus_proj.get_variable(
- 'sdbuspp_gen_meson_prog'
- )
-endif
+sdbusplus_dep = dependency('sdbusplus')
sdeventplus_dep = dependency(
'sdeventplus',
@@ -93,42 +82,6 @@
cereal_dep = cereal_proj.dependency('cereal')
endif
-selected_subdirs = []
-selected_subdirs += 'xyz/openbmc_project'
-
-generated_root = meson.current_build_dir() / 'gen'
-generated_others = []
-generated_sources = []
-
-# Source the generated meson files.
-subdir('gen')
-foreach d : selected_subdirs
- subdir('gen' / d)
-endforeach
-
-# Parse through the list from sdbus++-gendir and put into sets.
-generated_headers = []
-generated_cpp = []
-generated_others_files = []
-
-foreach g : generated_sources generated_others
- foreach f : g.to_list()
- rel_path = run_command(
- realpath_prog,
- '--relative-to', generated_root,
- f.full_path(),
- ).stdout().strip().split('\n')[-1]
-
- if rel_path.endswith('.hpp')
- generated_headers += rel_path
- elif rel_path.endswith('.cpp')
- generated_cpp += rel_path
- else
- generated_others_files += rel_path
- endif
- endforeach
-endforeach
-
deps = [
sdbusplus_dep,
sdeventplus_dep,
@@ -180,8 +133,6 @@
executable(
'phosphor-ledmanager',
sources,
- generated_sources,
- include_directories: include_directories('gen'),
implicit_include_directories: true,
dependencies: deps,
install: true,