summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
authorDeepak Kodihalli <dkodihal@in.ibm.com>2018-08-24 08:05:14 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-30 21:14:00 -0400
commit6446477937f4c6361abf3e82c167fc2020dd5a98 (patch)
tree1aee595000a4dd23943e6eb8bee36cad33fb9fd8 /meta-phosphor
parentc5d78090a27b524d4873a23d4082082e0fde2622 (diff)
downloadtalos-openbmc-6446477937f4c6361abf3e82c167fc2020dd5a98.tar.gz
talos-openbmc-6446477937f4c6361abf3e82c167fc2020dd5a98.zip
Restructure phosphor-logging recipe
Restructure phosphor-logging recipe to allow additions of packages. (From meta-phosphor rev: 38af2c0d75122aecaeac53c0190884a48885f6a6) Change-Id: If187200a0874bc0c9ce6e4d759a2e1ca7ea7ffc8 Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb20
1 files changed, 17 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
index 8a6b50575..e5b0a4d01 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
+++ b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
@@ -11,8 +11,6 @@ inherit obmc-phosphor-dbus-service
inherit phosphor-logging
inherit phosphor-dbus-yaml
-DBUS_SERVICE_${PN} += "xyz.openbmc_project.Logging.service"
-
DEPENDS += "autoconf-archive-native"
DEPENDS += "systemd"
DEPENDS += "python-mako-native"
@@ -23,7 +21,6 @@ DEPENDS += "virtual/phosphor-logging-callouts"
DEPENDS += "phosphor-logging-error-logs-native"
DEPENDS += "phosphor-logging-native"
DEPENDS += "cereal"
-RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces"
PACKAGE_BEFORE_PN = "${PN}-test"
FILES_${PN}-test = "${bindir}/*-test"
@@ -31,6 +28,23 @@ FILES_${PN}-test = "${bindir}/*-test"
PACKAGE_BEFORE_PN += "${PN}-elog"
FILES_${PN}-elog += "${elog_dir}"
+# Package configuration
+LOGGING_PACKAGES = " \
+ ${PN}-base \
+"
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}"
+SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}"
+DBUS_PACKAGES = "${LOGGING_PACKAGES}"
+
+RDEPENDS_${PN}-base += "sdbusplus phosphor-dbus-interfaces"
+FILES_${PN}-base += " \
+ ${sbindir}/phosphor-log-manager \
+ ${libdir}/libphosphor_logging.so.* \
+"
+DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service"
+
SRC_URI += "git://github.com/openbmc/phosphor-logging"
SRCREV = "9fab279fb38ab6b391503ce89aceb917ec35efa9"
OpenPOWER on IntegriCloud