Merge pull request #17 from williamspatrick/host_ipmid_update
Refresh host-ipmid and install headers
diff --git a/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
index 8a9853c..bc190d4 100644
--- a/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-sdbus-service.bbclass
@@ -6,4 +6,3 @@
RDEPENDS_${PN} += "libsystemd"
inherit obmc-phosphor-dbus-service
-inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
index 7bd2d9d..12e0bc1 100644
--- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass
@@ -2,13 +2,13 @@
inherit systemd
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
SRC_URI += " \
- file://${PN}.service \
+ file://${BPN}.service \
"
do_install_append() {
# install systemd unit files
install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system
}
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 9741e61..5e7ad64 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -4,17 +4,21 @@
PR = "r1"
inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
+inherit obmc-phosphor-sdbus-service
-DEPENDS += "glib-2.0"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "02d37aab090090af9a779f4039931a6721bff615"
+SRCREV = "98900a99254cd177c8308b63c341f793d2ac119d"
S = "${WORKDIR}/git"
do_install() {
- install -m 0755 -d ${D}${sbindir} ${D}${libdir} ${D}${libdir}/host-ipmid/
+ install -m 0755 -d ${D}${sbindir}
install -m 0755 ${S}/ipmid ${D}${sbindir}/
- install -m 0755 ${S}/libapphandler.so ${D}${libdir}/host-ipmid/
+
+ install -m 0755 -d ${D}${libdir}/host-ipmid
+ install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
+
+ install -m 0755 -d ${D}${includedir}/host-ipmid
+ install -m 0644 ${S}/ipmid-api.h ${D}${includedir}/host-ipmid/
}
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 3735007..89fbdb1 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
@@ -8,3 +8,4 @@
"
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 13c4b70..79e2e6c 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
@@ -4,3 +4,4 @@
inherit obmc-phosphor-fan-mgmt
inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
index e2b4719..e7e31cf 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -7,8 +7,6 @@
inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-
RDEPENDS_${PN} += " \
python-netserver \
python-json \