meta-openembedded: subtree update:629696b64b..e93d527a33
Adrian (1):
firewalld: upgrade 0.7.3 -> 0.7.5
Andre Carvalho (1):
netcat: Set CVE_PRODUCT
Andreas Müller (6):
networkmanager: upgrade 1.22.10 -> 1.22.14
blueman: upgrade 2.1.1 -> 2.1.3
modemmanager: upgrade 1.12.10 -> 1.12.12
ibus: upgrade 1.5.21 -> 1.5.22
network-manager-applet: upgrade 1.16.0 -> 1.18.0
sysprof: remove linux-gnueabi-patch
Armin Kuster (2):
net-snmp: Security fix CVE-2019-20892
wireshark: Update to 3.2.5
Changqing Li (1):
libmcrypt: set CLEANBROKEN
Daniel Gomez (1):
ttf-fonts: Update ttf-ubuntu-font-family recipe
Fagundes, Paulo (1):
redis-plus-plus: add recipe
Hongxu Jia (1):
networkmanager: fix Files/directories were installed but not shipped
Jacopo Dall'Aglio (2):
netplan: upgrade 0.98 -> 0.99
python3-libconf: add recipe version 2.0.1
Khem Raj (1):
lirc: Inherit distutils-common-base
Konrad Weihmann (6):
ntop: remove static libs from dev package
ruli: recipe cleanup
postgresql: remove vacuumlo from contrib
libconfig: remove cmake append from base package
gattlib: remove includedir from base package
openldap: packaging fixes
Leon Anavi (63):
python3-pyro4: Upgrade 4.77 -> 4.80
python3-rdflib: Upgrade 4.2.2 -> 5.0.0
python3-httplib2: Upgrade 0.17.3 -> 0.18.1
python3-cppy: Add new recipe
python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0
python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18
python3-greenlet: Upgrade 0.4.15 -> 0.4.16
python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1
python3-msm: Upgrade 0.8.3 -> 0.8.7
python3-pulsectl: Upgrade 20.2.4 -> 20.5.1
python3-pybind11: Consolidate in a single file
python3-pybind11: Upgrade 2.4.3 -> 2.5.0
python3-pyparted: Consolidate in a single file
python3-pyparted: Upgrade 3.11.3 -> 3.11.6
python3-pywbem: Consolidate in a single file
python3-pywbem: Upgrade 0.15.0 -> 0.17.2
python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3
python3-humanize: Upgrade 2.4.0 -> 2.4.1
python3-autobahn: Upgrade 20.4.3 -> 20.6.2
python3-yappi: Upgrade 1.0 -> 1.2.5
python3-sympy: Upgrade 1.5.1 -> 1.6
python3-watchdog: Upgrade 0.10.2 -> 0.10.3
python3-tqdm: Upgrade 4.43.0 -> 4.47.0
python3-pyflakes: Upgrade 2.1.1 -> 2.2.0
python3-pymisp: Upgrade 2.4.122 -> 2.4.128
python3-pychromecast: Upgrade 4.2.3 -> 7.0.1
python3-py: Upgrade 1.8.2 -> 1.9.0
python3-html5lib: Upgrade 1.0.1 -> 1.1
python3-lz4: Upgrade 3.0.2 -> 3.1.0
python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0
python3-configargparse: Upgrade 0.15.1 -> 1.2.3
python3-cachetools: Upgrade 4.1.0 -> 4.1.1
python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2
python3-pywbem: Upgrade 0.17.2 -> 0.17.3
python3-h2: Consolidate in a single file
python3-h2: Upgrade 3.1.1 -> 3.2.0
python3-requests: Upgrade 2.23.0 -> 2.24.0
python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3
python3-pyperclip: Upgrade 1.7.0 -> 1.8.0
python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2
python3-pint: Upgrade 0.13 -> 0.14
python3-dbus-next: Upgrade 0.1.2 -> 0.1.3
python3-pybluez: Upgrade 0.22 -> 0.23
python3-stevedore: Upgrade 1.31.0 -> 2.0.1
python3-h5py: Upgrade 2.9.0 -> 2.10.0
python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2
python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0
python3-websocket-client: Upgrade 0.56.0 -> 0.57.0
python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0
python3-regex: Upgrade 2020.1.8 -> 2020.6.8
python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114
python3-robotframework: Upgrade 3.0.4 -> 3.2.1
python3-pychromecast: Upgrade 7.0.1 -> 7.1.0
python3-pyasn1-modules: Consolidate in a single file
python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8
python3-sympy: Upgrade 1.6 -> 1.6.1
python3-pychromecast: Upgrade 7.1.0 -> 7.1.1
python3-imageio: Upgrade 2.8.0 -> 2.9.0
python3-humanize: Upgrade 2.4.1 -> 2.5.0
python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0
python3-luma-oled: Upgrade 3.4.0 -> 3.5.0
python3-pyconnman: Consolidate in a single file
python3-jsonref: Consolidate in a single file
Pierre-Jean Texier (4):
minicoredumper: update SRC_URI to use github instead
tslib: upgrade 1.21 -> 1.22
haveged: upgrade 1.9.9 -> 1.9.13
xxhash: upgrade 0.7.3 -> 0.7.4
Qi.Chen@windriver.com (1):
multipath-tools: disable parallel build as a workaround
Robert Yang (1):
drbd-utils: Add CLEANBROKEN to fix rebuild errors
Sakib Sajal (2):
python3-betamax: add recipe
cunit: add ptest
Wang Mingyu (2):
nspr: upgrade 4.25 -> 4.26
python3-pytest: upgrade 5.4.2 -> 5.4.3
Zang Ruochen (20):
python3-ansicolors: Enable ptest
python3-anyjson: Enable ptest
python3-atomicwrites: upgrade 1.3.0 -> 1.4.0
python3-backports-functools-lru-cache: Enable ptest
python3-bcrypt: Enable ptest
nftables: upgrade 0.9.5 -> 0.9.6
ccid: upgrade 1.4.32 -> 1.4.33
docopt.cpp: upgrade 0.6.2 -> 0.6.3
libiio: upgrade 0.20 -> 0.21
librelp: upgrade 1.5.0 -> 1.6.0
redis: upgrade 6.0.4 -> 6.0.5
rsyslog: upgrade 0.2004.0 -> 0.2006.0
libnet-dns-perl: upgrade 1.24 -> 1.25
python3-blinker: Enable ptest
python3-cbor2: Enable ptest
python3-click: Enable ptest
python3-u-msgpack-python: Enable ptest
fuse3: Enable ptest
sshfs-fuse: Enable ptest
python3-wcwidth: Enable ptest
Zheng Ruoqin (7):
Fix build error when enable multilib.
tracker: Fix build error when enable multilib.
mraa: Disable python2, otherwise, there is a build error when enable multilib.
paho-mqtt-c: Fix build error when enable multilib.
upm:Fix build error when enable multilib.
python3-unidiff: Enable ptest
python3-uritemplate: Enable ptest
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb
index 2843cdf..b683032 100644
--- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb
+++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb
@@ -29,7 +29,7 @@
SYSTEMD_AUTO_ENABLE_lirc = "enable"
SYSTEMD_AUTO_ENABLE_lirc-exec = "enable"
-inherit autotools pkgconfig systemd python3native
+inherit autotools pkgconfig systemd python3native distutils-common-base
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd"
PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11,"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
index 6b4decc..d79dbed 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
@@ -28,5 +28,5 @@
inherit pkgconfig cmake
-FILES_${PN} = "${libdir}/* ${includedir}/*"
+FILES_${PN} = "${libdir}/*"
FILES_${PN}-dev = "${includedir}/*"
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb
index deab6f0..b0ab46f 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.10.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb
@@ -11,11 +11,8 @@
DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native"
-SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
- "
-
-SRC_URI[sha256sum] = "b2b3058bbb72adf98b24707fdbebe58e590644a38145e30d574f685f154bf8aa"
-
+SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+SRC_URI[sha256sum] = "a4fc4b33c0e8ae9372885f86fa033f3c1a89a76cd59a3458670eff1824222a3d"
S = "${WORKDIR}/ModemManager-${PV}"
PACKAGECONFIG ??= "mbim qmi \
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb
index 071d51f..3a1222e 100644
--- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb
@@ -22,6 +22,10 @@
inherit cmake
+do_configure_prepend() {
+ sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt
+}
+
do_install_append() {
# paho-mqtt installes some thing that we don't want.
rm -rf ${D}${prefix}/samples
diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
index be413a1..46e694b 100644
--- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
+++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
@@ -13,3 +13,5 @@
UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/"
inherit autotools-brokensep gettext binconfig
+
+CLEANBROKEN = "1"
diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 5b20098..54ccf1f 100644
--- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -310,7 +310,7 @@
FILES_libpgtypes-dev = "${libdir}/libpgtypes*${SOLIBS} ${includedir}/pgtypes*.h"
FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \
- ${bindir}/pgbench ${bindir}/vacuumlo \
+ ${bindir}/pgbench \
${S}/contrib/spi/*.example \
${libdir}/${BPN}/_int.so ${libdir}/${BPN}/adminpack.so \
${libdir}/${BPN}/autoinc.so ${libdir}/${BPN}/auto_explain.so \
diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
deleted file mode 100644
index d4c7765..0000000
--- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-Set-library-VERSION-and-SOVERSION.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a47ca75702318ff43446c70120f7aacde4ccee1b Mon Sep 17 00:00:00 2001
-From: Eero Aaltonen <eero.aaltonen@vaisala.com>
-Date: Thu, 20 Jun 2019 16:21:20 +0300
-Subject: [PATCH] Set library VERSION and SOVERSION
-
-With soversion and version specified, `install` target will install the
-library with the specified version and also create the proper symlink.
-
-Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/112]
-but unlikely to be merged soon as it is a duplicate of
-[https://github.com/docopt/docopt.cpp/pull/112] which has been **Open**
-since 2016-12-08.
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23da468..feff32e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,6 +50,10 @@ else()
- set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-
- add_library(docopt SHARED $<TARGET_OBJECTS:docopt_o>)
-+ set_target_properties(docopt PROPERTIES
-+ VERSION ${PROJECT_VERSION}
-+ SOVERSION ${PROJECT_VERSION_MAJOR}
-+ )
- add_library(docopt_s STATIC $<TARGET_OBJECTS:docopt_o>)
- endif()
-
diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index aa55ebf8..7a6b0bf 100644
--- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -14,12 +14,11 @@
"
DEPENDS = "boost"
-SRCREV = "3dd23e3280f213bacefdf5fcb04857bf52e90917"
-PV = "0.6.2+git${SRCPV}"
+SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196"
+PV = "0.6.3+git${SRCPV}"
SRC_URI = "\
git://github.com/docopt/docopt.cpp.git;protocol=https \
- file://0001-Set-library-VERSION-and-SOVERSION.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
rename to meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
index c1839b3..50326ea 100644
--- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
@@ -6,7 +6,7 @@
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
# v1.9.9
-SRCREV = "6da706c8026b629d9bb7ebebc32239305a03da8e"
+SRCREV = "1283a65c541c4a83e152024a63faf7b267b9b1cd"
SRC_URI = "git://github.com/jirka-h/haveged.git \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
index eb0a2c3..148e85c 100644
--- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb
@@ -13,7 +13,3 @@
SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690"
SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9"
-
-FILES_${PN}_append = " \
- ${libdir}/cmake \
-"
diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
index 7c24416..8bd8e90 100644
--- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -22,7 +22,7 @@
DEPENDS += "json-c"
-EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON \
+EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON -DPYTHON2_LIBRARY=OFF \
-DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \
-DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
-DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
new file mode 100644
index 0000000..e23733b
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.1.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "C++ client for Redis based on hiredis"
+HOMEPAGE = "https://github.com/sewenew/redis-plus-plus"
+SECTION = "libs"
+
+DEPENDS += "hiredis"
+RDEPENDS_${PN} += "hiredis"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+SRCREV = "b08b36a9a91de00636e583307610f49af7876f50"
+SRC_URI = "git://github.com/sewenew/redis-plus-plus"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += " ${libdir}/libredis++.so"
diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
index ffa28cc..893f323 100644
--- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb
@@ -17,8 +17,8 @@
file://GNU_SOURCE.patch \
"
-SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced"
-SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de"
+SRC_URI[md5sum] = "617d680fc0944c217e2350a365686eb0"
+SRC_URI[sha256sum] = "42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596"
inherit autotools-brokensep update-rc.d systemd useradd
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
similarity index 87%
rename from meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
index a466314..f3933f9 100644
--- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.5.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.6.0.bb
@@ -9,7 +9,7 @@
SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https \
"
-SRCREV = "0beb2258e12e4131dc31e261078ea53d18f787d7"
+SRCREV = "fe366f3770320cbe76bac7e84b26a48491d14531"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
index 68e96ef..ff66995 100644
--- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2004.0.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb
@@ -29,8 +29,8 @@
file://0001-Include-sys-time-h.patch \
"
-SRC_URI[md5sum] = "375a60ab0f461367f84f07a5dbda6de2"
-SRC_URI[sha256sum] = "5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9"
+SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b"
+SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97"
UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
index 5b3585c..6a7611f 100644
--- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
@@ -46,6 +46,10 @@
PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN},"
PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
+do_configure_prepend() {
+ sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake
+}
+
FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
deleted file mode 100644
index ea8a9e5..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 050bf24c16e95f63a76e13156346a072035d45b4 Mon Sep 17 00:00:00 2001
-From: Evan Harvey <evanwork1234@gmail.com>
-Date: Thu, 19 Mar 2020 01:32:03 -0700
-Subject: [PATCH] Fix build error with input_event_sec for old kernel
-
-Upstream-Status: Backport [https://github.com/libts/tslib/commit/050bf24c16e95f63a76e13156346a072035d45b4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/ts_uinput.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c
-index 1832a07..9c40bb3 100644
---- a/tools/ts_uinput.c
-+++ b/tools/ts_uinput.c
-@@ -51,6 +51,11 @@
- #include <linux/fb.h>
- #endif
-
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #define RESET "\033[0m"
- #define RED "\033[31m"
- #define GREEN "\033[32m"
---
-2.26.2
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
deleted file mode 100644
index 59bd97a..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-From 5455055660700be18eb8800e56e2423031ed4c76 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Nov 2019 19:59:29 -0800
-Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
-
-time element is deprecated on new input_event structure in kernel's
-input.h [1]
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
-
-Upstream-Status: Submitted [https://github.com/libts/tslib/pull/162]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/input-raw.c | 59 +++++++++++++++++++++++++++-------------
- tools/ts_uinput.c | 66 ++++++++++++++++++++++++++++++---------------
- 2 files changed, 85 insertions(+), 40 deletions(-)
-
-diff --git a/plugins/input-raw.c b/plugins/input-raw.c
-index 64f0156..f030836 100644
---- a/plugins/input-raw.c
-+++ b/plugins/input-raw.c
-@@ -40,6 +40,11 @@
- # include <linux/input.h>
- #endif
-
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #ifndef EV_SYN /* 2.4 kernel headers */
- # define EV_SYN 0x00
- #endif
-@@ -384,7 +389,8 @@ static int ts_input_read(struct tslib_module_info *inf,
- samp->y = i->current_y;
- samp->pressure = i->current_p;
- }
-- samp->tv = ev.time;
-+ samp->tv.tv_sec = ev.input_event_sec;
-+ samp->tv.tv_usec = ev.input_event_usec;
- #ifdef DEBUG
- fprintf(stderr,
- "RAW---------------------> %d %d %d %ld.%ld\n",
-@@ -519,7 +525,8 @@ static int ts_input_read(struct tslib_module_info *inf,
- samp->pressure = i->current_p = ev.value;
- break;
- }
-- samp->tv = ev.time;
-+ samp->tv.tv_sec = ev.input_event_sec;
-+ samp->tv.tv_usec = ev.input_event_usec;
- #ifdef DEBUG
- fprintf(stderr,
- "RAW---------------------------> %d %d %d\n",
-@@ -536,7 +543,8 @@ static int ts_input_read(struct tslib_module_info *inf,
- samp->x = 0;
- samp->y = 0;
- samp->pressure = 0;
-- samp->tv = ev.time;
-+ samp->tv.tv_sec = ev.input_event_sec;
-+ samp->tv.tv_usec = ev.input_event_usec;
- samp++;
- total++;
- }
-@@ -651,7 +659,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- switch (i->ev[it].code) {
- case BTN_TOUCH:
- i->buf[total][i->slot].pen_down = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- if (i->ev[it].value == 0)
- pen_up = 1;
-@@ -751,7 +760,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- // fall through
- case ABS_MT_POSITION_X:
- i->buf[total][i->slot].x = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_Y:
-@@ -760,7 +770,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- // fall through
- case ABS_MT_POSITION_Y:
- i->buf[total][i->slot].y = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_PRESSURE:
-@@ -769,12 +780,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- // fall through
- case ABS_MT_PRESSURE:
- i->buf[total][i->slot].pressure = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_TOOL_X:
- i->buf[total][i->slot].tool_x = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- /* for future use
- * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
-@@ -782,7 +795,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- break;
- case ABS_MT_TOOL_Y:
- i->buf[total][i->slot].tool_y = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- /* for future use
- * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
-@@ -790,7 +804,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- break;
- case ABS_MT_TOOL_TYPE:
- i->buf[total][i->slot].tool_type = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- /* for future use
- * i->buf[total][i->slot].valid |= TSLIB_MT_VALID_TOOL;
-@@ -798,12 +813,14 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- break;
- case ABS_MT_ORIENTATION:
- i->buf[total][i->slot].orientation = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_DISTANCE:
- i->buf[total][i->slot].distance = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
-
- if (i->special_device == EGALAX_VERSION_210) {
-@@ -816,34 +833,40 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
- break;
- case ABS_MT_BLOB_ID:
- i->buf[total][i->slot].blob_id = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_TOUCH_MAJOR:
- i->buf[total][i->slot].touch_major = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- if (i->ev[it].value == 0)
- i->buf[total][i->slot].pressure = 0;
- break;
- case ABS_MT_WIDTH_MAJOR:
- i->buf[total][i->slot].width_major = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_TOUCH_MINOR:
- i->buf[total][i->slot].touch_minor = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_WIDTH_MINOR:
- i->buf[total][i->slot].width_minor = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- break;
- case ABS_MT_TRACKING_ID:
- i->buf[total][i->slot].tracking_id = i->ev[it].value;
-- i->buf[total][i->slot].tv = i->ev[it].time;
-+ i->buf[total][i->slot].tv.tv_sec = i->ev[it].input_event_sec;
-+ i->buf[total][i->slot].tv.tv_usec = i->ev[it].input_event_usec;
- i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
- if (i->ev[it].value == -1)
- i->buf[total][i->slot].pressure = 0;
-diff --git a/tools/ts_uinput.c b/tools/ts_uinput.c
-index 6ca4c3d..1832a07 100644
---- a/tools/ts_uinput.c
-+++ b/tools/ts_uinput.c
-@@ -170,14 +170,16 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
- continue;
-
- if (s[j][i].pen_down == 1) {
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_KEY;
- data->ev[c].code = BTN_TOUCH;
- data->ev[c].value = s[j][i].pen_down;
- c++;
- }
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_SLOT;
- data->ev[c].value = s[j][i].slot;
-@@ -190,111 +192,129 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
- * we should use slot 1 and so on.
- */
- if (i == 0) {
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_X;
- data->ev[c].value = s[j][i].x;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_Y;
- data->ev[c].value = s[j][i].y;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_PRESSURE;
- data->ev[c].value = s[j][i].pressure;
- c++;
- }
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_POSITION_X;
- data->ev[c].value = s[j][i].x;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_POSITION_Y;
- data->ev[c].value = s[j][i].y;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_PRESSURE;
- data->ev[c].value = s[j][i].pressure;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TOUCH_MAJOR;
- data->ev[c].value = s[j][i].touch_major;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_WIDTH_MAJOR;
- data->ev[c].value = s[j][i].width_major;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TOUCH_MINOR;
- data->ev[c].value = s[j][i].touch_minor;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_WIDTH_MINOR;
- data->ev[c].value = s[j][i].width_minor;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TOOL_TYPE;
- data->ev[c].value = s[j][i].tool_type;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TOOL_X;
- data->ev[c].value = s[j][i].tool_x;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TOOL_Y;
- data->ev[c].value = s[j][i].tool_y;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_ORIENTATION;
- data->ev[c].value = s[j][i].orientation;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_DISTANCE;
- data->ev[c].value = s[j][i].distance;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_BLOB_ID;
- data->ev[c].value = s[j][i].blob_id;
- c++;
-
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_ABS;
- data->ev[c].code = ABS_MT_TRACKING_ID;
- data->ev[c].value = s[j][i].tracking_id;
- c++;
-
- if (data->mt_type_a == 1) {
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_SYN;
- data->ev[c].code = SYN_MT_REPORT;
- data->ev[c].value = 0;
-@@ -302,7 +322,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
- }
-
- if (s[j][i].pen_down == 0) {
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_KEY;
- data->ev[c].code = BTN_TOUCH;
- data->ev[c].value = s[j][i].pen_down;
-@@ -312,7 +333,8 @@ static int send_touch_events(struct data_t *data, struct ts_sample_mt **s,
- }
-
- if (c > 0) {
-- data->ev[c].time = s[j][i].tv;
-+ data->ev[c].input_event_sec = s[j][i].tv.tv_sec;
-+ data->ev[c].input_event_usec = s[j][i].tv.tv_usec;
- data->ev[c].type = EV_SYN;
- data->ev[c].code = SYN_REPORT;
- data->ev[c].value = 0;
---
-2.24.0
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb
similarity index 92%
rename from meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
rename to meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb
index 76c4231..5d35088 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.22.bb
@@ -14,13 +14,10 @@
"
SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \
- file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
- file://0001-Fix-build-error-with-input_event_sec-for-old-kernel.patch \
file://ts.conf \
file://tslib.sh \
-"
-SRC_URI[md5sum] = "b2b20d3ed520128513f8d3135b42e142"
-SRC_URI[sha256sum] = "d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56"
+ "
+SRC_URI[sha256sum] = "aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a"
UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
similarity index 65%
rename from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
index d5d1b9a..b8aa4c0 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
@@ -6,10 +6,13 @@
LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=325a1a9029112a2405e743c7f816427b"
PR = "r1"
-SRC_URI = "http://font.ubuntu.com/download/ubuntu-font-family-${PV}.zip"
+SHA1SUM = "0cef8205"
-SRC_URI[md5sum] = "a1fc70f5a5b1d096ab8310886cddaa1c"
-SRC_URI[sha256sum] = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"
+SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip"
+
+
+SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32"
+SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf"
S = "${WORKDIR}/ubuntu-font-family-${PV}"
diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
index 051656b..d381c83 100644
--- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb
@@ -13,7 +13,7 @@
PR .= "+git${SRCPV}"
-SRC_URI = "git://git.linuxfoundation.org/diamon/minicoredumper.git;protocol=http \
+SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \
file://minicoredumper.service \
file://minicoredumper.init \
"
diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
similarity index 78%
rename from meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb
rename to meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
index 394d0e8..3c58894 100644
--- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.32.bb
+++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
@@ -11,8 +11,8 @@
file://0001-Add-build-rule-for-README.patch \
"
-SRC_URI[md5sum] = "c4c70e928455f6ac3c4d02c4d2a654e9"
-SRC_URI[sha256sum] = "545f4ab7887d512aa4b6967b80ef18a77b790c34769718452737a633cefc1639"
+SRC_URI[md5sum] = "b11907894ce2d345439635e2b967e7e5"
+SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424"
inherit autotools pkgconfig
diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
index d12fac6..b308bde 100644
--- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -4,8 +4,8 @@
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
-SRCREV = "26c5be5ae37334abf3021b52d27f84aa6a6b1842"
-PV = "0.20+git${SRCPV}"
+SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7"
+PV = "0.21+git${SRCPV}"
SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 0d03191..48a348d 100644
--- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -117,3 +117,4 @@
"
RDEPENDS_${PN} += "kpartx"
+PARALLEL_MAKE = ""
diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb
similarity index 96%
rename from meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb
rename to meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb
index 1de26e1..a15afd6 100644
--- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.25.bb
+++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb
@@ -23,8 +23,8 @@
UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
-SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17"
-SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256"
+SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68"
+SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d"
CVE_PRODUCT = "netscape_portable_runtime"
diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb
index b62b13a..3a130f9 100644
--- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb
+++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.50.bb
@@ -172,9 +172,9 @@
FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \
${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \
${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*"
-FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run ${localstatedir}/volatile/run"
+FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp"
FILES_${PN}-bin = "${bindir}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so"
FILES_${PN}-dbg += "${libexecdir}/openldap/.debug"
do_install_append() {
diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb
similarity index 78%
rename from meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb
rename to meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb
index 865adc5..6e74e49 100644
--- a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb
+++ b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb
@@ -3,12 +3,12 @@
working at speeds close to RAM limits."
HOMEPAGE = "http://www.xxhash.com/"
LICENSE = "BSD-2-Clause & GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb"
SRC_URI = "git://github.com/Cyan4973/xxHash.git"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
-SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174"
+SRCREV = "173e50be0509c6fb6c1bb74d95049ef61d7fdced"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
index babf804..c877d3b 100644
--- a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
+++ b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
@@ -7,16 +7,30 @@
S = "${WORKDIR}/CUnit-${PV}"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/cunit/CUnit/${PV}/CUnit-${PV}.tar.bz2 \
- file://fixup-install-docdir.patch"
+ file://fixup-install-docdir.patch \
+ file://run-ptest \
+ "
SRC_URI[md5sum] = "b5f1a9f6093869c070c6e4a9450cc10c"
SRC_URI[sha256sum] = "f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cunit/files/releases"
-inherit autotools-brokensep remove-libtool
+inherit autotools-brokensep remove-libtool ptest
EXTRA_OECONF = "--enable-memtrace --enable-automated --enable-basic --enable-console"
+TESTBIN = "/CUnit/Sources/Test/test_cunit"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'test','', d)} \
+ "
+
+PACKAGECONFIG[test] = "--enable-test,,,"
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ install -m 0755 ${S}${TESTBIN} ${D}${PTEST_PATH}/tests/
+}
+
FILES_${PN}-dev += "${datadir}/CUnit"
FILES_${PN}-doc += "${docdir}"
diff --git a/meta-openembedded/meta-oe/recipes-test/cunit/files/run-ptest b/meta-openembedded/meta-oe/recipes-test/cunit/files/run-ptest
new file mode 100644
index 0000000..903c8c8
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-test/cunit/files/run-ptest
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd $ptestdir/tests
+./test_cunit > cunit_test_out.tmp
+
+echo "--- Test output ---"
+cat cunit_test_out.tmp
+echo ""
+echo "--- ptest result ---"
+
+grep "Failures: 0" cunit_test_out.tmp > /dev/null
+if [ $? -eq 0 ]; then
+ echo "PASS: cunit"
+else
+ echo "FAIL: cunit"
+fi
+
+rm -f cunit_test_out.tmp