build: Regenerate meson for new sdbusplus
This fixes CI failures caused by the version change.
Change-Id: I547f5ba89838dc102c5ad4a5352a4586738a6ac2
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/gen/meson.build b/gen/meson.build
index af850f2..56193c7 100644
--- a/gen/meson.build
+++ b/gen/meson.build
@@ -4,10 +4,10 @@
'--version',
).stdout().strip().split('\n')[0]
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 2'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 3'
warning('Generated meson files from wrong version of sdbus++-gen-meson.')
warning(
- 'Expected "sdbus++-gen-meson version 2", got:',
+ 'Expected "sdbus++-gen-meson version 3", got:',
sdbuspp_gen_meson_ver
)
endif
diff --git a/gen/xyz/openbmc_project/Network/IP/Create/meson.build b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
index 1c11aeb..2d0d1e7 100644
--- a/gen/xyz/openbmc_project/Network/IP/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/IP/Create__cpp'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
+ input: [ '../../../../../../xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../../..',
'xyz/openbmc_project/Network/IP/Create',
],
)
diff --git a/gen/xyz/openbmc_project/Network/IP/meson.build b/gen/xyz/openbmc_project/Network/IP/meson.build
index 9949e2a..3953ad3 100644
--- a/gen/xyz/openbmc_project/Network/IP/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/meson.build
@@ -2,15 +2,14 @@
subdir('Create')
generated_others += custom_target(
'xyz/openbmc_project/Network/IP/Create__markdown'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
+ input: [ '../../../../../xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
output: [ 'Create.md' ],
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../..',
'xyz/openbmc_project/Network/IP/Create',
],
- build_by_default: true,
)
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
index 947a393..5144d7b 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/Neighbor/CreateStatic__cpp'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
+ input: [ '../../../../../../xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../../..',
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
],
)
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
index c4d2e8d..ecd4f9c 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
@@ -2,15 +2,14 @@
subdir('CreateStatic')
generated_others += custom_target(
'xyz/openbmc_project/Network/Neighbor/CreateStatic__markdown'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
+ input: [ '../../../../../xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
output: [ 'CreateStatic.md' ],
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../..',
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
],
- build_by_default: true,
)
diff --git a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
index e9d59f0..f062e44 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
@@ -1,13 +1,13 @@
# Generated file; do not modify.
generated_sources += custom_target(
'xyz/openbmc_project/Network/VLAN/Create__cpp'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
+ input: [ '../../../../../../xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../../..',
'xyz/openbmc_project/Network/VLAN/Create',
],
)
diff --git a/gen/xyz/openbmc_project/Network/VLAN/meson.build b/gen/xyz/openbmc_project/Network/VLAN/meson.build
index 569f436..8d26688 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/meson.build
@@ -2,15 +2,14 @@
subdir('Create')
generated_others += custom_target(
'xyz/openbmc_project/Network/VLAN/Create__markdown'.underscorify(),
- input: [ meson.project_source_root() / 'xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
+ input: [ '../../../../../xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
output: [ 'Create.md' ],
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
'--tool', sdbusplusplus_prog,
- '--directory', meson.project_source_root(),
+ '--directory', meson.current_source_dir() / '../../../../..',
'xyz/openbmc_project/Network/VLAN/Create',
],
- build_by_default: true,
)