diff options
-rw-r--r-- | meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc | 3 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service (renamed from meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.service) | 0 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.py | 29 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb | 26 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb | 9 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb | 1 |
6 files changed, 28 insertions, 40 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index b8f40e261..d7828c009 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -3,6 +3,7 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-sensor-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-event-mgmt \ " VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \ @@ -20,7 +21,7 @@ VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \ PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged" PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton" -PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "skeleton" +PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event" PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "skeleton" PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "skeleton" PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "skeleton" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.service b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service index 8e0266bf4..8e0266bf4 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.service +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-event.service diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.py b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.py deleted file mode 100644 index ed4506806..000000000 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/files/obmc-phosphor-eventd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-eventd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb new file mode 100644 index 000000000..2036ad8fe --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb @@ -0,0 +1,26 @@ +SUMMARY = "Phosphor OpenBMC Event Management" +DESCRIPTION = "Phosphor OpenBMC event management reference implementation." +HOMEPAGE = "https://github.com/causten/openbmc-eventd" +PR = "r1" + + +inherit obmc-phosphor-license +inherit obmc-phosphor-event-mgmt +inherit obmc-phosphor-sdbus-service +inherit obmc-phosphor-c-daemon + +SRC_URI += "git://github.com/causten/openbmc-eventd" + +SRCREV = "417f69b7839034543405f1bb70a73cc701a1b3a5" + +RDEPENDS_${PN} += "libsystemd" +DEPENDS += "systemd" + + +S = "${WORKDIR}/git" +INSTALL_NAME = "event_messaged" + +do_install() { + install -m 0755 -d ${D}${sbindir} + install -m 0755 ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-eventd +} diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb deleted file mode 100644 index b5a54da3f..000000000 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Event Management" -DESCRIPTION = "Phosphor OpenBMC event management reference implementation." -PR = "r1" - -inherit obmc-phosphor-event-mgmt -inherit obmc-phosphor-pydbus-service - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index 572030c53..9547f30ab 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -6,7 +6,6 @@ PR = "r1" inherit obmc-phosphor-license inherit obmc-phosphor-systemd inherit obmc-phosphor-chassis-mgmt -inherit obmc-phosphor-event-mgmt inherit obmc-phosphor-fan-mgmt inherit obmc-phosphor-flash-mgmt inherit obmc-phosphor-policy-mgmt |