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 --- .../recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 9 +++------ meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/dbus') diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 94e88107d..8c7eb5503 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,24 +7,21 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" SRCREV = "e08baa59447073895d1798fe054dfede3f842044" -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - PACKAGECONFIG ??= "libphosphor_dbus" PACKAGECONFIG[libphosphor_dbus] = " \ --enable-libphosphor_dbus, \ --disable-libphosphor_dbus, \ systemd sdbusplus, \ - libsystemd sdbusplus \ + libsystemd \ " PACKAGECONFIG_remove_class-native = "libphosphor_dbus" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index f31233ff4..4785e5b2d 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -23,7 +23,7 @@ DEPENDS += " \ ${PN}-config \ phosphor-logging \ autoconf-archive-native \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ sdeventplus \ gtest \ phosphor-snmp \ -- cgit v1.2.3