diff options
17 files changed, 21 insertions, 24 deletions
diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 17689f5d05..4491a31ab0 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -22,7 +22,6 @@ DEPENDS = " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ sdeventplus \ " diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 2dc6303862..dfa435b1f8 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -12,7 +12,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" RDEPENDS_${PN} += "phosphor-settings-manager" 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 94e88107db..8c7eb5503b 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 f31233ff46..4785e5b2d3 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 \ diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 8e455b54d5..e1a544c97e 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -33,7 +33,7 @@ DEPENDS += " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ autoconf-archive-native \ virtual/phosphor-debug-errors \ ${PYTHON_PN}-native \ diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 38a6fb1c04..1d7f514b25 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -17,7 +17,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "sdeventplus" DEPENDS += "gpioplus" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index a32c3db9e7..ba14ff8b7a 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -38,7 +38,7 @@ DEPENDS += " \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ - sdbus++-native \ + ${PYTHON_PN}-sdbus++-native \ sdbusplus \ " diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 36ffe9c93a..4bbfd1638e 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -23,7 +23,7 @@ RPROVIDES_${PN}-presence += "virtual/obmc-gpio-presence" PROVIDES += "virtual/obmc-gpio-monitor" PROVIDES += "virtual/obmc-gpio-presence" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "libevdev" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb index 9b5530b611..dece2a3d9a 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -20,7 +20,7 @@ DEPENDS += " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ autoconf-archive-native \ libcereal \ ${PYTHON_PN}-native \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 1f82e757d0..f4339348ef 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -29,7 +29,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-mapper" DEPENDS += "sdbusplus" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index c625bb13ed..0bf71567a8 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -24,7 +24,7 @@ DEPENDS += "${PYTHON_PN}-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-inflection-native" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "systemd" DEPENDS += "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 5a6a4d2fee..2426d43ee7 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 c65117dec4..9c595487c8 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 \ diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index aa6addbb90..0bbfb4b6ab 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -14,7 +14,7 @@ inherit systemd DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 9faa30daf2..7f4787b748 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -18,7 +18,7 @@ DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" DEPENDS += "net-snmp" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index e51e536b67..146824579b 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -32,7 +32,7 @@ SYSTEMD_PACKAGES = "${POWER_SERVICE_PACKAGES}" DEPENDS += " \ phosphor-logging \ openpower-dbus-interfaces \ - sdbus++-native \ + ${PYTHON_PN}-sdbus++-native \ sdeventplus \ nlohmann-json \ cli11 \ diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index d525ae3339..e528111956 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -18,7 +18,7 @@ DEPENDS += "python-mako-native" DEPENDS += "autoconf-archive-native" DEPENDS += "virtual/phosphor-settings-defaults" DEPENDS += "${@df_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" DEPENDS += "libcereal" |