diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-10-20 03:22:56 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-10-20 03:22:56 +0300 |
commit | bb86d0b5393a02f18239f99607bce9afe8fb1a80 (patch) | |
tree | f1ac889ee95cc23e8e40805e5c6213267a769840 /meta-phosphor/common | |
parent | 57b69a0c8ddf0212dd782a659f1d4afb526e9250 (diff) | |
parent | 9ec4c2558e6a2fc7e9a451f91ce2fd5480858a00 (diff) | |
download | openbmc-bb86d0b5393a02f18239f99607bce9afe8fb1a80.tar.xz |
Merge pull request #21 from bradbishop/master
Add IPMI to build
Diffstat (limited to 'meta-phosphor/common')
16 files changed, 97 insertions, 5 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb new file mode 100644 index 000000000..830f75436 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt.bb @@ -0,0 +1,17 @@ +SUMMARY = "Phosphor OpenBMC BT to DBUS" +DESCRIPTION = "Phosphor OpenBMC BT to DBUS." +PR = "r1" + +RDEPENDS_${PN} += "python-subprocess" + +SYSTEMD_SERVICE_${PN} = "host-ipmi-bt.service" + +inherit obmc-phosphor-pydbus-service +inherit obmc-phosphor-host-ipmi-hw + +S = "${WORKDIR}/git" +SRC_URI += "git://github.com/openbmc/skeleton.git;subpath=bin;destsuffix=git" +SRCREV="${AUTOREV}" + +SCRIPT_NAME = "ipmid.py" +INSTALL_NAME = "host-ipmi-bt" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service new file mode 100644 index 000000000..dfc0416e9 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-bt/host-ipmi-bt.service @@ -0,0 +1,8 @@ +[Unit] +Description=Phosphor OpenBMC BT to DBUS + +[Service] +ExecStart=/usr/sbin/host-ipmi-bt + +[Install] +WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb new file mode 100644 index 000000000..c979110f8 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phosphor OpenBMC host IPMI to DBUS Example" +DESCRIPTION = "Phosphor OpenBMC host IPMI to DBUS example implementation." +PR = "r1" + +RDEPENDS_${PN} += "python-subprocess" + +SYSTEMD_SERVICE_${PN} = "host-ipmi-hw.service" + +inherit obmc-phosphor-pydbus-service +inherit obmc-phosphor-host-ipmi-hw + +S = "${WORKDIR}/git" +SRC_URI += "git://github.com/openbmc/skeleton.git;subpath=bin;destsuffix=git" +SRC_URI += "file://systembus.patch" +SRCREV="${AUTOREV}" + +SCRIPT_NAME = "ipmi_debug.py" +INSTALL_NAME = "host-ipmi-hw" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service new file mode 100644 index 000000000..b6baa6ffd --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/host-ipmi-hw-example.service @@ -0,0 +1,8 @@ +[Unit] +Description=Phosphor OpenBMC host IPMI to DBUS example implementation + +[Service] +ExecStart=/usr/sbin/host-ipmi-hw + +[Install] +WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/systembus.patch b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/systembus.patch new file mode 100644 index 000000000..402816a01 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example/systembus.patch @@ -0,0 +1,11 @@ +--- a/ipmi_debug.py ++++ b/ipmi_debug.py +@@ -69,7 +69,7 @@ class ConsoleReader(object): + + def main(): + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) +- bus = dbus.SessionBus() ++ bus = dbus.SystemBus() + name = dbus.service.BusName(DBUS_NAME, bus) + obj = IpmiDebug(bus, OBJ_NAME) + mainloop = gobject.MainLoop() diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index 5e7ad6408..ab3a1cb8c 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -3,19 +3,20 @@ DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries" HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" PR = "r1" +RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw" + inherit obmc-phosphor-license inherit obmc-phosphor-sdbus-service +inherit obmc-phosphor-c-daemon SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" SRCREV = "98900a99254cd177c8308b63c341f793d2ac119d" S = "${WORKDIR}/git" +INSTALL_NAME = "ipmid" do_install() { - install -m 0755 -d ${D}${sbindir} - install -m 0755 ${S}/ipmid ${D}${sbindir}/ - install -m 0755 -d ${D}${libdir}/host-ipmid install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/ diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/files/host-ipmid.service b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service index 0636f12d2..ee9ce1ad1 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/files/host-ipmid.service +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid/host-ipmid.service @@ -1,5 +1,5 @@ [Unit] -Description="Phosphor OpenBMC IPMI daemon" +Description=Phosphor OpenBMC IPMI daemon [Service] ExecStart=/usr/sbin/ipmid diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb index ad642a331..d7a8ed998 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-chassis-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" 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 index 998648c40..b5a54da3f 100644 --- 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 @@ -4,3 +4,6 @@ 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/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb index c140c9be6..1446a7313 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb @@ -11,8 +11,10 @@ inherit obmc-phosphor-pydbus-service client = "pyclient-sample" SRC_URI += "file://${client}.py" +SRC_URI += "file://${PN}.py" +S = "${WORKDIR}" do_install_append() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${client}.py ${D}${bindir}/${client} + install -m 0755 ${S}/${client}.py ${D}${bindir}/${client} } diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb index 89fbdb1be..f1a9eb962 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb @@ -7,5 +7,9 @@ DBUS_SERVICES = " \ org.openbmc.examples.SDBusService1 \ " +S = "${WORKDIR}" +SRC_URI += "file://Makefile \ + file://obmc-phosphor-example-sdbus.c \ + " inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-c-daemon diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb index 79e2e6c88..8c937c6ed 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb @@ -5,3 +5,8 @@ PR = "r1" inherit obmc-phosphor-fan-mgmt inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-c-daemon + +S = "${WORKDIR}" +SRC_URI += "file://Makefile \ + file://obmc-phosphor-fand.c \ + " diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb index bd4b1af1f..6e4c04a25 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-flash-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb index 664760e12..05471d52f 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-policy-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb index fc646a52f..7a82fb5bc 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-sensor-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb index 3dc9a64e3..bcb5d32ad 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-system-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" |