3 files changed, 35 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb
index 8337c1dd2..56e80ee7d 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb
+++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb
@@ -6,6 +6,19 @@ based systems."
 
 PR = "r1"
 
+DEBUG_COLLECTOR_PKGS = " \
+    ${PN}-manager \
+    ${PN}-monitor \
+"
+PACKAGES =+ "${DEBUG_COLLECTOR_PKGS}"
+PACKAGES_remove = "${PN}"
+RDEPENDS_${PN}-dev = "${DEBUG_COLLECTOR_PKGS}"
+RDEPENDS_${PN}-staticdev = "${DEBUG_COLLECTOR_PKGS}"
+
+DBUS_PACKAGES = "${PN}-manager"
+
+SYSTEMD_PACKAGES = "${PN}-monitor"
+
 inherit autotools \
         pkgconfig \
         obmc-phosphor-dbus-service \
@@ -20,14 +33,23 @@ DEPENDS += " \
         sdbusplus \
         sdbusplus-native \
         autoconf-archive-native \
-        "
+"
 
-RDEPENDS_${PN} += " \
+RDEPENDS_${PN}-manager += " \
         sdbusplus \
         phosphor-dbus-interfaces \
         phosphor-logging \
-        "
+"
+RDEPENDS_${PN}-monitor += " \
+        sdbusplus \
+        phosphor-dbus-interfaces \
+        phosphor-logging \
+"
+
+FILES_${PN}-manager += "${sbindir}/phosphor-dump-manager"
+FILES_${PN}-monitor += "${sbindir}/phosphor-dump-monitor"
 
-DBUS_SERVICE_${PN} += "xyz.openbmc_project.Dump.service"
+DBUS_SERVICE_${PN}-manager += "xyz.openbmc_project.Dump.Manager.service"
+SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
new file mode 100644
index 000000000..b6e75f179
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Phosphor Dump core monitor.
+
+[Service]
+ExecStart={sbindir}/phosphor-dump-monitor
+Restart=always
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
index 9aeba9322..9aeba9322 100644
--- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.service
+++ b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service