treewide: remove pointless abstractions

All of these abstractions have exactly one implementation.  Remove the
indirection to improve at a glance comprehension.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5d701aff6d0876fa3b2d16c841cbdcb0433b221f
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 8805321..64d1cf2 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -3,7 +3,7 @@
 DEPENDS:append:p10bmc = " p10bmc-yaml-config"
 
 # host watchdog does not work with witherspoon-tacoma host firmware
-RDEPENDS:${PN}:remove:witherspoon-tacoma = "virtual/obmc-watchdog"
+RDEPENDS:${PN}:remove:witherspoon-tacoma = "phosphor-watchdog"
 
 EXTRA_OEMESON:ibm-ac-server = " \
     -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \