diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch index fd31665dc..31c5ad95b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch @@ -1,62 +1,60 @@ -From cd3c2ff290e6ff205c32b386c7c8a73d4a8980e5 Mon Sep 17 00:00:00 2001 +From 20357179065a9157ad89f7c717ba214bf4fe4ded Mon Sep 17 00:00:00 2001 From: Zhikui Ren <zhikui.ren@intel.com> Date: Tue, 8 Dec 2020 15:08:21 -0800 -Subject: [PATCH 1/4] update meson build files for control and bios +Subject: [PATCH] update meson build files for control and bios Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> --- - .../Control/Power/RestoreDelay/meson.build | 14 ++++++++++++++ - gen/xyz/openbmc_project/Control/Power/meson.build | 15 +++++++++++++++ - .../Control/Processor/ErrConfig/meson.build | 14 ++++++++++++++ - .../openbmc_project/Control/Processor/meson.build | 15 +++++++++++++++ - .../Inventory/Item/Bios/meson.build | 14 ++++++++++++++ - .../openbmc_project/Inventory/Item/meson.build | 15 +++++++++++++++ - 6 files changed, 87 insertions(+) + .../Control/Power/RestoreDelay/meson.build | 13 +++++++++++++ + gen/xyz/openbmc_project/Control/Power/meson.build | 14 ++++++++++++++ + .../Control/Processor/ErrConfig/meson.build | 13 +++++++++++++ + .../openbmc_project/Control/Processor/meson.build | 13 +++++++++++++ + .../Inventory/Item/Bios/meson.build | 13 +++++++++++++ + gen/xyz/openbmc_project/Inventory/Item/meson.build | 14 ++++++++++++++ + 6 files changed, 80 insertions(+) create mode 100644 gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build create mode 100644 gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build create mode 100644 gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build diff --git a/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build new file mode 100644 -index 0000000..91581fd +index 000000000000..1afe8d26b87d --- /dev/null +++ b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Control/Power/RestoreDelay__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/RestoreDelay.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/Control/Power/RestoreDelay', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Control/Power/meson.build b/gen/xyz/openbmc_project/Control/Power/meson.build -index 05628ec..ad04479 100644 +index dbd3b409ead0..43ccf1958aa9 100644 --- a/gen/xyz/openbmc_project/Control/Power/meson.build +++ b/gen/xyz/openbmc_project/Control/Power/meson.build -@@ -29,6 +29,21 @@ generated_others += custom_target( - build_by_default: true, +@@ -41,6 +41,20 @@ generated_others += custom_target( + ], ) +subdir('RestoreDelay') +generated_others += custom_target( + 'xyz/openbmc_project/Control/Power/RestoreDelay__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], + output: [ 'RestoreDelay.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/Control/Power/RestoreDelay', + ], -+ build_by_default: true, +) + subdir('RestorePolicy') @@ -64,88 +62,83 @@ index 05628ec..ad04479 100644 'xyz/openbmc_project/Control/Power/RestorePolicy__markdown'.underscorify(), diff --git a/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build new file mode 100644 -index 0000000..12961c2 +index 000000000000..937004d3d68b --- /dev/null +++ b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Control/Processor/ErrConfig__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Processor/ErrConfig.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/Control/Processor/ErrConfig', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Control/Processor/meson.build b/gen/xyz/openbmc_project/Control/Processor/meson.build -index adbff0a..816c30d 100644 +index fc32bf2f877f..cc2a1d6507b3 100644 --- a/gen/xyz/openbmc_project/Control/Processor/meson.build +++ b/gen/xyz/openbmc_project/Control/Processor/meson.build -@@ -14,3 +14,18 @@ generated_others += custom_target( - build_by_default: true, +@@ -13,3 +13,16 @@ generated_others += custom_target( + ], ) +subdir('ErrConfig') +generated_others += custom_target( + 'xyz/openbmc_project/Control/Processor/ErrConfig__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], + output: [ 'ErrConfig.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/Control/Processor/ErrConfig', + ], -+ build_by_default: true, +) -+ diff --git a/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build new file mode 100644 -index 0000000..5c6fce0 +index 000000000000..28fbf85dd97c --- /dev/null +++ b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Inventory/Item/Bios__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bios.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/Inventory/Item/Bios', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build -index 145bba2..3e036bd 100644 +index 77d9be8b6c03..7d22037b32b8 100644 --- a/gen/xyz/openbmc_project/Inventory/Item/meson.build +++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build -@@ -27,6 +27,21 @@ generated_others += custom_target( - build_by_default: true, +@@ -40,6 +40,20 @@ generated_others += custom_target( + ], ) +subdir('Bios') +generated_others += custom_target( + 'xyz/openbmc_project/Inventory/Item/Bios__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], + output: [ 'Bios.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/Inventory/Item/Bios', + ], -+ build_by_default: true, +) + subdir('Bmc') |