summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarri Devender Rao <devenrao@in.ibm.com>2017-05-29 09:33:26 +0300
committerPatrick Williams <patrick@stwcx.xyz>2017-06-08 16:19:36 +0300
commit8dd7798ed47ed0737a6c60a25f2610ca3486d76f (patch)
tree9a5fd13023bafee27c967e7425e8dc350d0aac53
parenta70eb8af74d7997e5072ec398ddaac97d1be927c (diff)
downloadopenbmc-8dd7798ed47ed0737a6c60a25f2610ca3486d76f.tar.xz
Package yaml files and generated files as part of base class
Change-Id: I6a66dc2fd6d7117f1ac8b085858b911955866814 Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb5
-rw-r--r--meta-phosphor/classes/phosphor-dbus-yaml.bbclass4
-rw-r--r--meta-phosphor/classes/phosphor-logging.bbclass1
-rw-r--r--meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb5
4 files changed, 6 insertions, 9 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
index 7cfbce345..13a11597d 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/dbus/openpower-dbus-interfaces.bb
@@ -7,14 +7,11 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig
inherit obmc-phosphor-license
inherit pythonnative
+inherit phosphor-dbus-yaml
DEPENDS += "autoconf-archive-native"
DEPENDS += "sdbus++-native"
-PACKAGE_BEFORE_PN = "${PN}-yaml"
-
-FILES_${PN}-yaml = "${datadir}/${PN}/yaml"
-
SRC_URI += "git://github.com/openbmc/openpower-dbus-interfaces"
SRCREV = "b331f56c416812b20c1a338b3ffdce32d169a0c1"
diff --git a/meta-phosphor/classes/phosphor-dbus-yaml.bbclass b/meta-phosphor/classes/phosphor-dbus-yaml.bbclass
new file mode 100644
index 000000000..973c2bd5b
--- /dev/null
+++ b/meta-phosphor/classes/phosphor-dbus-yaml.bbclass
@@ -0,0 +1,4 @@
+yaml_dir = "${datadir}/phosphor-dbus-yaml/yaml"
+
+PACKAGE_BEFORE_PN += "${PN}-yaml"
+FILES_${PN}-yaml += "${yaml_dir}"
diff --git a/meta-phosphor/classes/phosphor-logging.bbclass b/meta-phosphor/classes/phosphor-logging.bbclass
index 0264b51e6..18f53d434 100644
--- a/meta-phosphor/classes/phosphor-logging.bbclass
+++ b/meta-phosphor/classes/phosphor-logging.bbclass
@@ -1,2 +1 @@
callouts_datadir="${datadir}/phosphor-logging/callouts"
-error_yaml_dir = "${datadir}/phosphor-logging/error/yaml"
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
index 7ee227fb3..80089b32e 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
@@ -7,14 +7,11 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig
inherit obmc-phosphor-license
inherit pythonnative
+inherit phosphor-dbus-yaml
DEPENDS += "autoconf-archive-native"
DEPENDS += "sdbus++-native"
-PACKAGE_BEFORE_PN = "${PN}-yaml"
-
-FILES_${PN}-yaml = "${datadir}/${PN}/yaml"
-
SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces"
SRCREV = "7b54884c0460f529efd047c7c5d1d679c9333a29"