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.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I30b17084af515647a42fcce3624a55c22e4a7172
diff --git a/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb
index 17689f5..4491a31 100644
--- a/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb
+++ b/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb
@@ -22,7 +22,6 @@
phosphor-dbus-interfaces-native \
phosphor-logging \
sdbusplus \
- sdbusplus-native \
sdeventplus \
"
diff --git a/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/recipes-phosphor/datetime/phosphor-time-manager_git.bb
index 2dc6303..dfa435b 100644
--- a/recipes-phosphor/datetime/phosphor-time-manager_git.bb
+++ b/recipes-phosphor/datetime/phosphor-time-manager_git.bb
@@ -12,7 +12,7 @@
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/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
index 94e8810..8c7eb55 100644
--- a/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
+++ b/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
@@ -7,24 +7,21 @@
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/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
index f31233f..4785e5b 100644
--- a/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
+++ b/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb
@@ -23,7 +23,7 @@
${PN}-config \
phosphor-logging \
autoconf-archive-native \
- sdbusplus-native \
+ ${PYTHON_PN}-sdbus++-native \
sdeventplus \
gtest \
phosphor-snmp \
diff --git a/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/recipes-phosphor/dump/phosphor-debug-collector_git.bb
index 8e455b5..e1a544c 100644
--- a/recipes-phosphor/dump/phosphor-debug-collector_git.bb
+++ b/recipes-phosphor/dump/phosphor-debug-collector_git.bb
@@ -33,7 +33,7 @@
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/recipes-phosphor/fans/phosphor-fan_git.bb b/recipes-phosphor/fans/phosphor-fan_git.bb
index 38a6fb1..1d7f514 100644
--- a/recipes-phosphor/fans/phosphor-fan_git.bb
+++ b/recipes-phosphor/fans/phosphor-fan_git.bb
@@ -17,7 +17,7 @@
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/recipes-phosphor/flash/phosphor-software-manager_git.bb b/recipes-phosphor/flash/phosphor-software-manager_git.bb
index a32c3db..ba14ff8 100644
--- a/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -38,7 +38,7 @@
openssl \
phosphor-dbus-interfaces \
phosphor-logging \
- sdbus++-native \
+ ${PYTHON_PN}-sdbus++-native \
sdbusplus \
"
diff --git a/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
index 36ffe9c..4bbfd16 100644
--- a/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -23,7 +23,7 @@
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/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
index 9b5530b..dece2a3 100644
--- a/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
+++ b/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
@@ -20,7 +20,7 @@
phosphor-dbus-interfaces-native \
phosphor-logging \
sdbusplus \
- sdbusplus-native \
+ ${PYTHON_PN}-sdbus++-native \
autoconf-archive-native \
libcereal \
${PYTHON_PN}-native \
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index 1f82e75..f433934 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -29,7 +29,7 @@
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/recipes-phosphor/leds/phosphor-led-manager_git.bb b/recipes-phosphor/leds/phosphor-led-manager_git.bb
index c625bb1..0bf7156 100644
--- a/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -24,7 +24,7 @@
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/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/recipes-phosphor/logging/phosphor-hostlogger_git.bb
index 5a6a4d2..2426d43 100644
--- a/recipes-phosphor/logging/phosphor-hostlogger_git.bb
+++ b/recipes-phosphor/logging/phosphor-hostlogger_git.bb
@@ -17,7 +17,7 @@
DEPENDS += "\
autoconf-archive-native \
sdbusplus \
- sdbusplus-native \
+ ${PYTHON_PN}-sdbus++-native \
phosphor-dbus-interfaces \
"
RDEPENDS_${PN} += "obmc-console"
diff --git a/recipes-phosphor/logging/phosphor-logging_git.bb b/recipes-phosphor/logging/phosphor-logging_git.bb
index c65117d..9c59548 100644
--- a/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -18,7 +18,8 @@
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 @@
# 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 @@
# 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/recipes-phosphor/network/phosphor-network_git.bb b/recipes-phosphor/network/phosphor-network_git.bb
index aa6addb..0bbfb4b 100644
--- a/recipes-phosphor/network/phosphor-network_git.bb
+++ b/recipes-phosphor/network/phosphor-network_git.bb
@@ -14,7 +14,7 @@
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/recipes-phosphor/network/phosphor-snmp_git.bb b/recipes-phosphor/network/phosphor-snmp_git.bb
index 9faa30d..7f4787b 100644
--- a/recipes-phosphor/network/phosphor-snmp_git.bb
+++ b/recipes-phosphor/network/phosphor-snmp_git.bb
@@ -18,7 +18,7 @@
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/recipes-phosphor/power/phosphor-power_git.bb b/recipes-phosphor/power/phosphor-power_git.bb
index e51e536..1468245 100644
--- a/recipes-phosphor/power/phosphor-power_git.bb
+++ b/recipes-phosphor/power/phosphor-power_git.bb
@@ -32,7 +32,7 @@
DEPENDS += " \
phosphor-logging \
openpower-dbus-interfaces \
- sdbus++-native \
+ ${PYTHON_PN}-sdbus++-native \
sdeventplus \
nlohmann-json \
cli11 \
diff --git a/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/recipes-phosphor/settings/phosphor-settings-manager_git.bb
index d525ae3..e528111 100644
--- a/recipes-phosphor/settings/phosphor-settings-manager_git.bb
+++ b/recipes-phosphor/settings/phosphor-settings-manager_git.bb
@@ -18,7 +18,7 @@
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"