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-support/libpcre/libpcre/out-of-tree.patch b/poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch
deleted file mode 100644
index d567896..0000000
--- a/poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is.
-
-Upstream-Status: Backport [r1750]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Index: configure.ac
-===================================================================
---- a/configure.ac (revision 1749)
-+++ b/configure.ac (working copy)
-@@ -159,6 +159,8 @@
-
- if test "$enable_jit" = "auto"; then
- AC_LANG(C)
-+ SAVE_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS=-I$srcdir
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #define SLJIT_CONFIG_AUTO 1
- #include "sljit/sljitConfigInternal.h"
-@@ -165,6 +167,7 @@
- #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
- #error unsupported
- #endif]])], enable_jit=yes, enable_jit=no)
-+ CPPFLAGS=$SAVE_CPPFLAGS
- fi
-
- # Handle --disable-pcregrep-jit (enabled by default)
diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.34.bb
similarity index 93%
rename from poky/meta/recipes-support/libpcre/libpcre2_10.33.bb
rename to poky/meta/recipes-support/libpcre/libpcre2_10.34.bb
index 87da313..fa8655e 100644
--- a/poky/meta/recipes-support/libpcre/libpcre2_10.33.bb
+++ b/poky/meta/recipes-support/libpcre/libpcre2_10.34.bb
@@ -14,8 +14,8 @@
file://pcre-cross.patch \
"
-SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44"
-SRC_URI[sha256sum] = "35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa"
+SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366"
+SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca"
CVE_PRODUCT = "pcre2"
diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.43.bb b/poky/meta/recipes-support/libpcre/libpcre_8.44.bb
similarity index 91%
rename from poky/meta/recipes-support/libpcre/libpcre_8.43.bb
rename to poky/meta/recipes-support/libpcre/libpcre_8.44.bb
index f9a22fe..e5471e8 100644
--- a/poky/meta/recipes-support/libpcre/libpcre_8.43.bb
+++ b/poky/meta/recipes-support/libpcre/libpcre_8.44.bb
@@ -6,16 +6,15 @@
HOMEPAGE = "http://www.pcre.org"
SECTION = "devel"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e"
SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \
file://fix-pcre-name-collision.patch \
- file://out-of-tree.patch \
file://run-ptest \
file://Makefile \
-"
+ "
-SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4"
-SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b"
+SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24"
+SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d"
CVE_PRODUCT = "pcre"