diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2022-10-13 00:45:15 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-13 13:52:03 +0300 |
| commit | 5747dac992f537995d2cf2e15d036c558ef7e32e (patch) | |
| tree | de5f92973de58ba6c4f6acda7fec541b6e59bc11 /meta-ibm | |
| parent | 88d7d8b1121642fe82e28ec9f8de865e6838512b (diff) | |
| download | openbmc-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-ibm')
6 files changed, 10 insertions, 10 deletions
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index a7bebeb1cd..e9535ae88b 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -DEPENDS += "virtual/obmc-gpio-monitor" -RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" +DEPENDS += "phosphor-gpio-monitor" +RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor" S = "${WORKDIR}" SRC_URI += "file://toggle_identify_led.sh" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index 8f99b24e32..3e5f87ab6d 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor" RDEPENDS:${PN} += "busybox" RESET_SERVICE = "reset-fan-watchdog.service" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 3e53f9d084..5e83fab183 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -DEPENDS += "virtual/obmc-gpio-monitor" -RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" +DEPENDS += "phosphor-gpio-monitor" +RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor" S = "${WORKDIR}" SRC_URI += "file://toggle_identify_led.sh" diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 880532190b..64d1cf206b 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:mihawk = " acx22-yaml-config" 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 \ diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 51c5f40025..56ee3938f6 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -24,9 +24,9 @@ EXTRA_IBM_LOGGING_PKGS:p10bmc = " \ python3-sbe-log-parsers \ " -RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" -RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" -RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" +RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type phosphor-gpio-monitor-presence" +RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence" +RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence id-button phosphor-cooling-type" RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog" RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor" RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 74bb9a0c5e..86166a2c6f 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" +RDEPENDS:${PN} += "phosphor-gpio-monitor-monitor" SYNC_SERVICE = "power-supply-sync.service" TGTFMT = "obmc-chassis-poweron@0.target" |