Recipe updates
Bump:
- host-ipmid
- host-ipmid-fru
- skeleton
- pyphosphor
- obmc-mapper
Enable libmapper in obmc-mapper.
Change-Id: I73a3a363821db80cc1883c431a7aff0f90717e58
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/common/recipes-phosphor/dbus/obmc-mapper.bb b/common/recipes-phosphor/dbus/obmc-mapper.bb
index 12e5474..1e887c4 100644
--- a/common/recipes-phosphor/dbus/obmc-mapper.bb
+++ b/common/recipes-phosphor/dbus/obmc-mapper.bb
@@ -5,7 +5,6 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-inherit allarch
inherit obmc-phosphor-dbus-service
inherit obmc-phosphor-systemd
inherit setuptools
@@ -18,6 +17,21 @@
"
SRC_URI += "git://github.com/openbmc/phosphor-objmgr"
-SRCREV = "067db7287a647789e7d5d5dbccc514c5c835a944"
+SRCREV = "22ff24a6e668d00557ef6465f96d664fe33226f3"
S = "${WORKDIR}/git"
+
+do_compile_append() {
+ oe_runmake -C libmapper
+}
+
+do_install_append() {
+ oe_runmake -C libmapper install DESTDIR=${D}
+}
+
+python populate_packages_prepend () {
+ mapperlibdir = d.getVar("libdir", True)
+ do_split_packages(d, mapperlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Phosphor mapper %s library', extra_depends='', allow_links=True)
+}
+PACKAGES_DYNAMIC += "^libmapper.*"
+FILES_${PN}_remove = "${libdir}/lib*.so.* ${libdir}/*"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
index 3ed0d7a..dc233e7 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -18,7 +18,7 @@
SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
-SRCREV = "a26ed7375261ebcfffa68cf478bcb8f2204c6c92"
+SRCREV = "de6a37983420f5067327b46bbfbefa3601c449aa"
FILES_SOLIBSDEV += "${libdir}/host-ipmid/lib*${SOLIBSDEV}"
FILES_${PN} += "${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index a891df6..97eca5e 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -14,12 +14,14 @@
TARGET_CFLAGS += "-fpic"
+DEPENDS += "obmc-mapper"
RDEPENDS_${PN} += "clear-once"
RDEPENDS_${PN} += "settings"
RDEPENDS_${PN} += "network"
+RDEPENDS_${PN} += "libmapper"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "87e080b537aff3fd22ec56ef72660937bed38422"
+SRCREV = "3551868f8b46bec8711887c72b26f4c628d1600f"
S = "${WORKDIR}/git"
INSTALL_NAME = "ipmid"
diff --git a/common/recipes-phosphor/skeleton/pyphosphor.bb b/common/recipes-phosphor/skeleton/pyphosphor.bb
index fedc6e6..9faab78 100644
--- a/common/recipes-phosphor/skeleton/pyphosphor.bb
+++ b/common/recipes-phosphor/skeleton/pyphosphor.bb
@@ -10,6 +10,6 @@
SRC_URI += "git://github.com/openbmc/pyphosphor"
-SRCREV = "1cc1e46792cc0f6daba3a8eb460dd2cb8907ab72"
+SRCREV = "9df742072de4ead29e821914427956acc2ff5618"
S = "${WORKDIR}/git"