Update to internal 0.70

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

1 files changed, 85 insertions, 108 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch
index 9d3a8f197..6497d50d8 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch
@@ -1,24 +1,24 @@
-From 32d4d17843bcc96a6d17b3d975fc92fac82ef081 Mon Sep 17 00:00:00 2001
+From f73c64bbe2cf9369892269a71893e2911753ba4d Mon Sep 17 00:00:00 2001
 From: Zhikui Ren <zhikui.ren@intel.com>
 Date: Tue, 8 Dec 2020 15:28:42 -0800
 Subject: [PATCH] update meson build for PLDM FWU interfaces
 
 Signed-off-by: Zhikui Ren <zhikui.ren@intel.com>
 ---
- .../PLDM/FWU/ACPIDescriptor/meson.build       |  14 ++
- .../ActiveComponentImageSetInfo/meson.build   |  14 ++
- .../PLDM/FWU/ActiveComponentInfo/meson.build  |  14 ++
- .../FWU/CapabilitiesDuringUpdate/meson.build  |  14 ++
- .../ComponentActivationMethods/meson.build    |  14 ++
- .../PLDM/FWU/FWUBase/meson.build              |  14 ++
- .../PLDM/FWU/IANADescriptor/meson.build       |  14 ++
- .../PLDM/FWU/PCIDescriptor/meson.build        |  14 ++
- .../PendingComponentImageSetInfo/meson.build  |  14 ++
- .../PLDM/FWU/PendingComponentInfo/meson.build |  14 ++
- .../PLDM/FWU/PnPDescriptor/meson.build        |  14 ++
- gen/xyz/openbmc_project/PLDM/FWU/meson.build  | 166 ++++++++++++++++++
+ .../PLDM/FWU/ACPIDescriptor/meson.build       |  13 ++
+ .../ActiveComponentImageSetInfo/meson.build   |  13 ++
+ .../PLDM/FWU/ActiveComponentInfo/meson.build  |  13 ++
+ .../FWU/CapabilitiesDuringUpdate/meson.build  |  13 ++
+ .../ComponentActivationMethods/meson.build    |  13 ++
+ .../PLDM/FWU/FWUBase/meson.build              |  13 ++
+ .../PLDM/FWU/IANADescriptor/meson.build       |  13 ++
+ .../PLDM/FWU/PCIDescriptor/meson.build        |  13 ++
+ .../PendingComponentImageSetInfo/meson.build  |  13 ++
+ .../PLDM/FWU/PendingComponentInfo/meson.build |  13 ++
+ .../PLDM/FWU/PnPDescriptor/meson.build        |  13 ++
+ gen/xyz/openbmc_project/PLDM/FWU/meson.build  | 154 ++++++++++++++++++
  gen/xyz/openbmc_project/PLDM/meson.build      |   1 +
- 13 files changed, 321 insertions(+)
+ 13 files changed, 298 insertions(+)
  create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build
  create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build
  create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build
@@ -34,402 +34,379 @@ Signed-off-by: Zhikui Ren <zhikui.ren@intel.com>
 
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build
 new file mode 100644
-index 0000000..2ec794d
+index 000000000000..fbaf6c458645
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build
 new file mode 100644
-index 0000000..d415ec9
+index 000000000000..af3df1483126
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build
 new file mode 100644
-index 0000000..e2be862
+index 000000000000..e5ff324231f5
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build
 new file mode 100644
-index 0000000..62d9894
+index 000000000000..03768e24090f
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build
 new file mode 100644
-index 0000000..2e379b6
+index 000000000000..31cffd2e311b
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build
 new file mode 100644
-index 0000000..149662b
+index 000000000000..3b90b51e1b7f
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/FWUBase__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/FWUBase',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build
 new file mode 100644
-index 0000000..6661829
+index 000000000000..5d28fb5cca5a
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/IANADescriptor__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/IANADescriptor',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build
 new file mode 100644
-index 0000000..00f54e2
+index 000000000000..0c2a5d572dd1
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PCIDescriptor__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PCIDescriptor',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build
 new file mode 100644
-index 0000000..5349f0f
+index 000000000000..3fe7d85bbb29
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build
 new file mode 100644
-index 0000000..5c44acf
+index 000000000000..a4d11a3317a4
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build
 new file mode 100644
-index 0000000..d77e841
+index 000000000000..d0508ca366ae
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +# Generated file; do not modify.
 +generated_sources += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PnPDescriptor__cpp'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml',  ],
++    input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.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.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PnPDescriptor',
 +    ],
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/FWU/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/meson.build
 new file mode 100644
-index 0000000..27e89fc
+index 000000000000..2bb71914b606
 --- /dev/null
 +++ b/gen/xyz/openbmc_project/PLDM/FWU/meson.build
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,154 @@
 +# Generated file; do not modify.
 +subdir('ACPIDescriptor')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml',  ],
 +    output: [ 'ACPIDescriptor.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('ActiveComponentImageSetInfo')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml',  ],
 +    output: [ 'ActiveComponentImageSetInfo.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('ActiveComponentInfo')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml',  ],
 +    output: [ 'ActiveComponentInfo.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('CapabilitiesDuringUpdate')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml',  ],
 +    output: [ 'CapabilitiesDuringUpdate.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('ComponentActivationMethods')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml',  ],
 +    output: [ 'ComponentActivationMethods.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('FWUBase')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/FWUBase__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml',  ],
 +    output: [ 'FWUBase.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/FWUBase',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('IANADescriptor')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/IANADescriptor__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml',  ],
 +    output: [ 'IANADescriptor.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/IANADescriptor',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('PCIDescriptor')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PCIDescriptor__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml',  ],
 +    output: [ 'PCIDescriptor.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PCIDescriptor',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('PendingComponentImageSetInfo')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml',  ],
 +    output: [ 'PendingComponentImageSetInfo.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('PendingComponentInfo')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml',  ],
 +    output: [ 'PendingComponentInfo.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo',
 +    ],
-+    build_by_default: true,
 +)
 +
 +subdir('PnPDescriptor')
 +generated_others += custom_target(
 +    'xyz/openbmc_project/PLDM/FWU/PnPDescriptor__markdown'.underscorify(),
-+    input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml',  ],
++    input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml',  ],
 +    output: [ 'PnPDescriptor.md' ],
 +    command: [
 +        sdbuspp_gen_meson_prog, '--command', 'markdown',
 +        '--output', meson.current_build_dir(),
 +        '--tool', sdbusplusplus_prog,
-+        '--directory', meson.source_root(),
++        '--directory', meson.current_source_dir() / '../../../../../yaml',
 +        'xyz/openbmc_project/PLDM/FWU/PnPDescriptor',
 +    ],
-+    build_by_default: true,
 +)
-+
 diff --git a/gen/xyz/openbmc_project/PLDM/meson.build b/gen/xyz/openbmc_project/PLDM/meson.build
-index 9087286..02e4234 100644
+index 2be636cbaac0..35ff301901b3 100644
 --- a/gen/xyz/openbmc_project/PLDM/meson.build
 +++ b/gen/xyz/openbmc_project/PLDM/meson.build
-@@ -14,6 +14,7 @@ generated_others += custom_target(
-     build_by_default: true,
+@@ -13,6 +13,7 @@ generated_others += custom_target(
+     ],
  )
  
 +subdir('FWU')