diff options
20 files changed, 4 insertions, 93 deletions
diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service index d491fd9c6e..735d113e16 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere-bmc-heartbeat.service @@ -1,7 +1,5 @@ [Unit] Description=Ampere BMC heartbeat service -Wants=obmc-mapper.target -After=obmc-mapper.target [Service] Type=simple diff --git a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service index 18def6d2cb..566f81c6d8 100644 --- a/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service +++ b/meta-facebook/recipes-phosphor/state/phosphor-state-manager/greatlakes/power-ctrl-init.service @@ -1,7 +1,5 @@ [Unit] Description=Power Control Initialization -Wants=obmc-mapper.target -After=obmc-mapper.target Wants=xyz.openbmc_project.Logging.service After=xyz.openbmc_project.Logging.service Before=mapper-wait@-xyz.openbmc_project.State.Chassis@0.service 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 diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb deleted file mode 100644 index d1725995ec..0000000000 --- a/meta-phosphor/recipes-core/systemd/obmc-targets.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Phosphor Systemd targets" -DESCRIPTION = "Provides well known Systemd synchronization points for OpenBMC." -HOMEPAGE = "http://github.com/openbmc" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PR = "r1" - -SRC_URI += "\ - file://obmc-mapper.target \ -" - -SYSTEMD_SERVICE:${PN} += " \ - obmc-mapper.target \ -" - -inherit allarch obmc-phosphor-systemd diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target deleted file mode 100644 index 5e52f4cd53..0000000000 --- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Phosphor Object Mapper -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service index b9d93608be..ca185def4d 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service @@ -1,6 +1,5 @@ [Unit] Description=Phosphor DBus Monitor -After=obmc-mapper.target [Service] Restart=always diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-subtree-remove@.service deleted file mode 100644 index 835c947bbe..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-subtree-remove@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mapper subtree-remove %I -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -Type=oneshot -RemainAfterExit=no -Restart=on-failure -TimeoutStartSec=infinity -ExecStart=/usr/bin/mapper subtree-remove %I diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-wait@.service deleted file mode 100644 index 06e2e46509..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-wait@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Wait for %I -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -Type=oneshot -RemainAfterExit=yes -Restart=on-failure -TimeoutStartSec=infinity -ExecStart=/usr/bin/mapper wait %I diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.conf b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.conf deleted file mode 100644 index 3d9fcc3271..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.conf +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy user="root"> - <allow own="xyz.openbmc_project.ObjectMapper"/> - <allow send_destination="xyz.openbmc_project.ObjectMapper"/> - </policy> -</busconfig> diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service deleted file mode 100644 index f00c6fad5e..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phosphor DBus Service Discovery Manager -Before=obmc-mapper.target -After=dbus.service - -[Service] -Restart=always -Type=dbus -ExecStart=/usr/bin/mapperx -BusName={BUSNAME} -TimeoutStartSec=300 -RestartSec=5 - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb index 63b0815131..26d5adb35b 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -9,7 +9,7 @@ DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "cli11" -SRCREV = "58881d0b563ad6ea9e3d1c3fcb84496f41205f01" +SRCREV = "a99e109c5846d55b6df31c19410642b3520a17c8" PV = "1.0+git${SRCPV}" PR = "r1" @@ -18,17 +18,15 @@ SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=http SYSTEMD_SERVICE:${PN} += " \ mapper-wait@.service \ mapper-subtree-remove@.service \ + xyz.openbmc_project.ObjectMapper.service \ " S = "${WORKDIR}/git" -inherit meson pkgconfig -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd +inherit meson pkgconfig systemd EXTRA_OEMESON += "-Dtests=disabled" PROVIDES += "libmapper" PACKAGE_BEFORE_PN += "libmapper" FILES:libmapper = "${libdir}/lib*.so*" - -DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" +FILES:${PN} += "${datadir}/dbus-1" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service index 5e361a38c6..8e852a4f8d 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service @@ -1,8 +1,6 @@ [Unit] Description=Phosphor LED Group Management Daemon Before=mapper-wait@-xyz-openbmc_project-led-groups.service -Wants=obmc-mapper.target -After=obmc-mapper.target [Service] Restart=always diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service index 6b7ffcd1da..6fbf269d70 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service @@ -1,6 +1,5 @@ [Unit] Description=Phosphor SNMP conf Manager -After=obmc-mapper.target [Service] ExecStart=/usr/bin/env phosphor-network-snmpconf diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 5ba261bd0e..07049a49fc 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -37,7 +37,6 @@ SUMMARY:${PN}-bmc-state-mgmt = "BMC state management" RDEPENDS:${PN}-bmc-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-bmc-state-manager} \ phosphor-state-manager-systemd-target-monitor \ - obmc-targets \ " SUMMARY:${PN}-bmcweb = "bmcweb support" 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 533e73f48a..4a394a4d00 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 @@ -42,5 +42,3 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " x86-power-control" OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-pid-control" # Required for phosphor-ipmi-kcs OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual-obmc-host-ipmi-hw" -# Required for some services, such as phosphor-virtual-sensors -OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-targets" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/phosphor-virtual-sensor.service.replace b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/phosphor-virtual-sensor.service.replace index 8e7153fe41..85b9fb5eb6 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/phosphor-virtual-sensor.service.replace +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/phosphor-virtual-sensor.service.replace @@ -1,7 +1,5 @@ [Unit] Description=Virtual sensors -Wants=obmc-mapper.target -After=obmc-mapper.target After=mapper-wait@-xyz-openbmc_project-sensors-temperature-inlet.service After=mapper-wait@-xyz-openbmc_project-sensors-temperature-outlet_0.service After=mapper-wait@-xyz-openbmc_project-sensors-temperature-outlet_1.service |