From 4b32c9ae068beccc3755c48784253e96c31cfd46 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 31 Mar 2020 16:43:15 -0500 Subject: meta-phosphor: update DEPENDS for sdbusplus-native sdbusplus has changed the package layout so that sdbusplus-native and sdbus++-native are now ${PYTHON_PN}-sdbus++-native. Update recipes that need to use sdbus++ (or its associated python modules) or remove the DEPENDS if it is no longer necessary. (From meta-phosphor rev: 2bebd1247cb78567441158b152c7a13f476afd4f) Signed-off-by: Patrick Williams Change-Id: I30f9c2220da9145ef0a7067e067aed1396d8b40d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb | 2 +- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/logging') diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 5a6a4d2fe..2426d43ee 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "\ autoconf-archive-native \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ phosphor-dbus-interfaces \ " RDEPENDS_${PN} += "obmc-console" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c65117dec..9c595487c 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -18,7 +18,8 @@ DEPENDS += "systemd" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "virtual/phosphor-logging-callouts" DEPENDS += "phosphor-logging-error-logs-native" @@ -63,7 +64,7 @@ S = "${WORKDIR}/git" # as they will not be available in host machine DEPENDS_remove_class-native = " \ virtual/phosphor-logging-callouts \ - sdbus++ \ + sdbusplus \ systemd \ libcereal \ sdeventplus \ @@ -73,7 +74,7 @@ DEPENDS_remove_class-native = " \ # as they will not be available in host machine DEPENDS_remove_class-nativesdk = " \ virtual/phosphor-logging-callouts \ - sdbus++-native \ + sdbusplus-native \ libcereal \ systemd \ phosphor-dbus-interfaces \ -- cgit v1.2.3