| commit | c84d4131a092b40db534eecce77f4d1e9e589032 | [log] [tgz] |
|---|---|---|
| author | Marri Devender Rao <devenrao@in.ibm.com> | Thu Jun 08 23:53:04 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Jun 12 11:14:22 2017 +0000 |
| tree | 0d6ae17755301d30c03f6f3c162b5c50684ece6d | |
| parent | 7915f28bbc1f6ca0987b541af84d1476c5fe19b7 [diff] |
fix duplicate yaml_dir config variable declaration and usage yaml_dir is defined both in phosphor-dbus-interfaces.bbclass and phosphor-obmc-yaml.bbclass pointing to different locations. Fixed the same by removing usage of phosphor-dbus-interfaces Also removed unused openpower-dbus-interfaces.bbclass Change-Id: I74d06a0f7d635bd708f58611444061c6d48db858 Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/classes/openpower-dbus-interfaces.bbclass b/meta-openbmc-machines/meta-openpower/classes/openpower-dbus-interfaces.bbclass deleted file mode 100644 index f79cf07..0000000 --- a/meta-openbmc-machines/meta-openpower/classes/openpower-dbus-interfaces.bbclass +++ /dev/null
@@ -1 +0,0 @@ -op_yaml_dir="${datadir}/openpower-dbus-interfaces/yaml"
diff --git a/meta-phosphor/classes/phosphor-dbus-interfaces.bbclass b/meta-phosphor/classes/phosphor-dbus-interfaces.bbclass deleted file mode 100644 index 865ab99..0000000 --- a/meta-phosphor/classes/phosphor-dbus-interfaces.bbclass +++ /dev/null
@@ -1 +0,0 @@ -yaml_dir="${datadir}/phosphor-dbus-interfaces/yaml"
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb index 93cdb8c..91f34f0 100644 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb
@@ -7,7 +7,7 @@ inherit autotools \ pkgconfig \ pythonnative \ - phosphor-dbus-interfaces \ + phosphor-dbus-yaml \ phosphor-inventory-manager \ obmc-phosphor-dbus-service
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb index 09f5709..5ce3e7f 100644 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb +++ b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
@@ -8,7 +8,6 @@ inherit pythonnative inherit obmc-phosphor-license inherit obmc-phosphor-dbus-service -inherit phosphor-dbus-interfaces inherit phosphor-logging inherit phosphor-dbus-yaml