From c1d34338068e7d99e34db98597b2d8b3b58e6c2a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 9 Sep 2019 14:56:00 -0400 Subject: meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (2): gpsd: gpscat no longer uses python-curses in 3.19 dejagnu: Remove, moved to oe-core Alex Kiernan (1): zstd: Upgrade 1.4.2 -> 1.4.3 Alistair Francis (2): python3-twine: Initial commit of 1.13.0 python3-pytest-asyncio: Initial commit of 0.10.0 Andreas Müller (4): fluidsynth: upgrade 2.0.5 -> 2.0.6 imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe xfce4-settings: upgrade 4.14.0 -> 4.14.1 xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6 Andrej Valek (1): nodejs: 10.16.2 -> 10.16.3 Changqing Li (7): yail: update UPSTREAM_CHECK_GITTAGREGEX iscsi-initiator-utils: 2.0.876 -> 2.0.877 postgresql: 11.4 -> 11.5 satyr: upgrade 0.27 -> 0.28 freeradius: upgrade 3.0.17 -> 3.0.19 drbd-utils: switch to add patch from change source in do_configure xfsdump: support usrmerge Gianfranco Costamagna (2): grpc: don't use unexisting gettid function on glibc 2.29, it has been implemented only in 2.30 grpc: Change gettid patch with the upstream merged version Hongxu Jia (1): lvm2: fix blkdeactivate failed with command not found Kai Kang (4): lmbench: update script lmbench-run mariadb: fix file conflictions when multilib enabled php: sync with apache2's change apache2: fix multilib file conflicts Khem Raj (11): iperf2: Fix build with latest libc++ iscsi-initiator-utils: Inherit pkgconfig and override PKG_CONFIG klibc: Fix build with 5.2+ kernel headers samba: Fix configure tests to work with clang ltrace: Fix build on mips python-jinja2: Make asyncio specific to python3 module alone python3-cmd2: Add to blacklist nodejs: Mark incompatible with risc-v drbd,netkit-rusers: Blacklist packages vboxguestdrivers,can-isotp,bpftool: Add to Blacklist strongswan: Fix do_patch fuzz Li Zhou (1): tipcutils: ptts: Set recv buffer size to max to receive as many packets as possible Martin Jansa (1): python3-pyatspi: restrict with GTK2DISTROFEATURES Oleksandr Kravchuk (1): nano: update to 4.4 Qi.Chen@windriver.com (2): python-hyperlink: rdepend on python-idna python-jinja2: rdepend on asyncio module Robert Yang (1): netcf: Fix do_configure failed when multilib Scott Ellis (1): wireguard: Upgrade 20190702 to 20190905 Yuan Chao (10): strongswan: upgrade 5.8.0 -> 5.8.1 php: upgrade 7.3.8 -> 7.3.9 libtalloc: upgrade 2.2.0 -> 2.3.0 numactl: upgrade 2.0.12 -> 2.0.13 uhubctl: upgrade 2.0.0 -> 2.1.0 python-pytest: upgrade 5.1.1 -> 5.1.2 python-stevedore: upgrade 1.30.1 -> 1.31.0 python-dbus: upgrade 1.2.8 -> 1.2.10 python-pbr: upgrade 5.4.2 -> 5.4.3 python-pyasn1: upgrade 0.4.6 -> 0.4.7 Zang Ruochen (3): python-paste: upgrade 3.1.1 -> 3.2.0 libnet-dns-perl: upgrade 1.20 -> 1.21 hwdata: upgrade 0.326 -> 0.327 Zheng Ruoqin (1): python-cmd2: Add python3 version aehs29@gmail.com (1): remmina: Add recipe for the remmina remote desktop client Change-Id: I11f4319f53655ab389fcb7a0ce4f22b71f9a8da2 Signed-off-by: Brad Bishop --- .../recipes-extended/socketcan/can-isotp_git.bb | 2 + ...et-recv-buffer-size-too-max-to-receive-as.patch | 66 ++++++++++++++++++++++ .../recipes-extended/tipcutils/tipcutils_git.bb | 1 + .../meta-oe/recipes-extended/zstd/zstd_1.4.2.bb | 35 ------------ .../meta-oe/recipes-extended/zstd/zstd_1.4.3.bb | 35 ++++++++++++ 5 files changed, 104 insertions(+), 35 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb (limited to 'meta-openembedded/meta-oe/recipes-extended') diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 5df44f21f..e40e1cd26 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -10,3 +10,5 @@ S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" + +PNBLACKLIST[can-isotp] = "Kernel module Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch new file mode 100644 index 000000000..39f899cf1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch @@ -0,0 +1,66 @@ +From 4e4c8c7a1cca2125e2bf2a67cbab0bdbd78fdb86 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Tue, 30 Jul 2019 13:24:22 +0800 +Subject: [PATCH] ptts: Set recv buffer size too max to receive as many + packets as possible + +Flooding multicast may make the rcv buffer overrun and is considered +premature messages later and thus cause the following error. + +"Ignoring premature msg 16, currently handling 12" + +This patch sets SO_RCVBUF the of socket to max int value to receive as many +packets as possible, and give a hint to user when possible overrun occurs. Note +that the value of SO_RCVBUF will be limited up to min(INT_MAX/2, +sysctl_rmem_max) in kernel. + +Signed-off-by: He Zhe + +Upstream-Status: Backport + +Signed-off-by: Li Zhou +--- + ptts/tipc_ts_server.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/ptts/tipc_ts_server.c b/ptts/tipc_ts_server.c +index a286daa..3a2f96f 100644 +--- a/ptts/tipc_ts_server.c ++++ b/ptts/tipc_ts_server.c +@@ -641,8 +641,9 @@ void server_mcast + if (rc < 0) + err("multicast message not received"); + if (msgno != *(int*) buf) { +- dbg1("Ignoring premature msg %u, currently handling %u\n", +- *(int*)buf, msgno); ++ dbg1("Ignoring premature msg %u, currently handling %u\n" ++ "You can enlarge /proc/sys/net/core/rmem_max and try again\n", ++ *(int*)buf, msgno); + continue; + } + rc = recvfrom(sd[i], buf, expected_szs[numSubTest], +@@ -687,8 +688,21 @@ void server_test_multicast(void) + FD_ZERO(&readfds); + + for (i = 0; i < TIPC_MCAST_SOCKETS; i++) { ++ int optval = (int)(~0U >> 1); ++ socklen_t optlen = sizeof(optval); ++ int rc = 0; ++ + sd[i] = createSocketTIPC (SOCK_RDM); + FD_SET(sd[i], &readfds); ++ ++ /* ++ * Flooding multicast may make the rcv buffer overrun and considered premature msg later. ++ * Set SO_RCVBUF to max int value to receive as many packets as possible. ++ * Note that it will be limited up to min(INT_MAX/2, sysctl_rmem_max) in kernel. ++ */ ++ rc = setsockopt(sd[i], SOL_SOCKET, SO_RCVBUF, (const char*)&optval, optlen); ++ if(rc != 0) ++ printf("Failed to set SO_RCVBUF of %d: %s\n", sd[i], strerror(errno)); + } + + server_bindMulticast( 0, 99, sd[0]); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 054e0acc8..637770af2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ + file://0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb deleted file mode 100644 index b5d95d940..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Zstandard - Fast real-time compression algorithm" -DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ -real-time compression scenarios at zlib-level and better compression ratios. \ -It's backed by a very fast entropy stage, provided by Huff0 and FSE library." -HOMEPAGE = "http://www.zstd.net/" -SECTION = "console/utils" - -LICENSE = "BSD-3-Clause & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ - file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" - -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" - -SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" -PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" -PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" - -# See programs/README.md for how to use this -ZSTD_LEGACY_SUPPORT ??= "4" - -do_compile () { - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -} - -do_install () { - oe_runmake install 'DESTDIR=${D}' -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb new file mode 100644 index 000000000..e97b4efb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb @@ -0,0 +1,35 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" + +SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3