diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2017-06-02 21:37:43 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-03 20:45:28 +0300 |
commit | bf2377832fc309dd27de6e4ccb95bd78fde7722c (patch) | |
tree | de07aa82f316d81e78274e66540341e922731ecd | |
parent | 130cdf1a4a8112fd826116c50350e28d0b296170 (diff) | |
download | openbmc-bf2377832fc309dd27de6e4ccb95bd78fde7722c.tar.xz |
Remove the org.openbmc.records.events service
The records.events implementation has been replaced with
xyz.openbmc_project.Logging
Closes: openbmc/openbmc#1313
Change-Id: Ie2cc3dc48763301989de63214c37edb601290c91
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
7 files changed, 0 insertions, 50 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index d6d91ffaa..cfb64bd1d 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -5,7 +5,6 @@ # - obmc-bmc-state-mgmt - OpenBMC BMC state management # - obmc-chassis-mgmt - OpenBMC chassis management # - obmc-chassis-state-mgmt - OpenBMC chassis state management -# - obmc-event-mgmt - OpenBMC event management # - obmc-fan-control - OpenBMC fan management # - obmc-fan-mgmt - Deprecated - use obmc-fan-control instead # - obmc-flash-mgmt - OpenBMC flash management @@ -34,7 +33,6 @@ SDK_OLDEST_KERNEL = "2.6.32" FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "packagegroup-obmc-apps-bmc-state-mgmt" FEATURE_PACKAGES_obmc-chassis-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-chassis-mgmt', 'virtual-obmc-chassis-mgmt')}" FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "packagegroup-obmc-apps-chassis-state-mgmt" -FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt')}" FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control" FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt')}" FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled(d, 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt')}" @@ -58,7 +56,6 @@ IMAGE_FEATURES += " \ obmc-bmc-state-mgmt \ obmc-chassis-mgmt \ obmc-chassis-state-mgmt \ - obmc-event-mgmt \ obmc-fan-control \ obmc-fan-mgmt \ obmc-flash-mgmt \ diff --git a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event.bb deleted file mode 100644 index 5a436b3a6..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Event Management" -DESCRIPTION = "Phosphor OpenBMC event management reference implementation." -HOMEPAGE = "https://github.com/openbmc/phosphor-event" -PR = "r1" - -inherit autotools pkgconfig -inherit obmc-phosphor-license -inherit obmc-phosphor-dbus-service - -DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" -PROVIDES += "virtual/obmc-event-mgmt" -RPROVIDES_${PN} += "virtual-obmc-event-mgmt" - -SRC_URI += "git://github.com/openbmc/phosphor-event" -SRCREV = "74c0963269a6828c42d282b97bffa1afafc1b7d0" - -DBUS_SERVICE_${PN} = "org.openbmc.records.events.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/eventd/eventd.conf" - -S = "${WORKDIR}/git" - -do_install_append() { - install -d ${D}/var/lib/obmc/events/ -} diff --git a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/eventd.conf b/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/eventd.conf deleted file mode 100644 index b50dfbcea..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/eventd.conf +++ /dev/null @@ -1,4 +0,0 @@ -LOG_SIZE_LIMIT="197376" -LOG_COUNT_LIMIT="128" - -OPTIONS="-s ${LOG_SIZE_LIMIT} -t ${LOG_COUNT_LIMIT}" diff --git a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/obmc/eventd/eventd.conf b/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/obmc/eventd/eventd.conf deleted file mode 100644 index b50dfbcea..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/obmc/eventd/eventd.conf +++ /dev/null @@ -1,4 +0,0 @@ -LOG_SIZE_LIMIT="197376" -LOG_COUNT_LIMIT="128" - -OPTIONS="-s ${LOG_SIZE_LIMIT} -t ${LOG_COUNT_LIMIT}" diff --git a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/org.openbmc.records.events.service b/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/org.openbmc.records.events.service deleted file mode 100644 index 2af01363b..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/obmc-phosphor-event/org.openbmc.records.events.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Event Manager - -[Service] -EnvironmentFile={envfiledir}/obmc/eventd/eventd.conf -Restart=always -ExecStart={sbindir}/phosphor-eventd $OPTIONS -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 80a5c8871..d512e7dbe 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -9,7 +9,6 @@ OBMC_RESET_BUTTON_INSTANCES ?= "0" OBMC_WATCHDOG_INSTANCES ?= "0" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd" -PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example" diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index abea01e4c..b5c7dd8a6 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -23,7 +23,6 @@ DISTRO_FEATURES = "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ - obmc-phosphor-event-mgmt \ obmc-phosphor-user-mgmt \ obmc-settings-mgmt \ obmc-phosphor-system-mgmt \ |