diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 23:18:00 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-27 19:05:02 +0300 |
| commit | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (patch) | |
| tree | d98626c9763ad9048ac9bfd8269e12eced18d496 /meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces | |
| parent | ae908254d22318b9e27acf6e5e28d1a4ab5e2195 (diff) | |
| download | openbmc-6f106a0a4ce15fe0678d4ffefd572e6978c72597.tar.xz | |
Update to internal 0.70
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces')
14 files changed, 326 insertions, 469 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch index c87b2d89d..2c443726d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch @@ -1,22 +1,22 @@ -From 49debd0955b672d591f35e74119b288bd6df2992 Mon Sep 17 00:00:00 2001 +From bc282f4e9537b115e32733dfc6e16c303f81b3e3 Mon Sep 17 00:00:00 2001 From: "Jia, Chunhui" <chunhui.jia@intel.com> Date: Tue, 24 Jul 2018 11:40:49 +0800 -Subject: [PATCH] [ipmi] set BIOS id +Subject: [PATCH] set BIOS id change#2 add new dbus interface for BIOS attributes Signed-off-by: Jia, Chunhui <chunhui.jia@intel.com> --- - xyz/openbmc_project/Inventory/Item/Bios.interface.yaml | 9 +++++++++ + .../openbmc_project/Inventory/Item/Bios.interface.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) - create mode 100644 xyz/openbmc_project/Inventory/Item/Bios.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml -diff --git a/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml b/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml new file mode 100644 -index 0000000..d7a6b95 +index 000000000000..d7a6b95bfdce --- /dev/null -+++ b/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml ++++ b/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml @@ -0,0 +1,9 @@ +description: > + Implement to provide BIOS attributes. @@ -28,5 +28,5 @@ index 0000000..d7a6b95 + +# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 -- -2.16.2 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch index 2c9344306..7f315db86 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch @@ -1,4 +1,4 @@ -From 631deef0ca88a77283741edeae8078d2185f414c Mon Sep 17 00:00:00 2001 +From 479b46d2ed42b576cf2aee2ecbd76de7940d0cfe Mon Sep 17 00:00:00 2001 From: Yong Li <yong.b.li@linux.intel.com> Date: Fri, 10 Aug 2018 16:23:13 +0800 Subject: [PATCH] Increase the default watchdog timeout value @@ -13,13 +13,13 @@ Will adjust this value in the future Signed-off-by: Yong Li <yong.b.li@linux.intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 2 +- + yaml/xyz/openbmc_project/State/Watchdog.interface.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index f76dbf2..402e1a8 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index f54ec3b6e4fb..ede961da1942 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -37,7 +37,7 @@ properties: type: uint64 description: > @@ -30,5 +30,5 @@ index f76dbf2..402e1a8 100644 type: uint64 description: > -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch index 9052435ca..aae1e0248 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch @@ -1,4 +1,4 @@ -From eeac4cf4528994aeb213d549daf4c033ac9d3bbc Mon Sep 17 00:00:00 2001 +From 6e8b18e2258c7b6327a9b26901846088dd82a663 Mon Sep 17 00:00:00 2001 From: Kuiying Wang <kuiying.wang@intel.com> Date: Fri, 24 Aug 2018 17:55:35 +0800 Subject: [PATCH] Add RestoreDelay interface for power restore delay @@ -10,13 +10,13 @@ Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- .../Control/Power/RestoreDelay.interface.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) - create mode 100644 xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml -diff --git a/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml b/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml b/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml new file mode 100644 -index 0000000..55ee80a +index 000000000000..55ee80a75f7b --- /dev/null -+++ b/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml ++++ b/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml @@ -0,0 +1,11 @@ +description: > + Implement to specify power transition behavior on a BMC reset. @@ -30,5 +30,5 @@ index 0000000..55ee80a + The delay time for power restore. + Power Restore Delay is NOT applied on power policy is "Always Off" -- -2.17.0 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch index 9471c7ab2..17aef45bf 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch @@ -1,4 +1,4 @@ -From 7260c24b201759f3a5168eebfee215072c13e641 Mon Sep 17 00:00:00 2001 +From 571ab872be4b486b98bfbed159630b5e21d9a586 Mon Sep 17 00:00:00 2001 From: Kuiying Wang <kuiying.wang@intel.com> Date: Thu, 30 Aug 2018 16:22:43 +0800 Subject: [PATCH] Add ErrConfig.yaml interface for processor error @@ -40,13 +40,13 @@ Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- .../Processor/ErrConfig.interface.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) - create mode 100644 xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml -diff --git a/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml b/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml b/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml new file mode 100644 -index 0000000..2304263 +index 000000000000..23042633ca13 --- /dev/null -+++ b/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml ++++ b/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml @@ -0,0 +1,33 @@ +description: > + This defines processor error configuration. @@ -82,5 +82,5 @@ index 0000000..2304263 + 01b: Enabled + 11b: Not Present -- -2.17.0 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch index 67fa59090..06eed126f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch @@ -1,4 +1,4 @@ -From 6e9a19c43acac7d4254910906329d98d7b59085a Mon Sep 17 00:00:00 2001 +From 45f4457c23a8da9d246bd33c3d426b52186b39f0 Mon Sep 17 00:00:00 2001 From: Ren Yu <yux.ren@intel.com> Date: Fri, 24 May 2019 14:55:10 +0800 Subject: [PATCH] Add the pre-timeout interrupt defined in IPMI spec @@ -9,13 +9,13 @@ IPMI set/get watchdog commands will use it. Signed-off-by: Ren Yu <yux.ren@intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 22 ++++++++++++++++++++++ + .../State/Watchdog.interface.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index 2fc47d8..6dfa9b9 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index ede961da1942..a67a6a30ea2c 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -33,6 +33,11 @@ properties: description: > The action the watchdog should perform when it expires. @@ -53,5 +53,5 @@ index 2fc47d8..6dfa9b9 100644 description: > The type of timer use. -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch index d7e66abd2..54920fee3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch @@ -1,4 +1,4 @@ -From b7c487750c05dcc081219ccdd4ef539beef6aa30 Mon Sep 17 00:00:00 2001 +From c71c17951e5f00195c9cacd6829a359c3d253714 Mon Sep 17 00:00:00 2001 From: Ren Yu <yux.ren@intel.com> Date: Mon, 29 Jul 2019 10:51:12 +0800 Subject: [PATCH] Add PreInterruptFlag properity in DBUS. @@ -15,13 +15,13 @@ pre-timeout interrupt occurred. Signed-off-by: Ren Yu <yux.ren@intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 5 +++++ + yaml/xyz/openbmc_project/State/Watchdog.interface.yaml | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index bf4cca0..6579368 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index a67a6a30ea2c..d1ae8e3411e6 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -59,6 +59,11 @@ properties: description: > The timer user at the time of expiration. @@ -35,5 +35,5 @@ index bf4cca0..6579368 100644 enumerations: - name: Action -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch index 36c63ec58..25ed9a403 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch @@ -1,4 +1,4 @@ -From 0d6556539be9bda478a3cabb6127eace5764fa11 Mon Sep 17 00:00:00 2001 +From 826946ecad67b34818db0634367c4cf7100d0890 Mon Sep 17 00:00:00 2001 From: Vikram Bodireddy <vikram.bodireddy@intel.com> Date: Wed, 15 Jan 2020 10:01:04 +0800 Subject: [PATCH] Add StandbySpare support for software inventory @@ -11,13 +11,13 @@ image. Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> --- - xyz/openbmc_project/Software/Activation.interface.yaml | 12 ++++++++++++ + .../Software/Activation.interface.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/xyz/openbmc_project/Software/Activation.interface.yaml b/xyz/openbmc_project/Software/Activation.interface.yaml -index efeeeb6..6c9ce75 100644 ---- a/xyz/openbmc_project/Software/Activation.interface.yaml -+++ b/xyz/openbmc_project/Software/Activation.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Software/Activation.interface.yaml b/yaml/xyz/openbmc_project/Software/Activation.interface.yaml +index 6af2984b7b2e..26ab87b0262d 100644 +--- a/yaml/xyz/openbmc_project/Software/Activation.interface.yaml ++++ b/yaml/xyz/openbmc_project/Software/Activation.interface.yaml @@ -28,12 +28,20 @@ enumerations: - name: Activating description: > @@ -39,7 +39,7 @@ index efeeeb6..6c9ce75 100644 - name: Staged description: > The Software.Version is currently in staged flash area. -@@ -48,6 +56,10 @@ enumerations: +@@ -52,6 +60,10 @@ enumerations: - name: Active description: > The Software.Version has been requested for Activation. @@ -51,5 +51,5 @@ index efeeeb6..6c9ce75 100644 # due to current system state. Currently, sdbusplus does not support # errors on properties. -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch index e6afc0117..677b699be 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch @@ -1,4 +1,4 @@ -From 65d1772312a76ebfdac6391bb97287c62f18c43f Mon Sep 17 00:00:00 2001 +From 2c270f8fd9f45ff0792d2730c25eb2f673314115 Mon Sep 17 00:00:00 2001 From: "Kowalski, Mariusz" <mariusz.kowalski@intel.com> Date: Thu, 27 Feb 2020 15:48:56 +0100 Subject: [PATCH] MCTP Daemon D-Bus interface definition. @@ -12,27 +12,24 @@ Signed-off-by: Mariusz Kowalski <mariusz.kowalski@intel.com> Signed-off-by: Karol Wachowski <karol.wachowski@intel.com> Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a --- - xyz/openbmc_project/MCTP/Base.interface.yaml | 227 ++++++++++++++++++ + .../openbmc_project/MCTP/Base.interface.yaml | 227 ++++++++++++++++++ .../MCTP/Binding/PCIe.interface.yaml | 29 +++ .../MCTP/Binding/SMBus.interface.yaml | 17 ++ .../MCTP/BusOwner.interface.yaml | 17 ++ - .../MCTP/Endpoint.interface.yaml | 13 + - xyz/openbmc_project/MCTP/README.md | 43 ++++ + .../MCTP/Endpoint.interface.yaml | 4 + .../MCTP/SupportedMessageTypes.interface.yaml | 36 +++ - 7 files changed, 382 insertions(+) - create mode 100644 xyz/openbmc_project/MCTP/Base.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/BusOwner.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Endpoint.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/README.md - create mode 100644 xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml + 6 files changed, 330 insertions(+) + create mode 100644 yaml/xyz/openbmc_project/MCTP/Base.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml -diff --git a/xyz/openbmc_project/MCTP/Base.interface.yaml b/xyz/openbmc_project/MCTP/Base.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml new file mode 100644 -index 0000000..9438551 +index 000000000000..9438551e648e --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Base.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml @@ -0,0 +1,227 @@ +description: > + Mandatory interface for each instance of the MCTP Daemon to expose @@ -261,11 +258,11 @@ index 0000000..9438551 + - name: SPDM + - name: VDPCI + - name: VDIANA -diff --git a/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml new file mode 100644 -index 0000000..1bd2881 +index 000000000000..1bd28818b39a --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml @@ -0,0 +1,29 @@ +description: > + Interface exposed by MCTP daemon for PCIe binding @@ -296,11 +293,11 @@ index 0000000..1bd2881 + - name: Discovered + - name: Undiscovered + - name: NotApplicable -diff --git a/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml new file mode 100644 -index 0000000..9219ad0 +index 000000000000..9219ad02af06 --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml @@ -0,0 +1,17 @@ +description: > + Interface exposed by MCTP daemon for SMBus binding @@ -319,11 +316,11 @@ index 0000000..9219ad0 + - name: SlaveAddress + type: byte + description: Slave address to be used for this medium -diff --git a/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml new file mode 100644 -index 0000000..d46298e +index 000000000000..d46298ed35b4 --- /dev/null -+++ b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml @@ -0,0 +1,17 @@ +description: > + Interface exposed by MCTP root object, when executing in Bus Owner mode. @@ -342,79 +339,26 @@ index 0000000..d46298e + - name: OwnEidPool + type: boolean + description: Indicates Eid pool is managed by self -diff --git a/xyz/openbmc_project/MCTP/Endpoint.interface.yaml b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -new file mode 100644 -index 0000000..e4ba4d0 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -@@ -0,0 +1,13 @@ -+description: -+ Interface exposed by discovered MCTP endpoints. -+ -+properties: +diff --git a/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml +index 119f1c673c2c..abb3ac930236 100644 +--- a/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml +@@ -6,6 +6,10 @@ description: > + MCTP-capable management controllers and managed devices. + + properties: + - name: Mode + type: enum[xyz.openbmc_project.MCTP.Base.BindingModeTypes] -+ description: Endpoint / BusOwner / Bridge -+ -+ - name: NetworkId -+ type: uint16 + description: > -+ MCTP network ID a unique identifier to distinguish each independent -+ MCTP network within a platform. -diff --git a/xyz/openbmc_project/MCTP/README.md b/xyz/openbmc_project/MCTP/README.md -new file mode 100644 -index 0000000..c819dbb ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/README.md -@@ -0,0 +1,43 @@ -+# MCTP Daemon -+ -+## Overview -+MCTP service exposes D-Bus methods / properties / signals for managing -+MCTP devices or work as MCTP Endpoint. MCTP daemon will either -+work in Bus Owner or Endpoint mode for the specified physical medium. -+ -+### MCTP service -+MCTP service can be started either in Bus Owner mode or Endpoint mode. -+It will expose following objects. -+1. Base object -+2. MCTP Endpoints (discovered in case of Bus Owner mode, queried using -+routing table in case of Endpoint mode) -+Please refer individual yaml file for details about the -+methods / signals / properties exposed in the interfaces. -+ -+#### Base object -+Exposed under the path `/xyz/openbmc_project/mctp` with the following -+interfaces. -+1. `xyz.openbmc_project.MCTP.Base` which exposes all the common properties -+needed for MCTP Daemon. -+2. `xyz.openbmc_project.MCTP.BusOwner` available only in Bus Owner mode -+which exposes the properties needed by Bus Owner MCTP Daemon. -+3. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes the message -+types supported. -+4. Binding interface `xyz.openbmc_project.MCTP.Binding.PCIe` or -+`xyz.openbmc_project.MCTP.Binding.SMBus` as per the physical medium in which -+this MCTP Daemon is instantiated. -+5. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -+ -+#### Endpoint object -+Exposed under the path `/xyz/openbmc_project/mctp/device/<eid>` with the -+following interfaces. -+1. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes supported MCTP -+message types for the discovered MCTP Endpoint. -+2. `xyz.openbmc_project.MCTP.Endpoint` which exposes properties like Network ID -+and endpoint mode (to identify Bus Owner or Bridge or Endpoint) for the discovered -+MCTP Endpoint. -+3. `xyz.openbmc_project.MCTP.Bridge` available only for discovered MCTP Bridges to -+expose properties like EID pool. (TBD) -+4. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -diff --git a/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml ++ Endpoint / BusOwner / Bridge + + - name: NetworkId + type: size +diff --git a/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml b/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml new file mode 100644 -index 0000000..fa447ee +index 000000000000..fa447ee6a3bb --- /dev/null -+++ b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml @@ -0,0 +1,36 @@ +description: + Interface used to represent the supported MCTP message types. diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch index 5ee550eaa..6da1c2693 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch @@ -1,5 +1,5 @@ -From e7ba5f63a551099e1b5f934683e163963f28f28e Mon Sep 17 00:00:00 2001 -From: "Gade-RajasekharReddy@" <raja.sekhar.reddy.gade@linux.intel.com> +From 2da0a05ae9b69cd8da67ced1bcac6ae7c6c5f930 Mon Sep 17 00:00:00 2001 +From: "Gade-RajasekharReddy@" <Gade-RajasekharReddy@> Date: Wed, 16 Sep 2020 03:19:41 +0530 Subject: [PATCH] Add D-Bus interfaces for PLDM FW update @@ -24,26 +24,26 @@ Signed-off-by: Gade-RajasekharReddy@ <raja.sekhar.reddy.gade@linux.intel.com> ...endingComponentImageSetInfo.interface.yaml | 10 ++ .../FWU/PendingComponentInfo.interface.yaml | 40 +++++++ .../PLDM/FWU/PnPDescriptor.interface.yaml | 14 +++ - xyz/openbmc_project/PLDM/FWU/README.md | 103 ++++++++++++++++++ + yaml/xyz/openbmc_project/PLDM/FWU/README.md | 103 ++++++++++++++++++ 12 files changed, 378 insertions(+) - create mode 100644 xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/README.md + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/README.md -diff --git a/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml new file mode 100644 -index 0000000..e225bad +index 000000000000..e225bade0df0 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml @@ -0,0 +1,14 @@ +description : > + This interface has ACPI descriptor properties. @@ -59,11 +59,11 @@ index 0000000..e225bad + type : string + description: > + Property containing ACPI Product Identifier. -diff --git a/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml new file mode 100644 -index 0000000..94115a3 +index 000000000000..94115a33e1d9 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml @@ -0,0 +1,9 @@ +description : > + This interface has the PLDM FWU active component image set properties. @@ -74,11 +74,11 @@ index 0000000..94115a3 + type : string + description: > + String describing the active component image set version. -diff --git a/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml new file mode 100644 -index 0000000..77a7566 +index 000000000000..77a75669439b --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml @@ -0,0 +1,55 @@ +description: > + This interface has the component entries for all of the updatable @@ -135,11 +135,11 @@ index 0000000..77a7566 + type: string + description: > + String describing the active component version. -diff --git a/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml b/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml new file mode 100644 -index 0000000..36560ff +index 000000000000..36560ff0742b --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml @@ -0,0 +1,32 @@ +description : > + This interface describes the capabilities during update. @@ -173,11 +173,11 @@ index 0000000..36560ff + description: > + This property shows the component update failure recovery + capability. -diff --git a/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml new file mode 100644 -index 0000000..d5ec47c +index 000000000000..d5ec47cbc77f --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml @@ -0,0 +1,40 @@ +description: > + This interface has the component activation methods. @@ -219,11 +219,11 @@ index 0000000..d5ec47c + description: > + Property that tells whether the component can be activated + automatically once apply completes. -diff --git a/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml b/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml new file mode 100644 -index 0000000..2ba15e2 +index 000000000000..2ba15e26c690 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml @@ -0,0 +1,21 @@ +description: > + This interface provides a method to initiate the PLDM FW update. @@ -246,11 +246,11 @@ index 0000000..2ba15e2 + - xyz.openbmc_project.Common.Error.NotAllowed + - xyz.openbmc_project.Common.Error.InvalidArgument + - xyz.openbmc_project.Common.Error.ResourceNotFound -diff --git a/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml new file mode 100644 -index 0000000..c013955 +index 000000000000..c013955af3b6 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml @@ -0,0 +1,10 @@ +description : > + This interface has device identification info, in which IANA @@ -262,11 +262,11 @@ index 0000000..c013955 + type : string + description: > + Property containing the IANA Enterprise ID. -diff --git a/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml new file mode 100644 -index 0000000..8d758ed +index 000000000000..8d758ed51192 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml @@ -0,0 +1,30 @@ +description : > + This interface has device identification info,in which PCI Vendor ID @@ -298,11 +298,11 @@ index 0000000..8d758ed + type : string + description: > + Property containing the PCI Revision ID. -diff --git a/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml new file mode 100644 -index 0000000..3861572 +index 000000000000..3861572d81a4 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml @@ -0,0 +1,10 @@ +description : > + This interface has the PLDM FWU pending component image set @@ -314,11 +314,11 @@ index 0000000..3861572 + type : string + description: > + String describing the pending component image set version. -diff --git a/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml new file mode 100644 -index 0000000..59a2ad8 +index 000000000000..59a2ad8dae8c --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml @@ -0,0 +1,40 @@ +description: > + This interface has the component entries for all of the pending @@ -360,11 +360,11 @@ index 0000000..59a2ad8 + PendingComponentComparisonStamp field for additional details. + If no pending firmware component exists, this field is zero + bytes in length. -diff --git a/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml new file mode 100644 -index 0000000..801db6d +index 000000000000..801db6d6380c --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml @@ -0,0 +1,14 @@ +description : > + This interface has PnP descriptor properties. @@ -380,11 +380,11 @@ index 0000000..801db6d + type : string + description: > + Property containing the PnP Product Identifier. -diff --git a/xyz/openbmc_project/PLDM/FWU/README.md b/xyz/openbmc_project/PLDM/FWU/README.md +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/README.md b/yaml/xyz/openbmc_project/PLDM/FWU/README.md new file mode 100644 -index 0000000..2931739 +index 000000000000..293173933baf --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/README.md ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/README.md @@ -0,0 +1,103 @@ +#PLDM FW Update + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch index 3a1ae57fb..0a57733aa 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch @@ -1,4 +1,4 @@ -From 007c07561e03a005e90858f77266f4fba3e8e2c9 Mon Sep 17 00:00:00 2001 +From 114687e8f5b4728bd5d82b3c2dbc97cb40273cb8 Mon Sep 17 00:00:00 2001 From: Ayushi Smriti <smriti.ayushi@intel.com> Date: Wed, 23 Sep 2020 22:01:25 +0530 Subject: [PATCH] Add PLDM version purpose enumeration @@ -9,13 +9,13 @@ of the version to support pldm type version purpose Change-Id: I7b914d4323bfe44a4e3cd60ed4a627aeceb6b56f Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com> --- - xyz/openbmc_project/Software/Version.interface.yaml | 3 +++ + yaml/xyz/openbmc_project/Software/Version.interface.yaml | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/xyz/openbmc_project/Software/Version.interface.yaml b/xyz/openbmc_project/Software/Version.interface.yaml -index 345e5b5..f2efbec 100644 ---- a/xyz/openbmc_project/Software/Version.interface.yaml -+++ b/xyz/openbmc_project/Software/Version.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Software/Version.interface.yaml b/yaml/xyz/openbmc_project/Software/Version.interface.yaml +index 345e5b51f653..f2efbecce938 100644 +--- a/yaml/xyz/openbmc_project/Software/Version.interface.yaml ++++ b/yaml/xyz/openbmc_project/Software/Version.interface.yaml @@ -38,3 +38,6 @@ enumerations: - name: PSU description: > 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') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch index 5f41a1348..ab13f55fe 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch @@ -1,266 +1,209 @@ -From b25ae31fa674a287bc100081a9dfc243bcf53f19 Mon Sep 17 00:00:00 2001 +From f4eddacc871c6bb759e6e355a89ccaaa12c63396 Mon Sep 17 00:00:00 2001 From: Zhikui Ren <zhikui.ren@intel.com> Date: Tue, 8 Dec 2020 15:16:25 -0800 Subject: [PATCH] update meson build for MCTP interfaces Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> --- - gen/xyz/openbmc_project/MCTP/Base/meson.build | 14 +++++ - .../MCTP/Binding/PCIe/meson.build | 14 +++++ - .../MCTP/Binding/SMBus/meson.build | 14 +++++ - .../openbmc_project/MCTP/Binding/meson.build | 31 ++++++++++ - .../openbmc_project/MCTP/BusOwner/meson.build | 14 +++++ - .../openbmc_project/MCTP/Endpoint/meson.build | 14 +++++ - .../MCTP/SupportedMessageTypes/meson.build | 14 +++++ - gen/xyz/openbmc_project/MCTP/meson.build | 62 +++++++++++++++++++ - gen/xyz/openbmc_project/meson.build | 1 + - 9 files changed, 178 insertions(+) + gen/xyz/openbmc_project/MCTP/Base/meson.build | 13 ++++++ + .../MCTP/Binding/PCIe/meson.build | 13 ++++++ + .../MCTP/Binding/SMBus/meson.build | 13 ++++++ + .../openbmc_project/MCTP/Binding/meson.build | 30 +++++++++++++ + .../openbmc_project/MCTP/BusOwner/meson.build | 13 ++++++ + .../MCTP/SupportedMessageTypes/meson.build | 13 ++++++ + gen/xyz/openbmc_project/MCTP/meson.build | 42 +++++++++++++++++++ + 7 files changed, 137 insertions(+) create mode 100644 gen/xyz/openbmc_project/MCTP/Base/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/BusOwner/meson.build - create mode 100644 gen/xyz/openbmc_project/MCTP/Endpoint/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build - create mode 100644 gen/xyz/openbmc_project/MCTP/meson.build diff --git a/gen/xyz/openbmc_project/MCTP/Base/meson.build b/gen/xyz/openbmc_project/MCTP/Base/meson.build new file mode 100644 -index 0000000..81aeb86 +index 000000000000..c605b2d496ac --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Base/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Base__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Base.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Base.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/MCTP/Base', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build new file mode 100644 -index 0000000..0da866c +index 000000000000..4573a64f4099 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Binding/PCIe__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/MCTP/Binding/PCIe.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/MCTP/Binding/PCIe', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build new file mode 100644 -index 0000000..a0f97bd +index 000000000000..bfb4d040a54c --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Binding/SMBus__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/MCTP/Binding/SMBus.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/MCTP/Binding/SMBus', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/meson.build new file mode 100644 -index 0000000..6e3407c +index 000000000000..36a74ddac294 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/meson.build -@@ -0,0 +1,31 @@ +@@ -0,0 +1,28 @@ +# Generated file; do not modify. +subdir('PCIe') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Binding/PCIe__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], + output: [ 'PCIe.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/MCTP/Binding/PCIe', + ], -+ build_by_default: true, +) + +subdir('SMBus') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Binding/SMBus__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], + output: [ 'SMBus.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/MCTP/Binding/SMBus', + ], -+ build_by_default: true, +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build b/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build new file mode 100644 -index 0000000..190a640 +index 000000000000..4b28bd6b34e7 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/BusOwner__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/BusOwner.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/MCTP/BusOwner', + ], +) -+ -diff --git a/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build -new file mode 100644 -index 0000000..cababfb ---- /dev/null -+++ b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build -@@ -0,0 +1,14 @@ -+# Generated file; do not modify. -+generated_sources += custom_target( -+ 'xyz/openbmc_project/MCTP/Endpoint__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Endpoint.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(), -+ 'xyz/openbmc_project/MCTP/Endpoint', -+ ], -+) -+ diff --git a/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build b/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build new file mode 100644 -index 0000000..f58fa44 +index 000000000000..4fd46823ed17 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/SupportedMessageTypes__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.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/MCTP/SupportedMessageTypes', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/meson.build b/gen/xyz/openbmc_project/MCTP/meson.build -new file mode 100644 -index 0000000..94ab2c2 ---- /dev/null +index b9598adf6fa7..6b6d00b833d2 100644 +--- a/gen/xyz/openbmc_project/MCTP/meson.build +++ b/gen/xyz/openbmc_project/MCTP/meson.build -@@ -0,0 +1,62 @@ -+# Generated file; do not modify. +@@ -1,4 +1,33 @@ + # Generated file; do not modify. +subdir('Base') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Base__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Base.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/Base.interface.yaml', ], + output: [ 'Base.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/MCTP/Base', + ], -+ build_by_default: true, +) + +subdir('Binding') +subdir('BusOwner') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/BusOwner__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], + output: [ 'BusOwner.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/MCTP/BusOwner', + ], -+ build_by_default: true, -+) -+ -+subdir('Endpoint') -+generated_others += custom_target( -+ 'xyz/openbmc_project/MCTP/Endpoint__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Endpoint.interface.yaml', ], -+ output: [ 'Endpoint.md' ], -+ command: [ -+ sdbuspp_gen_meson_prog, '--command', 'markdown', -+ '--output', meson.current_build_dir(), -+ '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), -+ 'xyz/openbmc_project/MCTP/Endpoint', -+ ], -+ build_by_default: true, +) + + subdir('Endpoint') + generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Endpoint__markdown'.underscorify(), +@@ -13,3 +42,16 @@ generated_others += custom_target( + ], + ) + +subdir('SupportedMessageTypes') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/SupportedMessageTypes__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], + output: [ 'SupportedMessageTypes.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/MCTP/SupportedMessageTypes', + ], -+ build_by_default: true, +) -+ -diff --git a/gen/xyz/openbmc_project/meson.build b/gen/xyz/openbmc_project/meson.build -index 3c4750f..e4372b0 100644 ---- a/gen/xyz/openbmc_project/meson.build -+++ b/gen/xyz/openbmc_project/meson.build -@@ -68,6 +68,7 @@ generated_others += custom_target( - subdir('Ipmi') - subdir('Led') - subdir('Logging') -+subdir('MCTP') - subdir('Memory') - subdir('Network') - subdir('Nvme') -- 2.17.1 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') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch index 29c49874a..f614f88c6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch @@ -1,4 +1,4 @@ -From 3a507873ed733ed0e313f6efb89f7a491577e015 Mon Sep 17 00:00:00 2001 +From ee72d92baf3d64d066e0ec64cbd8723177219182 Mon Sep 17 00:00:00 2001 From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> Date: Tue, 1 Jun 2021 12:27:50 +0000 Subject: [PATCH] Add username property to SessionInfo interface @@ -26,14 +26,14 @@ xyz.openbmc_project.Ipmi.SessionInfo interface - - - Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> --- - xyz/openbmc_project/Ipmi/SESSION_README.md | 1 + - xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml | 6 ++++++ + yaml/xyz/openbmc_project/Ipmi/SESSION_README.md | 1 + + yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml | 6 ++++++ 2 files changed, 7 insertions(+) -diff --git a/xyz/openbmc_project/Ipmi/SESSION_README.md b/xyz/openbmc_project/Ipmi/SESSION_README.md -index c59b251..18ae66a 100644 ---- a/xyz/openbmc_project/Ipmi/SESSION_README.md -+++ b/xyz/openbmc_project/Ipmi/SESSION_README.md +diff --git a/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md b/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md +index c59b251bb88d..ed41c3bf181d 100644 +--- a/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md ++++ b/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md @@ -16,6 +16,7 @@ so that both phosphor-ipmi-host & phosphr-ipmi-net will be in sync. * RemotePort - Remote port address. * RemoteMACAddress -Remote MAC Address. @@ -42,10 +42,10 @@ index c59b251..18ae66a 100644 -diff --git a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml -index 0ddc025..a7c3a90 100644 ---- a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml -+++ b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml +index 0ddc0250db50..50aff5c26072 100644 +--- a/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml @@ -46,6 +46,12 @@ properties: Session created by given user ID. errors: |