move state systemd files to phosphor-state-manager

The OpenBMC target and service systemd files have been moved to
phosphor-state-manager. This commit will move to those changes and
delete the files from meta-phosphor.

Bump Details:
phosphor-state-manager: srcrev bump 4640d48e99..c101157e5b

Andrew Geissler (3):
      move state manager service files into its repo
      ensure reboot service runs after host stopped
      move openbmc targets into this repo

Tested:
- Verified data files and services were all in expected location within
witherspoon QEMU run
- Verified openbmc systemd target were all in expected location within
witherspoon QEMU run
- HW CI will verify targets are still working as expected

(From meta-phosphor rev: 77cfb0f54a23c3efeba26100110e54055accd16d)

Change-Id: If5048f63d07ce45b4bc1f2303d1e87275324a818
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

35 files changed, 2 insertions, 318 deletions

diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb
index 4146dba5c5..2ab0c22c68 100644
--- a/meta-phosphor/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/recipes-core/systemd/obmc-targets.bb
@@ -5,86 +5,5 @@ PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-inherit obmc-phosphor-systemd
-inherit allarch
-
-# Chassis power synchronization targets
-# - start-pre:         Services to run before we start power on process
-# - start:             Services to run to do the chassis power on
-# - on:                Services to run once power is on
-# - stop-pre,stop,off: Same as above but applied to powering off
-# - reset-on:          Services to check if chassis power is on after bmc reset
-CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on"
-
-# Chassis action power targets
-# - on:  Services to run to power on the chassis
-# - off: Services to run to power off the chassis
-# - powered-off: Services to run once chassis power is off
-# - reset: Services to check chassis power state and update chassis "on" target
-# - hard-off: Services to force an immediate power off of the chassis
-CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff"
-
-# Track all host synchronization point targets
-# - start-pre:                 Services to run before we start host boot
-# - starting:                  Services to run to do the host boot
-# - started:                   Services to run once the host is booted
-# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host
-# - reset-running:             Services to check if host is running after bmc reset
-HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running"
-
-# Track all host action targets
-# - start:    Will run startmin target, this target used for any additional
-#             services that user needs for an initial power on of host.
-#             For example, resetting the host reboot count could be put in
-#             this target so on any fresh power on, this count is reset.
-# - startmin: Minimum services required to start the host. This target will
-#             be called by reboot and start target.
-# - stop:     Services to run to shutdown the host
-# - quiesce:  Target to enter on host boot failure
-# - shutdown: Tell host to shutdown, then stop system
-# - reset:   Services to check if host is running and update host "start" target
-# - crash:   Target to run when host crashes. it is very much similar to
-#            quiesce target but the only delta is that this target contains
-#            multiple services and one of them is the quiesce target.
-# - timeout: Target to run when host watchdog times out
-# - reboot:  Reboot the host
-HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout reboot"
-
-CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target"
-CHASSIS_ACTION_FMT = "obmc-chassis-{0}@.target"
-HOST_SYNCH_FMT = "obmc-host-{0}@.target"
-HOST_ACTION_FMT = "obmc-host-{0}@.target"
-
-CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target"
-CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-{0}@{1}.target"
-HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
-HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target"
-FAN_LINK_FMT = "obmc-fan-control-ready@.target:obmc-fan-control-ready@{0}.target"
-
-# Targets to be executed on checkstop and watchdog timeout
-HOST_ERROR_TARGETS = "crash timeout"
-
-QUIESCE_TMPL = "obmc-host-quiesce@.target"
-CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target"
-QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target"
-QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += " \
-        obmc-mapper.target \
-        obmc-fans-ready.target \
-        obmc-fan-control.target \
-        obmc-fan-control-ready@.target \
-        obmc-fan-watchdog-takeover.target \
-        "
-
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}"
+# TODO Will be removed once dependencies in other layers on this recipe are moved
+DEPENDS += "phosphor-state-manager"
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
deleted file mode 100644
index a033f6050c..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Chassis%i (Hard Power Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-Conflicts=obmc-host-shutdown@%i.target
-Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
deleted file mode 100644
index c043f37446..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Powered Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
deleted file mode 100644
index 69209e64ac..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Power Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
deleted file mode 100644
index cd7c2fc496..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Chassis%i (Power On)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
deleted file mode 100644
index 03036f3013..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Chassis%i (Reset Check)
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
deleted file mode 100644
index e041a55080..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control Ready
-RefuseManualStop=yes
-Conflicts=obmc-chassis-powered-off@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
deleted file mode 100644
index 50665db4a8..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-control.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
deleted file mode 100644
index 8034083345..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
+++ /dev/null
@@ -1,6 +0,0 @@
-#The system implementation should start this target when dynamic fan control
-#is no longer desired or possible.  It should also add units to this target
-#that enabled continued operation after dynamic fan control is no longer
-#desired or possible.
-[Unit]
-Description=Fan watchdog takeover target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
deleted file mode 100644
index 59e61c626a..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fans Ready
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
deleted file mode 100644
index ea3798b522..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i crashed
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
deleted file mode 100644
index 900995b9f0..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Quiesce Target
-Wants=multi-user.target
-After=multi-user.target
-RefuseManualStop=yes
-Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
deleted file mode 100644
index 8e749e6e1a..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Reboot Host%i
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
deleted file mode 100644
index 94bb2b130d..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Host%i running after reset
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
deleted file mode 100644
index 84d8701635..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Reset Check)
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
deleted file mode 100644
index 012d364a16..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Power%i Host Off
-Wants=multi-user.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
deleted file mode 100644
index fe55146180..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Start Host%i (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
deleted file mode 100644
index ff1486b913..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Start Host%i
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
deleted file mode 100644
index fcd51be892..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Started)
-Wants=multi-user.target
-After=obmc-host-starting@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
deleted file mode 100644
index 52e7bea839..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Starting)
-Wants=multi-user.target
-After=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
deleted file mode 100644
index 88ccb2595f..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Start Host%i Minimum
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
deleted file mode 100644
index 9fc3296b19..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Stop Host%i (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Before=obmc-host-stopping@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
deleted file mode 100644
index 496fd5b3f6..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Stop Host%i
-Wants=multi-user.target
-After=multi-user.target
-After=obmc-chassis-poweroff@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
deleted file mode 100644
index c9689790bd..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Host%i (Stopped)
-Wants=multi-user.target
-Wants=obmc-host-stopping@%i.target
-After=obmc-host-stopping@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
deleted file mode 100644
index 41c4b7f95a..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Host%i (Stopping)
-Wants=multi-user.target
-Wants=obmc-host-stop-pre@%i.target
-After=obmc-host-stop-pre@%i.target
-Before=obmc-host-stopped@%i.target
-Conflicts=obmc-host-startmin@%i.target
-Conflicts=obmc-host-starting@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
deleted file mode 100644
index b87507bf10..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i timed out refreshing Watchdog
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
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-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
deleted file mode 100644
index 7fda29b1e7..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (Off)
-Wants=multi-user.target
-After=obmc-power-stop@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
deleted file mode 100644
index b55d90907d..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (On)
-Wants=multi-user.target
-After=obmc-power-start@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
deleted file mode 100644
index d24d401bfa..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Chassis%i power on after reset
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
deleted file mode 100644
index 2b5fdbbd75..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
deleted file mode 100644
index 720548e2d5..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On
-After=obmc-power-start-pre@%i.target
-Wants=multi-user.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
deleted file mode 100644
index 5460914b29..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Wants=obmc-host-stopped@%i.target
-After=obmc-host-stopped@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
deleted file mode 100644
index fc22eb1f34..0000000000
--- a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off
-Wants=obmc-power-stop-pre@%i.target
-After=obmc-power-stop-pre@%i.target
-Wants=multi-user.target
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=fsi-disable.service
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
index a813a45578..de1aa2e1d7 100644
--- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend
@@ -8,7 +8,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://default.network"
 SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch"
 
-RRECOMMENDS_${PN} += "obmc-targets"
 FILES_${PN} += "${systemd_unitdir}/network/default.network"
 
 do_install_append() {