meta-phosphor: Fix explicit dependencies antipattern

Out of the box bitbake examines built applications, automatically adds
runtime dependencies and thus ensures any library packages dependencies
are automatically added to images, sdks, etc.  There is no need to list
them explicitly in a recipe.

Dependencies change over time, and listing them explicitly is likely
prone to errors - the net effect being unnecessary shared library
packages being installed into images.

Consult
https://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-RDEPENDS
for information on when to use explicit runtime dependencies.

(From meta-phosphor rev: 26873c99d30b55e21a920c9851f21c3e2eab19f7)

Change-Id: I38640d75a2d834c07d45ddcdb0162f1a23f848d9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

24 files changed, 11 insertions, 90 deletions

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 eb6adb3dcb..a2b34fab7c 100644
--- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
@@ -17,10 +17,6 @@ DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
 RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
 RDEPENDS_${PN} += "network"
-RDEPENDS_${PN} += "libmapper"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "sdbusplus"
-RDEPENDS_${PN} += "phosphor-dbus-interfaces"
 RDEPENDS_${PN} += "phosphor-mapper"
 
 SRC_URI += "git://github.com/openbmc/phosphor-time-manager"
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb
index 578acfb191..f0eed7e9e3 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb
@@ -25,7 +25,6 @@ SYSTEMD_SERVICE_${PN} += " \
         mapper-wait@.service \
         mapper-subtree-remove@.service \
         "
-RDEPENDS_libmapper += "libsystemd"
 RDEPENDS_${PN} += " \
         python-argparse \
         python-xml \
@@ -33,8 +32,6 @@ RDEPENDS_${PN} += " \
         python-pygobject \
         pyphosphor-dbus \
         pyphosphor-utils \
-        sdbusplus \
-        phosphor-logging \
         "
 SRC_URI += "git://github.com/openbmc/phosphor-objmgr"
 
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 3fd6f0ba0f..780f889df3 100644
--- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb
@@ -39,16 +39,8 @@ DEPENDS += " \
 "
 
 RDEPENDS_${PN}-manager += " \
-        sdbusplus \
-        phosphor-dbus-interfaces \
-        phosphor-logging \
         ${PN}-dreport \
 "
-RDEPENDS_${PN}-monitor += " \
-        sdbusplus \
-        phosphor-dbus-interfaces \
-        phosphor-logging \
-"
 RDEPENDS_${PN}-dreport += " \
         systemd \
         ${VIRTUAL-RUNTIME_base-utils} \
diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb
index ef49a43461..e7d86e4c28 100644
--- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb
+++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb
@@ -7,7 +7,8 @@ inherit skeleton-sdbus
 inherit obmc-phosphor-dbus-service
 inherit pkgconfig
 
-RDEPENDS_${PN} += "libsystemd"
+DEPENDS = "systemd"
+
 SKELETON_DIR = "fanctl"
 
 DBUS_SERVICE_${PN} += "org.openbmc.control.Fans.service"
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
index 1f9c073357..83f5936358 100644
--- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
@@ -22,6 +22,7 @@ SRCREV = "e3eeef45a722b57d4c3bb379df165e0bd14993bd"
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbusplus"
+DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "libevdev"
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 4637651ef6..7169caa7c2 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -40,21 +40,8 @@ DEPENDS += " \
     sdbus++-native \
 "
 
-RDEPENDS_${PN}-version += " \
-    phosphor-logging \
-    phosphor-dbus-interfaces \
-    sdbusplus \
-"
-RDEPENDS_${PN}-download-mgr += " \
-    phosphor-logging \
-    phosphor-dbus-interfaces \
-    sdbusplus \
-"
 RDEPENDS_${PN}-updater += " \
     bash \
-    phosphor-logging \
-    phosphor-dbus-interfaces \
-    sdbusplus \
     virtual-obmc-image-manager \
 "
 EXTRA_OECONF += " \
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 9c9f236b73..985521896e 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -28,18 +28,7 @@ DEPENDS += "sdbusplus sdbusplus-native"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "libevdev"
 DEPENDS += "phosphor-logging"
