diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2023-02-03 21:24:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2023-02-14 23:18:53 +0300 |
| commit | f7cd58e2bbf12eedd6a53f831938d60958c324bf (patch) | |
| tree | 05aede8e3167a991789e31cb6668c7ceb09728ae /meta-fii | |
| parent | 803dbec8750bce16996c049a4b4ccc06c269d8a3 (diff) | |
| download | openbmc-f7cd58e2bbf12eedd6a53f831938d60958c324bf.tar.xz | |
meta-phosphor: mapper cleanups
Mapper ships with systemd unit and dbus configuration files now, so
remove unnecessary bitbake classes.
Mapper is dbus-activated, so obmc-mapper.target dependencies are
redundant and no longer necessary.
obmc-mapper.target is the last target in obmc-targets, so remove that
recipe and any dependencies on it.
Change-Id: I59ff8dcd480b4449d0ef59422ba80c12848dade9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-fii')
5 files changed, 0 insertions, 9 deletions
diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service index 7868113954..314febea79 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service @@ -1,8 +1,6 @@ [Unit] Description=Phosphor Chassis%i State Manager Before=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Wants=obmc-mapper.target -After=obmc-mapper.target After=org.openbmc.control.Power@%i.service Wants=xyz.openbmc_project.Logging.service After=xyz.openbmc_project.Logging.service diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service index c1a233023e..e0211d89b8 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service @@ -4,8 +4,6 @@ Wants=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service After=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Wants=obmc-mapper.target -After=obmc-mapper.target After=phosphor-ipmi-host.service Before=obmc-host-reset@%i.target diff --git a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend index b3500b00c5..a759aaa6fa 100644 --- a/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -55,7 +55,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append:mori = " virtual-obmc-host-ipmi-hw" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-software-manager-download-mgr" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-software-manager-version" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-software-manager-updater" -OBMC_IMAGE_EXTRA_INSTALL:append:mori = " obmc-targets" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " mori-boot-status-led" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-led-manager" OBMC_IMAGE_EXTRA_INSTALL:append:mori = " phosphor-led-sysfs" diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service index 7868113954..314febea79 100644 --- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service +++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis@.service @@ -1,8 +1,6 @@ [Unit] Description=Phosphor Chassis%i State Manager Before=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Wants=obmc-mapper.target -After=obmc-mapper.target After=org.openbmc.control.Power@%i.service Wants=xyz.openbmc_project.Logging.service After=xyz.openbmc_project.Logging.service diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service index c1a233023e..e0211d89b8 100644 --- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service +++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Host@.service @@ -4,8 +4,6 @@ Wants=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service After=mapper-wait@-xyz-openbmc_project-control-host%i-auto_reboot.service Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Wants=obmc-mapper.target -After=obmc-mapper.target After=phosphor-ipmi-host.service Before=obmc-host-reset@%i.target |