meta-openembedded: subtree update:4599fea881..fd123c9bb2
Adrian (1):
networkmanager: add missing readline depends
Adrian Freihofer (2):
nftables: upgrade 0.9.7 -> 0.9.8
firewalld: upgrade 0.9.2 -> 0.9.3
Adrian Herrera (2):
cppunit: add support for native version
protobuf: apply fix for pkg-config pthread flags
Alejandro Enedino Hernandez Samaniego (2):
remmina: Update to 1.4.10
imapfilter: Upgrade 2.6.16 -> 2.7.5
Anatol Belski (1):
xmlsec1: Fix configure QA error caused by host lookup path
Andreas Müller (24):
libunique: remove
xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS
libxfce4ui: Fix sporadic install error
poppler: upgrade 20.12.1 -> 21.01.0
dconf: upgrade 0.36.0 -> 0.38.0
dconf-editor: upgrade 3.36.2 -> 3.38.2
amtk: upgrade 5.1.1 -> 5.2.0
evince: upgrade 3.36.7 -> 3.38.0
catfish: upgrade 1.4.13 -> 4.16.0
xfwm4: upgrade 4.16.0 -> 4.16.1
parole: upgrade 1.0.5 -> 4.16.0
garcon: upgrade 0.8.0 -> 4.16.1
xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2
thunar: upgrade 4.16.0 -> 4.16.2
jack: upgrade 1.19.16 -> 1.19.17
networkmanager: upgrade 1.22.14 -> 1.28.0
appstream-glib: upgrade 0.7.17 -> 0.7.18
vlc: upgrade 3.0.11.1 -> 3.0.12
python3-mypy-extensions: Initial add 0.4.3
python3-mypy: initial add 0.800
python3-send2trash_ initial add 1.5.0
python3-asttokens: initial add 2.0.4
python3-typed-ast: Initial add 1.4.1
packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash
Andrew Jeffery (2):
meta-python: Add hexdump package
meta-python: Add jstyleson
Armin Kuster (3):
wireshark: Several securtiy fixes
ipset: add recipe
lua: update to 5.3.6
Clément Péron (2):
re2: Add recipe for Google RE2 library
abseil-cpp: bump to LTS 2020_09_23 Patch Release 3
Daniel Gomez (2):
zbar: Add support for mchehab/zbar
zbar: Remove support for 0.10 version
Diego Santa Cruz (1):
net-snmp: control smux via PACKAGECONFIG
Gianfranco (2):
vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386
Gianfranco Costamagna (1):
dlt-daemon: update to new release 2.18.6
Harpritkaur Bhandari (1):
rapidjson: Upgrade SRCREV to latest
He Zhe (2):
lmbench: Fix webpage-lm and manual page typos
lmbench: lat_fifo: Fix cleanup sequence
Junjie Mao (1):
python3-xmlschema: Yocto recipes for validating against XSD 1.1
Kai Kang (4):
xfce4-panel-profiles: fix do install failure with dash
xfce4-panel-profiles: update remove-bashisms.patch for centos 7
blueman: refresh patch
mariadb: add package config zstd
Khem Raj (6):
influxdb: Fix build on mips
packagegroup-meta-oe: Add new package influxdb
packagegroup-meta-networking: Add ipset
packagegroup-meta-oe: Add re2
autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end
dfu-util-native: Adjust Inherit order
Leon Anavi (75):
python3-aiohttp: Upgrade 3.7.2 -> 3.7.3
python3-coloredlogs: Upgrade 14.0 -> 15.0
python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0
python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3
python3-parso: Upgrade 0.8.0 -> 0.8.1
python3-pillow: Upgrade 7.2.0 -> 8.1.0
python3-croniter: Upgrade 0.3.37 -> 1.0.1
python3-pychromecast: Upgrade 7.7.1 -> 7.7.2
python3-hyperlink: Upgrade 20.0.1 -> 21.0.0
python3-dnspython: Upgrade 2.0.0 -> 2.1.0
python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10
python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0
python3-certifi: Upgrade 2020.11.8 -> 2020.12.5
python3-jedi: Upgrade 0.17.2 -> 0.18.0
python3-mock: Upgrade 4.0.2 -> 4.0.3
python3-pyscaffold: Upgrade 3.2.3 -> 3.3
python3-cffi: Upgrade 1.14.3 -> 1.14.4
python3-rsa: Upgrade 4.6 -> 4.7
python3-pyjwt: Upgrade 1.7.1 -> 2.0.0
python3-isort: Upgrade 5.6.4 -> 5.7.0
python3-lz4: Upgrade 3.1.0 -> 3.1.1
python3-msgpack: Upgrade 1.0.0 -> 1.0.2
python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1
python3-ecdsa: Upgrade 0.16.0 -> 0.16.1
python3-regex: Upgrade 2020.10.28 -> 2020.11.13
python3-cryptography: Upgrade 3.2 -> 3.3.1
python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1
python3-wheel: Upgrade 0.35.1 -> 0.36.2
python3-pyzmq: Upgrade 19.0.2 -> 20.0.0
python3-greenlet: Upgrade 0.4.17 -> 1.0.0
python3-parse: Upgrade 1.18.0 -> 1.19.0
python3-colorlog: Upgrade 4.6.2 -> 4.7.2
python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1
python3-pyperf: Upgrade 2.0.0 -> 2.1.0
python3-cheetah: Upgrade 3.2.5 -> 3.2.6
python3-pyscaffold: Upgrade 3.3 -> 3.3.1
python3-lxml: Upgrade 4.6.1 -> 4.6.2
python3-openpyxl: Upgrade 3.0.5 -> 3.0.6
python3-pymysql: Upgrade 0.10.1 -> 1.0.2
python3-dbus-next: Upgrade 0.1.4 -> 0.2.2
python3-yappi: Upgrade 1.3.0 -> 1.3.2
python3-pyyaml: Upgrade 5.3.1 -> 5.4
python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8
python3-evdev: Upgrade 1.3.0 -> 1.4.0
python3-pyusb: Upgrade 1.1.0 -> 1.1.1
python3-pyserial: Upgrade 3.4 -> 3.5
python3-pandas: Upgrade 1.2.0 -> 1.2.1
python3-alembic: Upgrade 1.4.3 -> 1.5.1
python3-coverage: Upgrade 5.3 -> 5.3.1
python3-lz4: Upgrade 3.1.1 -> 3.1.3
python3-bitarray: Upgrade 1.6.1 -> 1.6.3
python3-pykwalify: Upgrade 1.7.0 -> 1.8.0
python3-croniter: Upgrade 1.0.1 -> 1.0.2
python3-ujson: Upgrade 4.0.1 -> 4.0.2
python3-smbus2: Upgrade 0.4.0 -> 0.4.1
python3-pyzmq: Upgrade 20.0.0 -> 21.0.1
python3-alembic: Upgrade 1.5.1 -> 1.5.2
python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11
python3-pyjwt: Upgrade 2.0.0 -> 2.0.1
python3-pyyaml: Upgrade 5.4 -> 5.4.1
python3-natsort: Upgrade 7.1.0 -> 7.1.1
python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1
python3-socketio: Upgrade 4.6.0 -> 5.0.4
python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2
python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1
python3-cachetools: Upgrade 4.2.0 -> 4.2.1
python3-coverage: Upgrade 5.3.1 -> 5.4
python3-diskcache: Upgrade 5.1.0 -> 5.2.1
python3-aenum: Upgrade 2.2.6 -> 3.0.0
python3-xmlschema: Upgrade 1.4.1 -> 1.4.2
python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1
python3-portion: Add recipe
python3-pako: Upgrade 0.2.3 -> 0.3.0
python3-typed-ast: Upgrade 1.4.1 -> 1.4.2
python3-pyzmq: Upgrade 21.0.1 -> 21.0.2
Luca Boccassi (4):
dbus-broker: enable SO_PEERSEC usage by default
fsverity: update to 1.3
fsverity: fix MinGW build
dbus-broker: update to v26
Mario Schuknecht (1):
dnsmasq: Fix systemd service
Mikko Rapeli (3):
fuse: set CVE_PRODUCT to "fuse_project:fuse"
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
Mingli Yu (2):
mcelog: fix the pfa test hang
mariadb: upgrade to 10.5.8
Nicolas Jeker (1):
networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi]
Oleksiy Obitotskyy (1):
libsmi: set awk as target path
Robert Joslyn (1):
htop: Update to 3.0.4
Ross Burton (1):
libmicrohttpd: allow native/nativesdk builds
S. Lockwood-Childs (1):
sip3: simplify recipe
Shlomi Vaknin (1):
python3-sh: remove python3-tests from RDEPENDS
Stefano Babic (1):
libconfig: split package for C++
Søren Andersen (1):
zram: fix sourcing of zram parameters
Thomas Perrot (1):
influxdb: add new recipe
Trevor Gamblin (2):
packagegroup-meta-python: sort package names, add notes
packagegroup-meta-python: add ptest packages to ptest group
Wang Mingyu (1):
dovecot: upgrade 2.2.36.4 -> 2.3.13
Yi Zhao (1):
nss: upgrade 3.60 -> 3.60.1
Zang Ruochen (9):
c-periphery: upgrade 2.3.0 -> 2.3.1
htop: upgrade 3.0.4 -> 3.0.5
hwdata: upgrade 0.342 -> 0.343
spitools: upgrade 0.8.6 -> 0.8.7
librole-tiny-perl: upgrade 2.001004 -> 2.002003
python3-smbus: upgrade 4.1 -> 4.2
python3-snappy: upgrade 0.5.4 -> 0.6.0
python3-zopeinterface: upgrade 5.1.0 -> 5.2.0
python3-nmap: upgrade 1.4.8 -> 1.5.0
Zheng Ruoqin (7):
cifs-utils: upgrade 6.11 -> 6.12
firewalld: upgrade 0.9.1 -> 0.9.2
igmpproxy: upgrade 0.2.1 -> 0.3
mdns: upgrade 1096.40.7 -> 1310.40.42
opensc: Fix the wrong version number.
python3-djangorestframework: upgrade 3.12.1 -> 3.12.2
python3-ipy: upgrade 1.00 -> 1.01
changqing.li@windriver.com (1):
celt051: update SRC_URI
zangrc (6):
libnftnl: upgrade 1.1.8 -> 1.1.9
czmq: upgrade 4.2.0 -> 4.2.1
dialog: upgrade 1.3-20201126 -> 1.3-20210117
modemanager: upgrade 1.14.8 -> 1.14.10
monit: upgrade 5.27.1 -> 5.27.2
python3-networkmanager: upgrade 2.1 -> 2.2
zhengruoqin (3):
openldap: upgrade 2.4.56 -> 2.4.57
satyr: upgrade 0.35 -> 0.36
zeromq: upgrade 4.3.3 -> 4.3.4
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2469d162f1db8072fec106f629872618082bbeac
diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb
rename to meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb
index a49d136..effab9d 100644
--- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.1.bb
@@ -9,7 +9,7 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887"
SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https"
-SRCREV = "8c9f87227b99ac74509b01602dc21d814fe91516"
+SRCREV = "23bfa4ab481edbad82a69ee385fc58ce03b63084"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb
index 4305e3b..4641b01 100644
--- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb
+++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb
@@ -1,6 +1,6 @@
require dfu-util_${PV}.bb
-inherit native deploy
+inherit deploy native
DEPENDS = "libusb1-native"
diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
index fc0d86e..93d6d58 100644
--- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
+++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
@@ -1,3 +1,8 @@
+From 14100c6fc2cce7260ca5ace81094aee0ae40dd07 Mon Sep 17 00:00:00 2001
+From: Paul Barker <pbarker@toganlabs.com>
+Date: Sun, 5 Nov 2017 22:07:30 +0000
+Subject: [PATCH] htop: Update to v2.0.2
+
We need to use pkg-config to find the ncurses library instead of the
ncurses*-config applications.
@@ -7,11 +12,15 @@
Upstream-status: Inappropriate
(`ncurses*-config` can be used outside of OpenEmbedded)
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
diff --git a/configure.ac b/configure.ac
-index 559dc4d..77aea22 100644
+index 115d894..0e0a1eb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB],
+@@ -205,10 +205,10 @@ AS_VAR_POPDEF([CACHEVAR])dnl
AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
if test "x$enable_unicode" = xyes; then
@@ -26,9 +35,9 @@
HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
-@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
+@@ -225,8 +225,8 @@ if test "x$enable_unicode" = xyes; then
+ # (at this point we already link against a working ncurses library with wide character support)
+ AC_SEARCH_LIBS([keypad], [tinfow tinfo])
else
- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb
similarity index 69%
rename from meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb
rename to meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb
index d677e36..8e9b95d 100644
--- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb
@@ -9,23 +9,25 @@
SRC_URI = "git://github.com/htop-dev/htop.git \
file://0001-Use-pkg-config.patch \
"
-SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9"
+SRCREV = "ce6d60e7def146c13d0b8bca4642e7401a0a8995"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
-PACKAGECONFIG ??= "cgroup \
- taskstats \
- unicode \
- linux-affinity \
- delayacct"
+PACKAGECONFIG ??= " \
+ unicode \
+ linux-affinity \
+ delayacct \
+"
PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz"
-PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup"
PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver"
-PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats"
+PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver"
PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode"
-PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity"
PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc"
+PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity"
PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid"
PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl"
+PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors"
+
+FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg"
diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
index 0ac08bd..59c6093 100644
--- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
@@ -5,8 +5,8 @@
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-PV = "0.342"
-SRCREV = "bdcc84fca6eb97bef9a8a8b04f71cbed8f32a986"
+PV = "0.343"
+SRCREV = "cce4969f24c213ae3ab45ee90a485b342ab74014"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb
similarity index 70%
rename from meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb
rename to meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb
index 86553b5..0d21a6b 100644
--- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb
+++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb
@@ -1,13 +1,13 @@
SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ccca8573ead8e965c130b6b2946a36ab"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=db3b99f230f9758fd77e4a0654e2266d"
SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=${BP}.tar.gz \
file://ldflags.patch \
"
-SRC_URI[sha256sum] = "90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e"
+SRC_URI[sha256sum] = "ab19f840712e6951e51c29e44c43b3b2fa42e93693f98f8969cc763a4fad56bf"
-DEPENDS= "openssl lua libpcre"
+DEPENDS= "openssl lua libpcre2"
EXTRA_OEMAKE_append = " PREFIX=${prefix}"
diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb
index 2467738..66c48da 100644
--- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb
@@ -6,8 +6,7 @@
DEPENDS = "file"
-SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \
-"
+SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "2a286193af88ab2ae3149748d4b46187"
SRC_URI[sha256sum] = "0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8"
@@ -28,3 +27,5 @@
do_compile_append() {
sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc
}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 98cc63e..212b1e7 100644
--- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -16,7 +16,7 @@
inherit autotools
-EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget"
+EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk"
do_install_append () {
install -d ${D}${sysconfdir}
diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
new file mode 100644
index 0000000..83c29a6
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
@@ -0,0 +1,36 @@
+From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Tue, 12 Jan 2021 03:05:38 +0000
+Subject: [PATCH] test: avoid the pfa test hang
+
+Per [1], the pfa test needs to install page-types and the pfa test
+will hang forever if there is no page-types installed.
+
+Improve the test script to avoid the pfa test hang.
+
+[1] https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/tree/tests/pfa/PFA_test_howto?id=7b776a8c005b60572f49797e81287540f99fff1f
+
+Upstream-Status: Submitted [https://github.com/andikleen/mcelog/pull/87]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ tests/test | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/test b/tests/test
+index 9623f4a..7c552a9 100755
+--- a/tests/test
++++ b/tests/test
+@@ -45,6 +45,9 @@ for conf in `ls *.conf`
+ do
+ log=`echo $conf | sed "s/conf/log/g"`
+ ./inject $conf
++ if [ "$1" = "pfa" ] ; then
++ which page-types > /dev/null 2>&1 || continue
++ fi
+ $D ../../mcelog --foreground --daemon --debug-numerrors --config $conf --logfile $log >> result
+
+ # let triggers finish
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb
index bdb080f..f3e018d 100644
--- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb
+++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_170.bb
@@ -6,6 +6,7 @@
SECTION = "System Environment/Base"
SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \
+ file://0001-test-avoid-the-pfa-test-hang.patch \
file://run-ptest \
"
diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb
similarity index 91%
rename from meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb
rename to meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb
index 0a1442f..b5e16d0 100644
--- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb
@@ -15,8 +15,8 @@
file://monitrc \
"
-SRC_URI[md5sum] = "200068f37847e3402f6a9b061c2d327e"
-SRC_URI[sha256sum] = "f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51"
+SRC_URI[md5sum] = "13a0804dae18ef08198c3ace72f9dd60"
+SRC_URI[sha256sum] = "d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c"
DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt"
diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb
similarity index 98%
rename from meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb
rename to meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb
index 112f676..dc147ef 100644
--- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb
+++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.1.bb
@@ -32,7 +32,7 @@
file://nss-fix-nsinstall-build.patch \
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
"
-SRC_URI[sha256sum] = "84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d"
+SRC_URI[sha256sum] = "2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
similarity index 97%
rename from meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
index 4c0f179..a282523 100644
--- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.56.bb
+++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.57.bb
@@ -7,7 +7,7 @@
# basically BSD. opensource.org does not record this license
# at present (so it is apparently not OSI certified).
LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b6dea6c170362fc46381fe3690c722cb \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
"
SECTION = "libs"
@@ -25,8 +25,8 @@
file://remove-user-host-pwd-from-version.patch \
"
-SRC_URI[md5sum] = "82a7dcf7aeaf95fdad16017c0ed9983a"
-SRC_URI[sha256sum] = "25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0"
+SRC_URI[md5sum] = "e3349456c3a66e5e6155be7ddc3f042c"
+SRC_URI[sha256sum] = "c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a"
DEPENDS = "util-linux groff-native"
diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb
similarity index 100%
rename from meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.20.1.bb
rename to meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb
diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb
similarity index 95%
rename from meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb
index 87a5752..4d4c310 100644
--- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.01.0.bb
@@ -7,7 +7,7 @@
file://0001-Do-not-overwrite-all-our-build-flags.patch \
file://basename-include.patch \
"
-SRC_URI[sha256sum] = "d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35"
+SRC_URI[sha256sum] = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"
DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb
new file mode 100644
index 0000000..7f6fcdb
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A regular expression library"
+HOMEPAGE = "https://github.com/google/re2/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760"
+
+SRCREV = "166dbbeb3b0ab7e733b278e8f42a84f6882b8a25"
+
+SRC_URI = "git://github.com/google/re2.git;branch=master"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE += " \
+ -DBUILD_SHARED_LIBS=ON \
+ -DRE2_BUILD_TESTING=OFF \
+"
+
+# Don't include so files in dev package
+FILES_${PN} = "${libdir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/cmake"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb
rename to meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb
index 3363570..ef36fdd 100644
--- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.8.bb
+++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.10.bb
@@ -9,10 +9,12 @@
DEPENDS_append_libc-musl = " libexecinfo"
LDFLAGS_append_libc-musl = " -lexecinfo"
-SRCREV = "7ebc497062de66881b71bbe7f54dabfda0129ac2"
+SRCREV = "9d1dbdf2d648644e0de9590c6291d7e7b72a1473"
SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https \
"
+PV .= "+git${SRCPV}"
+
S = "${WORKDIR}/git"
inherit cmake features_check mime-xdg
diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb
similarity index 94%
rename from meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb
rename to meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb
index c6159c4..b6988ba 100644
--- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.35.bb
+++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.36.bb
@@ -10,7 +10,7 @@
SRC_URI = "git://github.com/abrt/satyr.git \
file://0002-fix-compile-failure-against-musl-C-library.patch \
"
-SRCREV = "8690a1f83adc5a7a83e856ebc7adf6310bbd3b9f"
+SRCREV = "a1f232b7dbca7ff787076fcfb63ce7d7fb15b753"
S = "${WORKDIR}/git"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
index 56c2d44..cde26df 100644
--- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
@@ -4,9 +4,9 @@
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381"
-BPV = "0.8.6"
+BPV = "0.8.7"
PV = "${BPV}"
-SRCREV = "9ce73aab05873b2d3996bd21076305463133f102"
+SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
deleted file mode 100644
index a444901..0000000
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Tue, 15 Dec 2020 22:29:56 +0000
-Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10.
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-
----
- src/VBox/Additions/linux/drm/vbox_drv.h | 10 +-
- src/VBox/Additions/linux/drm/vbox_fb.c | 2 +-
- .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
- src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++--
- 4 files changed, 99 insertions(+), 14 deletions(-)
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h
-index 8c85371749..7937f2f2d2 100644
---- a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -175,6 +175,9 @@
- #include <drm/ttm/ttm_placement.h>
- #include <drm/ttm/ttm_memory.h>
- #include <drm/ttm/ttm_module.h>
-+#if RTLNX_VER_MIN(5,10,0)
-+# include <drm/ttm/ttm_resource.h>
-+#endif
-
- #include "vboxvideo_guest.h"
- #include "vboxvideo_vbe.h"
-@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
- int vbox_gem_create(struct drm_device *dev,
- u32 size, bool iskernel, struct drm_gem_object **obj);
-
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr);
-+#define VBOX_MEM_TYPE_VRAM 0x1
-+#define VBOX_MEM_TYPE_SYSTEM 0x2
-+
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr);
- int vbox_bo_unpin(struct vbox_bo *bo);
-
- static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
-@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo)
- ttm_bo_unreserve(&bo->bo);
- }
-
--void vbox_ttm_placement(struct vbox_bo *bo, int domain);
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type);
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
-
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
-index adead98d3d..7182d9da1a 100644
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL);
- if (ret) {
- vbox_bo_unreserve(bo);
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
-index ce7d135cb6..5557db5ef8 100644
---- a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc,
- if (ret)
- return ret;
-
-- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
-+ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr);
- vbox_bo_unreserve(bo);
- if (ret)
- return ret;
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bf87aabc05..5eac926a42 100644
---- a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -41,6 +41,7 @@
- #define PLACEMENT_FLAGS(placement) ((placement).flags)
- #endif
-
-+
- static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd)
- {
- return container_of(bd, struct vbox_private, ttm.bdev);
-@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo)
- return false;
- }
-
-+#if RTLNX_VER_MAX(5,10,0)
- static int
- vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
- struct ttm_mem_type_manager *man)
-@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
-
- return 0;
- }
-+#endif
-
- static void
- vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
-@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
- if (!vbox_ttm_bo_is_vbox_bo(bo))
- return;
-
-- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM);
-+ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM);
- *pl = vboxbo->placement;
- }
-
-@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo,
- return 0;
- }
-
-+#if RTLNX_VER_MAX(5,10,0)
- static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
- struct ttm_mem_reg *mem)
- {
-- struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- struct vbox_private *vbox = vbox_bdev(bdev);
-+ struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
-
- mem->bus.addr = NULL;
- mem->bus.offset = 0;
-@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
- }
- return 0;
- }
-+#else
-+static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
-+ struct ttm_resource *mem)
-+{
-+ struct vbox_private *vbox = vbox_bdev(bdev);
-+ mem->bus.addr = NULL;
-+ mem->bus.offset = 0;
-+ mem->size = mem->num_pages << PAGE_SHIFT;
-+ mem->start = 0;
-+ mem->bus.is_iomem = false;
-+ switch (mem->mem_type) {
-+ case TTM_PL_SYSTEM:
-+ /* system memory */
-+ return 0;
-+ case TTM_PL_VRAM:
-+ mem->bus.offset = mem->start << PAGE_SHIFT;
-+ mem->start = pci_resource_start(vbox->dev->pdev, 0);
-+ mem->bus.is_iomem = true;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+ return 0;
-+}
-+#endif
-
-+
-+
-+#if RTLNX_VER_MIN(5,10,0)
-+static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
-+ struct ttm_resource *mem)
-+{
-+}
-+#else
- static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
- struct ttm_mem_reg *mem)
- {
- }
-+#endif
-
-+#if RTLNX_VER_MIN(5,10,0)
-+static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt)
-+{
-+ ttm_tt_fini(tt);
-+ kfree(tt);
-+}
-+#else
- static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
- {
- ttm_tt_fini(tt);
-@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
- static struct ttm_backend_func vbox_tt_backend_func = {
- .destroy = &vbox_ttm_backend_destroy,
- };
-+#endif
-
- #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
- static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
-@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo,
- if (!tt)
- return NULL;
-
-+#if RTLNX_VER_MAX(5,10,0)
- tt->func = &vbox_tt_backend_func;
-+#endif
- #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
- if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
- #else
-@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm)
-
- static struct ttm_bo_driver vbox_bo_driver = {
- .ttm_tt_create = vbox_ttm_tt_create,
-+#if RTLNX_VER_MIN(5,10,0)
-+ .ttm_tt_destroy = vbox_ttm_tt_destroy,
-+#endif
- #if RTLNX_VER_MAX(4,17,0)
- .ttm_tt_populate = vbox_ttm_tt_populate,
- .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate,
- #endif
-+#if RTLNX_VER_MAX(5,10,0)
- .init_mem_type = vbox_bo_init_mem_type,
-+#endif
- #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
- .eviction_valuable = ttm_bo_eviction_valuable,
- #endif
-@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox)
- #endif
- }
-
-+#if RTLNX_VER_MIN(5,10,0)
-+ ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false,
-+ vbox->available_vram_size >> PAGE_SHIFT);
-+#else
- ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM,
- vbox->available_vram_size >> PAGE_SHIFT);
-+#endif
- if (ret) {
- DRM_ERROR("Failed ttm VRAM init: %d\n", ret);
- goto err_device_release;
-@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox)
- #endif
- }
-
--void vbox_ttm_placement(struct vbox_bo *bo, int domain)
-+void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type)
- {
- u32 c = 0;
- #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
-@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain)
- bo->placement.placement = bo->placements;
- bo->placement.busy_placement = bo->placements;
-
-- if (domain & TTM_PL_FLAG_VRAM)
-+ if (mem_type & VBOX_MEM_TYPE_VRAM) {
-+#if RTLNX_VER_MIN(5,10,0)
-+ bo->placements[c].mem_type = TTM_PL_VRAM;
-+ PLACEMENT_FLAGS(bo->placements[c++]) =
-+ TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
-+#else
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
-- if (domain & TTM_PL_FLAG_SYSTEM)
-+#endif
-+ }
-+ if (mem_type & VBOX_MEM_TYPE_SYSTEM) {
-+#if RTLNX_VER_MIN(5,10,0)
-+ bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+ PLACEMENT_FLAGS(bo->placements[c++]) =
-+ TTM_PL_MASK_CACHING;
-+#else
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-- if (!c)
-+#endif
-+ }
-+ if (!c) {
-+#if RTLNX_VER_MIN(5,10,0)
-+ bo->placements[c].mem_type = TTM_PL_SYSTEM;
-+ PLACEMENT_FLAGS(bo->placements[c++]) =
-+ TTM_PL_MASK_CACHING;
-+#else
- PLACEMENT_FLAGS(bo->placements[c++]) =
- TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
-+#endif
-+ }
-
- bo->placement.num_placement = c;
- bo->placement.num_busy_placement = c;
-@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
- vboxbo->bo.bdev->dev_mapping = dev->dev_mapping;
- #endif
-
-- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
-+ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
-
- acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
- sizeof(struct vbox_bo));
-@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
- #endif
- }
-
--int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
-+int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
- {
- #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
- struct ttm_operation_ctx ctx = { false, false };
-@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
- return 0;
- }
-
-- vbox_ttm_placement(bo, pl_flag);
-+ vbox_ttm_placement(bo, mem_type);
-
- for (i = 0; i < bo->placement.num_placement; i++)
- PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
-@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
- if (bo->kmap.virtual)
- ttm_bo_kunmap(&bo->kmap);
-
-- vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
-+ vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM);
-
- for (i = 0; i < bo->placement.num_placement; i++)
- PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
---
-2.19.1
-
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
deleted file mode 100644
index db27cb8..0000000
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 2a6e3cf63f58e289802a11faad5fb495e2d04e97 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Wed, 9 Dec 2020 18:59:04 +0000
-Subject: [PATCH] Runtime/memobj-r0drv-linux.c: Changes to support the upcoming
- 5.10 kernel, bugref:9879
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87074 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 68 ++++++++++++++++++-
- 1 file changed, 67 insertions(+), 1 deletion(-)
-
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -56,9 +56,19 @@
- * Whether we use alloc_vm_area (3.2+) for executable memory.
- * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
- * better W^R compliance (fExecutable flag). */
--#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING)
-+#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING)
- # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
- #endif
-+/** @def IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+ * alloc_vm_area was removed with 5.10 so we have to resort to a different way
-+ * to allocate executable memory.
-+ * It would be possible to remove IPRT_USE_ALLOC_VM_AREA_FOR_EXEC and use
-+ * this path execlusively for 3.2+ but no time to test it really works on every
-+ * supported kernel, so better play safe for now.
-+ */
-+#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING)
-+# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+#endif
-
- /*
- * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
-@@ -502,6 +512,46 @@ static void rtR0MemObjLinuxFreePages(PRT
- }
-
-
-+#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
-+/**
-+ * User data passed to the apply_to_page_range() callback.
-+ */
-+typedef struct LNXAPPLYPGRANGE
-+{
-+ /** Pointer to the memory object. */
-+ PRTR0MEMOBJLNX pMemLnx;
-+ /** The page protection flags to apply. */
-+ pgprot_t fPg;
-+} LNXAPPLYPGRANGE;
-+/** Pointer to the user data. */
-+typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE;
-+/** Pointer to the const user data. */
-+typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
-+
-+/**
-+ * Callback called in apply_to_page_range().
-+ *
-+ * @returns Linux status code.
-+ * @param pPte Pointer to the page table entry for the given address.
-+ * @param uAddr The address to apply the new protection to.
-+ * @param pvUser The opaque user data.
-+ */
-+#ifdef __i386__
-+static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
-+#else
-+static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
-+#endif
-+{
-+ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
-+ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
-+ size_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT;
-+
-+ set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg));
-+ return 0;
-+}
-+#endif
-+
-+
- /**
- * Maps the allocation into ring-0.
- *
-@@ -584,6 +634,11 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO
- else
- # endif
- {
-+# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+ if (fExecutable)
-+ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
-+# endif
-+
- # ifdef VM_MAP
- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
- # else
-@@ -1851,6 +1906,21 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect(
- preempt_enable();
- return VINF_SUCCESS;
- }
-+# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
-+ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
-+ if ( pMemLnx->fExecutable
-+ && pMemLnx->fMappedToRing0)
-+ {
-+ LNXAPPLYPGRANGE Args;
-+ Args.pMemLnx = pMemLnx;
-+ Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
-+ int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub,
-+ rtR0MemObjLinuxApplyPageRange, (void *)&Args);
-+ if (rcLnx)
-+ return VERR_NOT_SUPPORTED;
-+
-+ return VINF_SUCCESS;
-+ }
- # endif
-
- NOREF(pMem);
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
deleted file mode 100644
index 3cfe2e9..0000000
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a276f8bc5e4515f7ea51e2c56e0e634a723ca104 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Tue, 8 Dec 2020 13:52:53 +0000
-Subject: [PATCH] linser/vboxsf: Adjustment for linux 5.10 - TASK_SIZE_MAX
- replaces USER_DS.seg. bugref:9879
-
-Upstream-Status: Backport
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@87053 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- src/VBox/Additions/linux/sharedfolders/regops.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
-index e1fad3d820..401fd69930 100644
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -147,7 +147,11 @@ static int vbsf_iov_iter_detect_type(struct iovec const *paIov, size_t cSegs)
- while (cSegs-- > 0) {
- if (paIov->iov_len > 0) {
- if (access_ok(VERIFY_READ, paIov->iov_base, paIov->iov_len))
-+#if RTLNX_VER_MIN(5,10,0)
-+ return (uintptr_t)paIov->iov_base >= TASK_SIZE_MAX ? ITER_KVEC : 0;
-+#else
- return (uintptr_t)paIov->iov_base >= USER_DS.seg ? ITER_KVEC : 0;
-+#endif
- AssertMsgFailed(("%p LB %#zx\n", paIov->iov_base, paIov->iov_len));
- break;
- }
-@@ -1401,7 +1405,10 @@ static int vbsf_lock_user_pages_failed_check_kernel(uintptr_t uPtrFrom, size_t c
- /*
- * Check that this is valid user memory that is actually in the kernel range.
- */
--#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
-+#if RTLNX_VER_MIN(5,10,0)
-+ if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
-+ && uPtrFrom >= TASK_SIZE_MAX)
-+#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1)
- if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
- && uPtrFrom >= USER_DS.seg)
- #else
---
-2.19.1
-
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
new file mode 100644
index 0000000..a6b0a04
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
@@ -0,0 +1,23 @@
+Origin: https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg461494.html
+From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
+Date: Thu, 24 Dec 2020 23:03:55 +0100
+Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it
+
+---
+ kernel-5.10.patch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel-5.10.patch b/kernel-5.10.patch
+index b28d6e0..729235d 100644
+--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
+ * @param uAddr The address to apply the new protection to.
+ * @param pvUser The opaque user data.
+ */
+-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
+ {
+ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
+ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
similarity index 88%
rename from meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb
rename to meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
index ff639c0..d620e98 100644
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb
@@ -13,12 +13,10 @@
SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
- file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \
- file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \
- file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \
+ file://kernel-5.10.patch \
"
-SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe"
-SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1"
+SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b"
+SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"
S ?= "${WORKDIR}/vbox_module"
S_task-patch = "${WORKDIR}/${VBOX_NAME}"
diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
new file mode 100644
index 0000000..a5a298a
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch
@@ -0,0 +1,22 @@
+xmlsec1: Fix configure QA error caused by host lookup path
+
+ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
+
+It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
+
+--- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000
++++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000
+@@ -250,8 +250,8 @@
+ dnl ==========================================================================
+ dnl Common installation locations
+ dnl ==========================================================================
+-COMMON_INCLUDE_DIR="/usr/include /usr/local/include"
+-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib"
++COMMON_INCLUDE_DIR="${STAGING_INCDIR}"
++COMMON_LIB_DIR="${STAGING_LIBDIR}"
+ case $host in
+ i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;;
+ x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;;
diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
index 803016c..3464f2f 100644
--- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
+++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb
@@ -19,6 +19,7 @@
file://xmlsec1-examples-allow-build-in-separate-dir.patch \
file://0001-nss-nspr-fix-for-multilib.patch \
file://run-ptest \
+ file://ensure-search-path-non-host.patch \
"
SRC_URI[md5sum] = "182f5cbdfb8ddbac535c04470c170dc3"
diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
index 170e0bf..becf991 100644
--- a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
+++ b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
@@ -14,7 +14,7 @@
S = "${WORKDIR}/${XORG_PN}-${PV}"
B = "${WORKDIR}/build"
-inherit native pkgconfig
+inherit pkgconfig native
do_configure[noexec] = "1"
diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch
deleted file mode 100644
index c93af32..0000000
--- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 2 Dec 2016 17:38:51 -0800
-Subject: [PATCH] make relies GNU extentions
-
-We get errors like
-`%'-style pattern rules are a GNU make extension
-
-Disable this warning, since we use gmake with OE
-anyway
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_PREREQ([2.61])
- AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-error foreign subdir-objects std-options dist-bzip2])
- AC_CONFIG_HEADERS([include/config.h])
- AC_CONFIG_SRCDIR(zbar/scanner.c)
- LT_PREREQ([2.2])
-@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION
- [Library revision])
-
- AM_CPPFLAGS="-I$srcdir/include"
--AM_CFLAGS="-Wall -Wno-parentheses -Werror"
-+AM_CFLAGS="-Wall -Wno-parentheses"
- AM_CXXFLAGS="$AM_CFLAGS"
- AC_SUBST([AM_CPPFLAGS])
- AC_SUBST([AM_CFLAGS])
diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
new file mode 100644
index 0000000..d7ca152
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
@@ -0,0 +1,35 @@
+From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001
+From: Daniel Gomez <dagmcr@gmail.com>
+Date: Sun, 17 Jan 2021 23:32:51 +0100
+Subject: [PATCH 1/2] qt: Create subdir in Makefile
+
+Create builddir/qt subdir when --with-qt5 is enabled.
+
+Fixes the following error:
+
+moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore
+-I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp
+moc: Cannot create qt/moc_QZBar.cpp
+make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1
+
+Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
+---
+ qt/Makefile.am.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc
+index b099c2b..c98fbeb 100644
+--- a/qt/Makefile.am.inc
++++ b/qt/Makefile.am.inc
+@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h
+ $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
+
+ qt/moc_%.cpp: include/zbar/%.h
++ @$(mkdir_p) qt 2>/dev/null
+ $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch
new file mode 100644
index 0000000..a1c27b8
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch
@@ -0,0 +1,40 @@
+From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001
+From: Daniel Gomez <dagmcr@gmail.com>
+Date: Sun, 17 Jan 2021 23:33:19 +0100
+Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile
+
+Create builddir/zbarcam when --with-qt5 is enabled.
+
+Fixes the following error:
+
+moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB
+-DQT_CORE_LIB
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui
+-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore
+-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o
+zbarcam/moc_zbarcam_qt.h
+moc: Cannot create zbarcam/moc_zbarcam_qt.h
+make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1
+
+Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
+---
+ zbarcam/Makefile.am.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
+index b6de82c..e90c50c 100644
+--- a/zbarcam/Makefile.am.inc
++++ b/zbarcam/Makefile.am.inc
+@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h
+
+
+ zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp
++ @$(mkdir_p) zbarcam 2>/dev/null
+ $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@
+ endif
+
+--
+2.29.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb
index 181d7ae..dae9122 100644
--- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb
@@ -1,31 +1,59 @@
-DESCRIPTION = "2D barcode scanner toolkit."
+HOMEPAGE = "https://github.com/mchehab/zbar"
+SUMMARY = "A bar code library"
+DESRIPTION = "ZBar is an open source software suite for reading bar codes \
+from various sources, such as video streams, image files and raw \
+intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, \
+Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code"
SECTION = "graphics"
+
LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef"
-DEPENDS = "pkgconfig intltool-native libpng jpeg"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4015840237ca7f0175cd626f78714ca8"
-
-PV = "0.10+git${SRCPV}"
-
-# iPhoneSDK-1.3.1 tag
-SRCREV = "67003d2a985b5f9627bee2d8e3e0b26d0c474b57"
-SRC_URI = "git://github.com/ZBar/Zbar \
- file://0001-make-relies-GNU-extentions.patch \
+SRC_URI = "git://github.com/mchehab/zbar.git;branch=master \
+ file://0001-qt-Create-subdir-in-Makefile.patch \
+ file://0002-zbarcam-Create-subdir-in-Makefile.patch \
"
+SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37"
+
S = "${WORKDIR}/git"
+PV = "0.23.1+git${SRCPV}"
-inherit autotools pkgconfig
+DEPENDS += "xmlto-native"
-PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG ??= "\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+"
-PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp"
+PACKAGECONFIG ??= "video python3"
-EXTRA_OECONF = "--without-imagemagick --without-qt --without-python --disable-video --without-gtk"
+inherit autotools pkgconfig gettext \
+ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)}
-CPPFLAGS += "-Wno-error"
+PACKAGECONFIG[x11] = "--with-x, --without-x, libxv"
+PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l"
+PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg"
+PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3"
+PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3"
+PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase"
+PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick"
-do_install_append() {
- #remove usr/bin if empty
- rmdir ${D}${bindir}
+FILES_${PN} += "${bindir} \
+ ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \
+"
+
+CPPFLAGS_append = "\
+ ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\
+ -I${STAGING_INCDIR}/QtX11Extras \
+ -I${STAGING_INCDIR}/dbus-1.0 \
+ -I${STAGING_LIBDIR}/dbus-1.0/include \
+ ', '', d)} \
+"
+
+TARGET_CXXFLAGS_append = " -fPIC"
+
+do_prepare_recipe_sysroot_gettext() {
+ install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/
}
+addtask do_prepare_recipe_sysroot_gettext after do_prepare_recipe_sysroot before do_configure
\ No newline at end of file