meson: reformat with meson formatter
Apply the `meson format` results.
Change-Id: Id6689611fac6b9b90d1ed3539fee57506412843c
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/ibm/hypervisor-network-mgr-src/meson.build b/src/ibm/hypervisor-network-mgr-src/meson.build
index cccd884..22b82c6 100644
--- a/src/ibm/hypervisor-network-mgr-src/meson.build
+++ b/src/ibm/hypervisor-network-mgr-src/meson.build
@@ -1,35 +1,34 @@
hyp_default_busname = 'xyz.openbmc_project.Network.Hypervisor'
configure_file(
- input: 'xyz.openbmc_project.Network.Hypervisor.service.in',
- output: 'xyz.openbmc_project.Network.Hypervisor.service',
- configuration: {
- 'SYSTEMD_TARGET': 'multi-user.target',
- 'HYP_DEFAULT_NETWORK_BUSNAME': hyp_default_busname,
- },
- install: true,
- install_dir: dependency('systemd').get_variable(
- 'systemdsystemunitdir'))
+ input: 'xyz.openbmc_project.Network.Hypervisor.service.in',
+ output: 'xyz.openbmc_project.Network.Hypervisor.service',
+ configuration: {
+ 'SYSTEMD_TARGET': 'multi-user.target',
+ 'HYP_DEFAULT_NETWORK_BUSNAME': hyp_default_busname,
+ },
+ install: true,
+ install_dir: dependency('systemd').get_variable('systemdsystemunitdir'),
+)
hyp_src_includes = include_directories('.')
hyp_networkd_lib = static_library(
- 'hyp-networkd',
- 'hyp_network_manager.cpp',
- 'hyp_sys_config.cpp',
- 'hyp_ethernet_interface.cpp',
- implicit_include_directories: false,
- include_directories: [src_includes, hyp_src_includes],
- dependencies: networkd_deps)
+ 'hyp-networkd',
+ 'hyp_network_manager.cpp',
+ 'hyp_sys_config.cpp',
+ 'hyp_ethernet_interface.cpp',
+ implicit_include_directories: false,
+ include_directories: [src_includes, hyp_src_includes],
+ dependencies: networkd_deps,
+)
executable(
- 'hyp-network-manager',
- 'hyp_network_manager_main.cpp',
- link_with: hyp_networkd_lib,
- implicit_include_directories: false,
- dependencies: [
- networkd_dep,
- dependency('sdeventplus'),
- ],
- install: true,
- install_dir: get_option('bindir'))
+ 'hyp-network-manager',
+ 'hyp_network_manager_main.cpp',
+ link_with: hyp_networkd_lib,
+ implicit_include_directories: false,
+ dependencies: [networkd_dep, dependency('sdeventplus')],
+ install: true,
+ install_dir: get_option('bindir'),
+)
diff --git a/src/meson.build b/src/meson.build
index 01eb1eb..7712b91 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,99 +3,95 @@
stdplus_dep = dependency('stdplus')
executable(
- 'ncsi-netlink',
- 'argument.cpp',
- 'ncsi_netlink_main.cpp',
- 'ncsi_util.cpp',
- implicit_include_directories: false,
- include_directories: src_includes,
- dependencies: [
- dependency('libnl-3.0'),
- dependency('libnl-genl-3.0'),
- dependency('phosphor-logging'),
- stdplus_dep,
- ],
- install: true,
- install_dir: get_option('bindir'))
+ 'ncsi-netlink',
+ 'argument.cpp',
+ 'ncsi_netlink_main.cpp',
+ 'ncsi_util.cpp',
+ implicit_include_directories: false,
+ include_directories: src_includes,
+ dependencies: [
+ dependency('libnl-3.0'),
+ dependency('libnl-genl-3.0'),
+ dependency('phosphor-logging'),
+ stdplus_dep,
+ ],
+ install: true,
+ install_dir: get_option('bindir'),
+)
executable(
- 'ncsi-cmd',
- 'ncsi_cmd.cpp',
- 'ncsi_util.cpp',
- implicit_include_directories: false,
- include_directories: src_includes,
- dependencies: [
- dependency('libnl-3.0'),
- dependency('libnl-genl-3.0'),
- dependency('phosphor-logging'),
- stdplus_dep,
- ],
- install: true,
- install_dir: get_option('bindir'))
+ 'ncsi-cmd',
+ 'ncsi_cmd.cpp',
+ 'ncsi_util.cpp',
+ implicit_include_directories: false,
+ include_directories: src_includes,
+ dependencies: [
+ dependency('libnl-3.0'),
+ dependency('libnl-genl-3.0'),
+ dependency('phosphor-logging'),
+ stdplus_dep,
+ ],
+ install: true,
+ install_dir: get_option('bindir'),
+)
main_deps = []
main_srcs = []
if get_option('sync-mac')
- main_srcs += [
- 'inventory_mac.cpp',
- ]
- main_deps += [
- dependency('nlohmann_json', include_type: 'system')
- ]
+ main_srcs += ['inventory_mac.cpp']
+ main_deps += [dependency('nlohmann_json', include_type: 'system')]
endif
networkd_deps = [
- phosphor_dbus_interfaces_dep,
- dependency('phosphor-logging'),
- networkd_dbus_dep,
- sdbusplus_dep,
- stdplus_dep,
+ phosphor_dbus_interfaces_dep,
+ dependency('phosphor-logging'),
+ networkd_dbus_dep,
+ sdbusplus_dep,
+ stdplus_dep,
]
-conf_header = configure_file(
- output: 'config.h',
- configuration: conf_data)
+conf_header = configure_file(output: 'config.h', configuration: conf_data)
networkd_lib = static_library(
- 'networkd',
- conf_header,
- 'ethernet_interface.cpp',
- 'neighbor.cpp',
- 'ipaddress.cpp',
- 'static_gateway.cpp',
- 'netlink.cpp',
- 'network_manager.cpp',
- 'rtnetlink.cpp',
- 'system_configuration.cpp',
- 'system_queries.cpp',
- 'types.cpp',
- 'util.cpp',
- 'config_parser.cpp',
- 'dhcp_configuration.cpp',
- 'dns_updater.cpp',
- implicit_include_directories: false,
- include_directories: src_includes,
- dependencies: networkd_deps)
+ 'networkd',
+ conf_header,
+ 'ethernet_interface.cpp',
+ 'neighbor.cpp',
+ 'ipaddress.cpp',
+ 'static_gateway.cpp',
+ 'netlink.cpp',
+ 'network_manager.cpp',
+ 'rtnetlink.cpp',
+ 'system_configuration.cpp',
+ 'system_queries.cpp',
+ 'types.cpp',
+ 'util.cpp',
+ 'config_parser.cpp',
+ 'dhcp_configuration.cpp',
+ 'dns_updater.cpp',
+ implicit_include_directories: false,
+ include_directories: src_includes,
+ dependencies: networkd_deps,
+)
networkd_dep = declare_dependency(
- sources: conf_header,
- dependencies: networkd_deps,
- include_directories: src_includes,
- link_with: networkd_lib)
+ sources: conf_header,
+ dependencies: networkd_deps,
+ include_directories: src_includes,
+ link_with: networkd_lib,
+)
executable(
- 'phosphor-network-manager',
- 'network_manager_main.cpp',
- 'rtnetlink_server.cpp',
- main_srcs,
- implicit_include_directories: false,
- dependencies: main_deps + [
- networkd_dep,
- dependency('sdeventplus'),
- ],
- install: true,
- install_dir: get_option('bindir'))
+ 'phosphor-network-manager',
+ 'network_manager_main.cpp',
+ 'rtnetlink_server.cpp',
+ main_srcs,
+ implicit_include_directories: false,
+ dependencies: main_deps + [networkd_dep, dependency('sdeventplus')],
+ install: true,
+ install_dir: get_option('bindir'),
+)
if (get_option('hyp-nw-config') == true)
- subdir('ibm')
+ subdir('ibm')
endif