-
-RDEPENDS_${PN}-monitor += " \
-    libsystemd \
-    libevdev \
-    phosphor-logging \
-"
-RDEPENDS_${PN}-presence += " \
-    libsystemd \
-    libevdev \
-    phosphor-logging \
-    sdbusplus \
-"
+DEPENDS += "systemd"
 
 SYSTEMD_SERVICE_${PN}-monitor += "phosphor-gpio-monitor@.service"
 SYSTEMD_SERVICE_${PN}-presence += "phosphor-gpio-presence@.service"
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 d72c12d0bd..c6e3b29558 100644
--- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
@@ -24,11 +24,6 @@ DEPENDS += " \
         autoconf-archive-native \
         libcereal \
         "
-RDEPENDS_${PN} += " \
-        sdbusplus \
-        phosphor-dbus-interfaces \
-        phosphor-logging \
-        "
 
 OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory"
 OBMC_INVENTORY_MGR_IFACE="${OBMC_DBUS_IFACE_ROOT}.Inventory.Manager"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
index 323821bf57..50cf8e4d77 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
@@ -16,7 +16,6 @@ RRECOMMENDS_${PN} += "phosphor-ipmi-host"
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
 
 S = "${WORKDIR}/git"
 SRC_URI += "git://github.com/openbmc/btbridge"
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 ceb3c0d7a1..9527b39e07 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -42,12 +42,8 @@ VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config"
 RDEPENDS_${PN}-dev += "phosphor-logging"
 RDEPENDS_${PN}-dev += "phosphor-mapper-dev"
 RDEPENDS_${PN} += "clear-once"
-RDEPENDS_${PN} += "libmapper"
 RDEPENDS_${PN} += "network"
-RDEPENDS_${PN} += "phosphor-dbus-interfaces"
-RDEPENDS_${PN} += "phosphor-mapper"
 RDEPENDS_${PN} += "phosphor-time-manager"
-RDEPENDS_${PN} += "sdbusplus"
 RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
 RDEPENDS_${PN} += "virtual/obmc-watchdog"
 
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index f8ea442286..752ac78c9c 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -23,7 +23,6 @@ DEPENDS += " \
         autoconf-archive-native \
         systemd \
         "
-RDEPENDS_${PN} += "libsystemd"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/kcsbridge.git;protocol=https"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index 4f74525225..f27b998c33 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -13,8 +13,6 @@ DEPENDS += "autoconf-archive-native"
 DEPENDS += "phosphor-mapper"
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-host"
-RDEPENDS_${PN} += "libmapper"
-RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "iptables"
 
 SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
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 5ab34807d8..cd22d65b74 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -23,14 +23,10 @@ SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}"
 DEPENDS += "python-pyyaml-native"
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbusplus sdbusplus-native"
+DEPENDS += "systemd"
 DEPENDS += "phosphor-logging"
 
 DEPENDS += "virtual/${PN}-config-native"
-RDEPENDS_${PN}-ledmanager += "libsystemd"
-RDEPENDS_${PN}-ledmanager += "phosphor-logging"
-
-RDEPENDS_${PN}-faultmonitor += "libsystemd"
-RDEPENDS_${PN}-faultmonitor += "phosphor-logging"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
index 91511b2b98..60b6761a8e 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
@@ -11,8 +11,8 @@ inherit obmc-phosphor-dbus-service
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbusplus"
+DEPENDS += "systemd"
 DEPENDS += "phosphor-dbus-interfaces"
-RDEPENDS_${PN} += "libsystemd"
 
 DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service"
 
diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
index c97afb73b3..81b7f4536e 100644
--- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
@@ -6,8 +6,9 @@ PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
+DEPENDS += "systemd"
+
 RDEPENDS_${PN} += " \
-        systemd \
         ${VIRTUAL-RUNTIME_base-utils} \
         "
 
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
index 636a4a617c..2c6f75c313 100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -41,14 +41,12 @@ PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}"
 SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}"
 DBUS_PACKAGES = "${LOGGING_PACKAGES}"
 
