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-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
index 4692bd1..aad36e5 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -12,8 +12,6 @@
DEPENDS += "libgpiod"
DEPENDS += "cli11"
DEPENDS += "nlohmann-json"
-PROVIDES += "virtual/obmc-gpio-monitor"
-PROVIDES += "virtual/obmc-gpio-presence"
SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504"
PV = "1.0+git${SRCPV}"
PR = "r1"
@@ -31,9 +29,6 @@
EXTRA_OEMESON:append = " -Dtests=disabled"
-RPROVIDES:${PN}-monitor += "virtual/obmc-gpio-monitor"
-RPROVIDES:${PN}-presence += "virtual/obmc-gpio-presence"
-
FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor"
FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor"
FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util"
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 6794a09..ac0a09d 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -59,10 +59,10 @@
RDEPENDS:${PN} += "phosphor-network"
RDEPENDS:${PN} += "phosphor-time-manager"
RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
-RDEPENDS:${PN} += "virtual/obmc-watchdog"
+RDEPENDS:${PN} += "phosphor-watchdog"
RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}"
-RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}"
-RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}"
+RDEPENDS:${PN} += "phosphor-software-manager-version"
+RDEPENDS:${PN} += "phosphor-software-manager-updater"
inherit useradd
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 648cab3..5ba261b 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -116,9 +116,9 @@
SUMMARY:${PN}-leds = "LED applications"
RDEPENDS:${PN}-leds = " \
- ${VIRTUAL-RUNTIME_obmc-leds-manager} \
- ${VIRTUAL-RUNTIME_obmc-leds-sysfs} \
- ${VIRTUAL-RUNTIME_obmc-led-monitor} \
+ phosphor-led-manager \
+ phosphor-led-sysfs \
+ phosphor-led-manager-faultmonitor \
"
SUMMARY:${PN}-logging = "Logging applications"
@@ -154,16 +154,16 @@
SUMMARY:${PN}-software = "Software applications"
RDEPENDS:${PN}-software = " \
- ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \
- ${VIRTUAL-RUNTIME_obmc-bmc-updater} \
- ${VIRTUAL-RUNTIME_obmc-bmc-version} \
+ phosphor-software-manager-download-mgr \
+ phosphor-software-manager-updater \
+ phosphor-software-manager-version \
${${PN}-software-extras} \
"
SUMMARY:${PN}-debug-collector = "BMC debug collector"
RDEPENDS:${PN}-debug-collector = " \
- ${VIRTUAL-RUNTIME_obmc-dump-manager} \
- ${VIRTUAL-RUNTIME_obmc-dump-monitor} \
+ phosphor-debug-collector-manager \
+ phosphor-debug-collector-monitor \
phosphor-debug-collector-dreport \
phosphor-debug-collector-scripts \
"
@@ -175,7 +175,7 @@
SUMMARY:${PN}-network = "BMC Network Manager"
RDEPENDS:${PN}-network = " \
- ${VIRTUAL-RUNTIME_obmc-network-manager} \
+ phosphor-network \
"
SUMMARY:${PN}-telemetry = "Telemetry solution"
@@ -185,7 +185,7 @@
SUMMARY:${PN}-user-mgmt = "User management applications"
RDEPENDS:${PN}-user-mgmt = " \
- ${VIRTUAL-RUNTIME_obmc-user-mgmt} \
+ phosphor-user-manager \
"
RRECOMMENDS:${PN}-user-mgmt = " \
pam-plugin-access \
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
index 7331bdb..f0508fb 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
@@ -9,9 +9,6 @@
inherit meson pkgconfig
inherit obmc-phosphor-dbus-service
-RPROVIDES:${PN} += "virtual/obmc-watchdog"
-PROVIDES += "virtual/obmc-watchdog"
-
DEPENDS += "cli11"
DEPENDS += "sdbusplus"
DEPENDS += "sdeventplus"