summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2017-01-30 20:30:00 -0600
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-02-03 02:29:50 +0000
commit8635421096c7a7d683412b5f7ffb36d598f48f9d (patch)
treec434d1d3b75c900150f4f6185527fa03099d6a03
parent83833af97167a442a1b749daf4c1e3eff2ff95b0 (diff)
downloadtalos-openbmc-8635421096c7a7d683412b5f7ffb36d598f48f9d.tar.gz
talos-openbmc-8635421096c7a7d683412b5f7ffb36d598f48f9d.zip
Add dependency to libsdbusplus
Remove ALLOW_EMPTY from sdbusplus recipe as the library has been created. Add dependency to phosphor-logging and state-manager. Change-Id: Ia7be4ec9f9cd0f272ece7eccad79c0bc46bbc893 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
-rw-r--r--meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb3
-rw-r--r--meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb1
-rw-r--r--meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb b/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb
index f7ec5e7d3..9e771f8dc 100644
--- a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb
+++ b/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb
@@ -31,7 +31,7 @@ DEPENDS_append_class-native = " \
"
SRC_URI += "git://github.com/openbmc/sdbusplus"
-SRCREV = "3306847106526b76af55513a0c1a5d974ede9c25"
+SRCREV = "a1fb5e6c3951eb8ad00795ba9471d968e53faad2"
PACKAGECONFIG ??= "libsdbusplus"
PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd"
@@ -45,6 +45,5 @@ PYTHON_AUTOTOOLS_PACKAGE = "sdbus++"
PACKAGECONFIG_remove_class-native = "libsdbusplus"
PACKAGECONFIG_remove_class-nativesdk = "libsdbusplus"
-ALLOW_EMPTY_${PN} = "1"
BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
index cd54d30db..e449746cc 100644
--- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
+++ b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb
@@ -15,6 +15,7 @@ DEPENDS += "systemd"
DEPENDS += "python-mako-native"
DEPENDS += "python-pyyaml-native"
DEPENDS += "sdbusplus sdbusplus-native"
+RDEPENDS_${PN} += "sdbusplus"
PROVIDES += "virtual/obmc-logging-mgmt"
RPROVIDES_${PN} += "virtual-obmc-logging-mgmt"
diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
index 7dcceeb04..8dd19fe29 100644
--- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
@@ -26,6 +26,7 @@ DEPENDS += "autoconf-archive-native"
DEPENDS += "sdbusplus"
DEPENDS += "phosphor-logging"
DEPENDS += "phosphor-dbus-interfaces"
+RDEPENDS_${PN} += "sdbusplus"
RDEPENDS_${PN}-host += "libsystemd phosphor-dbus-interfaces"
RDEPENDS_${PN}-chassis += "libsystemd phosphor-dbus-interfaces"
@@ -47,6 +48,6 @@ FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager"
DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service"
SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "9792414f6bdc925f2785355bdf456b54d46a0b90"
+SRCREV = "20a4887fa02492d854ea131ffd5775512196e975"
S = "${WORKDIR}/git"
OpenPOWER on IntegriCloud