summaryrefslogtreecommitdiff
path: root/meta-quanta
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2022-10-13 00:45:15 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-10-13 13:52:03 +0300
commit5747dac992f537995d2cf2e15d036c558ef7e32e (patch)
treede5f92973de58ba6c4f6acda7fec541b6e59bc11 /meta-quanta
parent88d7d8b1121642fe82e28ec9f8de865e6838512b (diff)
downloadopenbmc-5747dac992f537995d2cf2e15d036c558ef7e32e.tar.xz
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
Diffstat (limited to 'meta-quanta')
-rw-r--r--meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend8
-rw-r--r--meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend6
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 5053901464..533e73f48a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -19,7 +19,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " openssl-bin"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ipmi-blobs-binarystore"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-virtual-sensor"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " acpi-power-state-daemon"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/obmc-gpio-presence"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-gpio-monitor-presence"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ipmitool"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-health-monitor"
@@ -31,9 +31,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " bmcweb"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-certificate-manager"
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-user-manager"
# Required for LEDs. Part of obmc-leds
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-sysfs"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-led-manager-faultmonitor"
# Required for the front port. Part of obmc-console
OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-console"
# Required from packagegroup-gbs-apps
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 655929695e..af1dde1ad1 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -9,6 +9,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-ipmi-host"
OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-hwmon"
OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-inventory-manager"
OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-host-postd"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-manager}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}"
-OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-led-monitor}"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-manager"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-sysfs"
+OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-led-manager-faultmonitor"