-RDEPENDS_${PN}-base += "sdbusplus phosphor-dbus-interfaces"
 FILES_${PN}-base += " \
         ${sbindir}/phosphor-log-manager \
         ${libdir}/libphosphor_logging.so.* \
 "
 DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service"
 
-RDEPENDS_phosphor-rsyslog-config += "sdbusplus phosphor-dbus-interfaces"
 DBUS_SERVICE_phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service"
 FILES_phosphor-rsyslog-config += " \
         ${sbindir}/phosphor-rsyslog-conf \
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
index 9cc0065451..1257f891a2 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
@@ -11,7 +11,6 @@ inherit obmc-phosphor-systemd
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
 DEPENDS += "phosphor-logging"
-RDEPENDS_${PN} += "libsystemd"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-phosphor/recipes-phosphor/network/network_git.bb b/meta-phosphor/recipes-phosphor/network/network_git.bb
index 3d80c7e6f2..82c276fe02 100644
--- a/meta-phosphor/recipes-phosphor/network/network_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/network_git.bb
@@ -20,12 +20,6 @@ DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
 DEPENDS += "phosphor-logging"
 DEPENDS += "libnl"
 
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces"
-RDEPENDS_${PN} += "phosphor-logging"
-RDEPENDS_${PN} += "libnl"
-RDEPENDS_${PN} += "libnl-genl"
-
 S = "${WORKDIR}/git"
 
 SERVICE_FILE = "xyz.openbmc_project.Network.service"
diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
index b00067f3ff..67d5ba3146 100644
--- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
@@ -23,9 +23,4 @@ DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
 DEPENDS += "phosphor-logging"
 DEPENDS += "net-snmp"
 
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces"
-RDEPENDS_${PN} += "phosphor-logging"
-RDEPENDS_${PN} += "net-snmp-lib-netsnmp"
-
 S = "${WORKDIR}/git"
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 1f848990b2..d525ae3339 100644
--- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb
@@ -23,8 +23,6 @@ DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
 DEPENDS += "phosphor-logging"
 DEPENDS += "libcereal"
 
-RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces"
-
 S = "${WORKDIR}/git"
 SRC_URI += "file://merge_settings.py"
 
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index f25117fafd..5408b4750b 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -41,15 +41,8 @@ DEPENDS += "sdbusplus"
 DEPENDS += "sdeventplus"
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
+DEPENDS += "systemd"
 DEPENDS += "libcereal"
-RDEPENDS_${PN} += "sdbusplus"
-
-RDEPENDS_${PN}-host += "libsystemd phosphor-dbus-interfaces"
-RDEPENDS_${PN}-chassis += "libsystemd phosphor-dbus-interfaces"
-RDEPENDS_${PN}-bmc += "libsystemd phosphor-dbus-interfaces"
-RDEPENDS_${PN}-discover += "libsystemd phosphor-dbus-interfaces"
-RDEPENDS_${PN}-host-check += "libsystemd phosphor-dbus-interfaces"
-RDEPENDS_${PN}-reset-sensor-states += "libsystemd phosphor-dbus-interfaces"
 
 FILES_${PN}-host = "${sbindir}/phosphor-host-state-manager"
 DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service"
diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
index f4ee05d1d3..9fda3b0713 100644
--- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
@@ -15,9 +15,8 @@ DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "boost"
 DEPENDS += "nss-pam-ldapd"
+DEPENDS += "systemd"
 PACKAGE_BEFORE_PN = "phosphor-ldap"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "phosphor-logging"
 
 inherit useradd
 
diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
index c8780a4e77..f55d4718d6 100644
--- a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
+++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb
@@ -14,7 +14,6 @@ inherit systemd
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "fbterm"
 
 SRCREV = "14decab20f621c050760e5f3310f5a960cf21211"
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
index a97a978a21..d754a6d725 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
@@ -18,8 +18,7 @@ DEPENDS += "sdbusplus"
 DEPENDS += "sdeventplus"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "phosphor-logging"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "phosphor-logging"
+DEPENDS += "systemd"
 
 SRC_URI += "git://github.com/openbmc/phosphor-watchdog"
 SRCREV = "50ae4b152ba8aaecd1a09634d2df7036f14e03ed"