meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.8.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.10.bb
similarity index 84%
rename from poky/meta/recipes-extended/libsolv/libsolv_0.7.8.bb
rename to poky/meta/recipes-extended/libsolv/libsolv_0.7.10.bb
index 8fe9ae0..265a27c 100644
--- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.8.bb
+++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.10.bb
@@ -10,7 +10,7 @@
SRC_URI = "git://github.com/openSUSE/libsolv.git \
"
-SRCREV = "5205c5683ce2c8b8288534059ba40a318a2a161d"
+SRCREV = "605dd2645ef899e2b7c95709476fb51e28d7e378"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -18,7 +18,7 @@
inherit cmake
-PACKAGECONFIG ??= "rpm"
+PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}"
PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm"
EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON"