Merge pull request #64 from causten/candidate3
stop the build break for btbridge on qemu
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 820b0eb..48edd92 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -20,6 +20,7 @@
"
VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \
host-ipmid-oem \
+ host-ipmid-fru \
"
PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged"
PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton"
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
new file mode 100644
index 0000000..a4dcfab
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Phosphor OpenBMC WriteFRU for OpenPOWER systems"
+DESCRIPTION = "Phosphor OpenBMC WriteFRU for OpenPOWER based systems"
+HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
+PR = "r1"
+
+RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+
+inherit obmc-phosphor-license
+
+DEPENDS += "systemd \
+ host-ipmid \
+ "
+
+
+RDEPENDS_${PN} += "libsystemd"
+
+TARGET_CFLAGS += "-std=gnu++14"
+
+SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
+
+SRCREV = "675272789d4dba9a8c308f3cb1f7deb8b5b2ec41"
+
+FILES_${PN} += "${libdir}/host-ipmid/*.so"
+FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+ 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/rest-dbus/files/makefile.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/makefile.patch
deleted file mode 100644
index 96a82c1..0000000
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..3d79547
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,18 @@
-+PACKAGE=rest-dbus
-+
-+prefix?=/usr/local
-+bin=$(prefix)/usr/bin
-+share=$(prefix)/usr/share/$(PACKAGE)
-+
-+build clean all:
-+
-+install:
-+ @install -d $(bin) $(share)/resources $(srv)
-+ @install -m 755 $(PACKAGE) $(bin)
-+ @for f in resources/*; do \
-+ install -m644 $$f $(share)/resources; \
-+ done
-+
-+uninstall:
-+ @rm -f $(bin)/$(PACKAGE)
-+ @rm -rf $(share)
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch
deleted file mode 100644
index d68a037..0000000
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/rest-dbus
-===================================================================
---- git.orig/rest-dbus
-+++ git/rest-dbus
-@@ -8,7 +8,6 @@ import os
- from xml.etree import ElementTree
-
- busses = {
-- 'session': dbus.SessionBus,
- 'system': dbus.SystemBus,
- }
-
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch
deleted file mode 100644
index dee4404..0000000
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/rest-dbus b/rest-dbus
-index 56ec1f9..078b1cf 100755
---- a/rest-dbus
-+++ b/rest-dbus
-@@ -40,7 +40,7 @@ class DBusRestResourceResponse(DBusRestResponse):
- 'png': 'image/png',
- 'gif': 'image/gif',
- }
-- resource_base = 'resources'
-+ resource_base = '/usr/share/rest-dbus/resources'
-
- def __init__(self, name):
- (_, ext) = os.path.splitext(name)
diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
index 686cf69..b6f9b97 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -2,7 +2,7 @@
Description=DBUS introspecting REST server.
[Service]
-ExecStart=/usr/bin/rest-dbus
+ExecStart=/usr/sbin/rest-dbus
[Install]
WantedBy=multi-user.target
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 e7e31cf..fa551f5 100644
--- a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb
@@ -6,24 +6,21 @@
inherit allarch
inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
+inherit setuptools
RDEPENDS_${PN} += " \
python-netserver \
python-json \
python-dbus \
python-xml \
+ obmc-mapper \
"
+
SRC_URI += " \
git://github.com/openbmc/rest-dbus.git \
- file://makefile.patch \
- file://resources-path.patch \
- file://no-session-bus.patch \
+ file://rest-dbus.service \
"
-SRCREV = "9b0e0bab5150ccc4333ce442932f8969f365155e"
+SRCREV = "b10a57e2f34e94b13697328cc22f876f738feb0e"
S = "${WORKDIR}/git"
-
-do_install() {
- oe_runmake prefix=${D} install
-}
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
index 9547f30..19ef6bc 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -16,7 +16,7 @@
RDEPENDS_${PN} += "python-subprocess python-tftpy"
SRC_URI += "git://github.com/openbmc/skeleton"
-SRCREV = "597d49e68e8bf0ddedb2e01cbd3fb500ee1c22e3"
+SRCREV = "31e38ab580a2e4f5d52089a7de5c474e5c76dbaf"
S = "${WORKDIR}"
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
index e71b85f..acbfee6 100644
--- a/meta-phosphor/conf/machine/include/sample.inc
+++ b/meta-phosphor/conf/machine/include/sample.inc
@@ -19,6 +19,7 @@
"
VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \
host-ipmid-oem \
+ host-ipmid-fru \
"
PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-hw-example"
PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd"