| commit | 2a5d91ed4525a9ead072ca057fafb42cf4b00c09 | [log] [tgz] |
|---|---|---|
| author | Jayanth Othayoth <ojayanth@in.ibm.com> | Wed May 31 06:25:55 2017 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Jun 12 07:30:30 2017 +0000 |
| tree | ff083dde2048421a7da5c4b7e32acd3827fdbac9 | |
| parent | b9feb507913597eaf658e77d0528158078ba62ab [diff] |
Create a new package for the phosphor-dump-monitor. Change-Id: I7f61a48b31d2997c1710c7d0bdde387e5c41a598 Signed-off-by: Jayanth Othayoth <ojayanth@in.ibm.com>
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 8337c1d..56e80ee 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 @@ 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 @@ 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 \ +" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Dump.service" +FILES_${PN}-manager += "${sbindir}/phosphor-dump-manager" +FILES_${PN}-monitor += "${sbindir}/phosphor-dump-monitor" + +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 0000000..b6e75f1 --- /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 similarity index 100% rename from meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.service rename to meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index fae6077..a500bf3 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -89,7 +89,8 @@ " SUMMARY_${PN}-debug-collector = "BMC debug collector" RDEPENDS_${PN}-debug-collector = " \ - ${VIRTUAL-RUNTIME_obmc-debug-collector} \ + ${VIRTUAL-RUNTIME_obmc-dump-manager} \ + ${VIRTUAL-RUNTIME_obmc-dump-monitor} \ " SUMMARY_${PN}-settings = "Settings applications"