diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:56:00 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:57:26 +0300 |
| commit | c1d34338068e7d99e34db98597b2d8b3b58e6c2a (patch) | |
| tree | 9d67e75edf68185cb9bd927a46accb4da1076174 /meta-openembedded/meta-oe | |
| parent | 8b5c4203192fdd08369251934d67889367169f44 (diff) | |
| download | openbmc-c1d34338068e7d99e34db98597b2d8b3b58e6c2a.tar.xz | |
meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe')
31 files changed, 309 insertions, 127 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch new file mode 100644 index 000000000..45c69ca06 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch @@ -0,0 +1,58 @@ +From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Sep 2019 15:40:52 -0700 +Subject: [PATCH] Detect bool definition considering stdbool.h being present + +This helps in defining the value correctly on different platforms e.g. +clang/libc++ depends on the definition coming from stdbool.h +current builds fail to compile therefore + +TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral<int>' +template <> struct __libcpp_is_integral<int> : public true_type {}; + ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/dast.m4 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/m4/dast.m4 ++++ b/m4/dast.m4 +@@ -11,7 +11,12 @@ AH_TEMPLATE([false]) + + AC_DEFUN(DAST_CHECK_BOOL, [ + +-AC_CHECK_SIZEOF(bool) ++if test "$ac_cv_header_stdbool_h" = yes; then ++ AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>]) ++else ++ AC_CHECK_SIZEOF(bool) ++fi ++ + if test "$ac_cv_sizeof_bool" = 0 ; then + AC_DEFINE(bool, int) + fi +--- a/configure.ac ++++ b/configure.ac +@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [], + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) ++AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) + + dnl =================================================================== + dnl Checks for typedefs, structures +--- a/include/util.h ++++ b/include/util.h +@@ -56,7 +56,9 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +- ++#ifdef HAVE_STDBOOL_H ++# include <stdbool.h> ++#endif + #ifdef __cplusplus + extern "C" { + #endif diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb index 2bd552d1d..4a520e3be 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb @@ -4,7 +4,9 @@ SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff" -SRC_URI = " ${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \ + file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \ +" SRC_URI[md5sum] = "31ea1c6d5cbf80b16ff3abe4288dad5e" SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run index e904c75e4..2716bf935 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run @@ -4,7 +4,6 @@ # Javier Fernandez-Sanguino. # Distributed under the GPL SHAREDIR=/usr/share/lmbench/ -BINDIR=/usr/lib/lmbench/ SCRIPTSDIR=$SHAREDIR/scripts RESULTSDIR=$SHAREDIR/results CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config` diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 8e6e803a8..7e20b7da6 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -54,7 +54,7 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/default/volatiles \ - ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${bindir} ${D}${mandir} \ ${D}${datadir}/lmbench/scripts echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ @@ -71,7 +71,6 @@ do_install () { mv ${D}${bindir}/line ${D}${bindir}/lm_line install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ - -e 's,^BINDIR=.*$,BINDIR=${libdir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} @@ -89,4 +88,4 @@ pkg_postinst_${PN} () { } RDEPENDS_${PN} = "perl" -FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench" +FILES_${PN} += "${datadir}/lmbench" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index c77a1e54e..5bb0beb7a 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ RDEPENDS_packagegroup-meta-oe-devtools ="\ android-tools android-tools-conf bootchart breakpad \ capnproto cgdb cscope ctags \ - debootstrap dejagnu dmalloc flatbuffers \ + debootstrap dmalloc flatbuffers \ giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ kconfig-frontends lemon libedit libgee libsombok3 \ libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ @@ -138,7 +138,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ p7zip p8platform libfile-fnmatch-perl \ rarpd redis rrdtool libfastjson librelp rsyslog sanlock \ sblim-cmpi-devel sblim-sfc-common sblim-sfcc \ - scsirastools sgpio smartmontools snappy can-isotp \ + scsirastools sgpio smartmontools snappy \ can-utils libsocketcan tipcutils tiptop \ tmux uml-utilities upm vlock volume-key wipe zlog zram \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ @@ -181,10 +181,10 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ " RDEPENDS_packagegroup-meta-oe-kernel ="\ - agent-proxy bpftool broadcom-bt-firmware cpupower \ + agent-proxy broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ " -RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "bpftool crash minicoredumper" +RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash minicoredumper" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 9a398b308..9ddf2bee5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -28,7 +28,9 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd +inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script + +MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mysql_install_db ${PN}-server:${bindir}/mysqld_safe" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb index 0e7ddc801..fd4200a73 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb @@ -8,5 +8,5 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ " -SRC_URI[md5sum] = "dab5eed8a5f9204bf2f03a209eead4c3" -SRC_URI[sha256sum] = "02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b" +SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" +SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch deleted file mode 100644 index 2eb8af713..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: dejagnu-1.4.4/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/configure.in 2014-07-18 07:05:49.997481207 +0000 -+++ dejagnu-1.4.4/configure.in 2014-07-18 07:05:50.085481210 +0000 -@@ -1,10 +1,10 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.13) --AC_INIT(runtest.exp) -+AC_INIT(dejagnu, 1.4.4) - dnl AC_CONFIG_AUX_DIR(..) - - dnl These are required by automake --AM_INIT_AUTOMAKE(dejagnu, 1.4.4) -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AC_PROG_MAKE_SET - -Index: dejagnu-1.4.4/example/calc/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/calc/configure.in 2002-04-26 03:32:40.000000000 +0000 -+++ dejagnu-1.4.4/example/calc/configure.in 2014-07-18 07:11:59.085491266 +0000 -@@ -1,8 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.5) --AC_INIT(calc.c) -+AC_INIT(calc, 1.1) - AM_CONFIG_HEADER(calc.h) --AM_INIT_AUTOMAKE(calc, 1.1) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_INSTALL -Index: dejagnu-1.4.4/example/hello/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/hello/configure.in 2002-08-31 05:46:16.000000000 +0000 -+++ dejagnu-1.4.4/example/hello/configure.in 2014-07-18 07:12:23.721491937 +0000 -@@ -25,7 +25,7 @@ - # ------------------------------------------------------------------------ - - AC_INIT(helloworld, demo-version, philip.wilsey@ieee.org) --AM_INIT_AUTOMAKE(helloworld, demo-version) -+AM_INIT_AUTOMAKE([foreign]) - - #AC_CONFIG_SRCDIR([hello.cc]) - #AC_CONFIG_HEADER([config.h]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb deleted file mode 100644 index 63726b232..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNU unit testing framework, written in Expect and Tcl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" -SECTION = "devel" - -inherit autotools - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://configure.patch" - -SRC_URI[md5sum] = "053f18fd5d00873de365413cab17a666" -SRC_URI[sha256sum] = "d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch new file mode 100644 index 000000000..e4490bbb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch @@ -0,0 +1,30 @@ +kernel headers have restructured mips syscall generation in kernel +in recent versions, however, ltrace still has logic to define the +syscall numbers based on old logic, this patch includes the legacy +UAPI headers to get these defines + +Fixes errors e.g. +../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function) + const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/sysdeps/linux-gnu/mips/trace.c ++++ b/sysdeps/linux-gnu/mips/trace.c +@@ -34,6 +34,16 @@ + #include <assert.h> + #include <asm/unistd.h> + ++#ifndef __NR_O32_Linux ++#include <asm/unistd_nr_o32.h> ++#endif ++#ifndef __NR_N32_Linux ++#include <asm/unistd_nr_n64.h> ++#endif ++#ifndef __NR_N64_Linux ++#include <asm/unistd_nr_n32.h> ++#endif ++ + #include "backend.h" + #include "common.h" + #include "debug.h" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 3dc269c80..ead637cb7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ + file://include_unistd_nr.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb index d464e9d8a..a978eebe4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb @@ -12,6 +12,9 @@ COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ @@ -23,8 +26,8 @@ SRC_URI_append_class-target = " \ file://0002-Using-native-torque.patch \ " -SRC_URI[md5sum] = "fa70b942c5e3379ce96219fe90f50c8f" -SRC_URI[sha256sum] = "6cbc17795e9259dce7a8f5fd5a2e46f9e6920fb48b7d9539c5b2faa5bb5db4d8" +SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f" +SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index 4c0617c49..d738d2d93 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -172,10 +172,8 @@ do_install_append_class-target() { done if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - install -d ${D}${libdir}/apache2/modules install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 755 libs/libphp${PHP_MAJOR_VERSION}.so ${D}${libdir}/apache2/modules install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf cat ${S}/php.ini-production | \ @@ -211,7 +209,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d FILES_${PN}-dbg =+ "${bindir}/.debug \ - ${libdir}/apache2/modules/.debug" + ${libexecdir}/apache2/modules/.debug" FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-phar = "${bindir}/phar*" @@ -237,7 +235,7 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES_${PN} = "${PHP_LIBDIR}/php" -FILES_${PN} += "${bindir}" +FILES_${PN} += "${bindir} ${libexecdir}/apache2" SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb index 072d53a09..4d656da0f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb @@ -15,8 +15,8 @@ SRC_URI_append_class-target = " \ file://xfail_two_bug_tests.patch \ " -SRC_URI[md5sum] = "4ffc06e803cd782a95483eb02213301e" -SRC_URI[sha256sum] = "d566c630175d9fa84a98d3c9170ec033069e9e20c8d23dea49ae2a976b6c76f5" +SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" +SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb index 8ced7b84f..e112a5e30 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb @@ -17,3 +17,5 @@ inherit cmake lib_package S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>1(\.\d+)+)" 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 <zhe.he@windriver.com> +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 <zhe.he@windriver.com> + +Upstream-Status: Backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + 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.3.bb index b5d95d940..e97b4efb2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" -SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634" +SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index e58bdd493..6683eccf2 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -32,3 +32,4 @@ python do_package_prepend() { } B = "${WORKDIR}/${BPN}-${PV}" +PNBLACKLIST[bpftool] = "Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index 7b7f33520..a28d59dce 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -124,7 +124,6 @@ RDEPENDS_python-pygps = " \ python-io \ python-threading \ python-terminal \ - python-curses \ gpsd \ python-json" 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 198a771bf..e66102064 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 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.326" -SRCREV = "dc8574c8e01ac758ba4dd23e7574492e261ad9ea" +PV = "0.327" +SRCREV = "874f7831c64de7ea2203cfcd1b3fc336bc27e468" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch new file mode 100644 index 000000000..16de8c0a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -0,0 +1,73 @@ +From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 2 Sep 2019 23:04:50 -0400 +Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found + +In oe-core (util-linux and coreutils), the commands locates in +${bindir} rather than /bin, add BINDIR to configure it + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 3 +++ + scripts/blkdeactivate.sh.in | 7 ++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d1431e2..54e5a7b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1495,6 +1495,8 @@ fi + + SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" + ++BINDIR="$(eval echo $(eval echo $bindir))" ++ + SBINDIR="$(eval echo $(eval echo $sbindir))" + LVM_PATH="$SBINDIR/lvm" + AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) +@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) + AC_SUBST(SACKPT_LIBS) + AC_SUBST(SALCK_CFLAGS) + AC_SUBST(SALCK_LIBS) ++AC_SUBST(BINDIR) + AC_SUBST(SBINDIR) + AC_SUBST(SELINUX_LIBS) + AC_SUBST(SELINUX_PC) +diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in +index a4b8a8f..3db4226 100644 +--- a/scripts/blkdeactivate.sh.in ++++ b/scripts/blkdeactivate.sh.in +@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" + + sbindir="@SBINDIR@" + DMSETUP="$sbindir/dmsetup" ++bindir="@BINDIR@" + LVM="$sbindir/lvm" + + if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then + UMOUNT_OPTS="--all-targets " + else + UMOUNT_OPTS="" +- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET" ++ FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET" + FINDMNT_READ="read -r mnt" + fi + DMSETUP_OPTS="" +@@ -55,10 +56,10 @@ LVM_OPTS="" + MDADM_OPTS="" + MPATHD_OPTS="" + +-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" ++LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" + LSBLK_VARS="local devtype local kname local name local mnt" + LSBLK_READ="read -r devtype kname name mnt" +-SORT_MNT="/bin/sort -r -u -k 4" ++SORT_MNT="$bindir/sort -r -u -k 4" + + # Do not show tool errors by default (only done/skipping summary + # message provided by this script) and no verbose mode by default. +-- +2.8.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb index 785c6960e..f42bd8ed2 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb @@ -4,6 +4,7 @@ SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ " DEPENDS += "autoconf-archive-native" @@ -67,7 +68,12 @@ RDEPENDS_${PN}-udevrules = "libdevmapper" RDEPENDS_${PN}_append_class-target = " libdevmapper" RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" +RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb index aa773bf75..18121be06 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb @@ -12,8 +12,8 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "23f4f7b5c0d1f04ad555960dc294f2b8" -SRC_URI[sha256sum] = "00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81" +SRC_URI[md5sum] = "9650dd3eb0adbab6aaa748a6f1398ccb" +SRC_URI[sha256sum] = "2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch deleted file mode 100644 index 0497613dd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Wed, 18 Jul 2018 09:43:55 +0800 -Subject: [PATCH] fix NULL pointer problem - -return 0 if distance_table is NULL - -Upstream-Status: Pending - -read_distance_table() maybe return 0, but distance_table is not set, -if distance_table is used, and will lead to SEGFAULT - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - distance.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/distance.c b/distance.c -index 8d472af..6a6e886 100644 ---- a/distance.c -+++ b/distance.c -@@ -113,6 +113,8 @@ int numa_distance(int a, int b) - int err = read_distance_table(); - if (err < 0) - return 0; -+ if(!distance_table) -+ return 0; - } - if ((unsigned)a >= distance_numnodes || (unsigned)b >= distance_numnodes) - return 0; --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb index 279ac0415..f13b1795f 100644 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,11 +10,10 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "841253d1313b01a968c380cae4f498f20c46e5aa" -PV = "2.0.12+git${SRCPV}" +SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" +PV = "2.0.13+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ - file://0001-fix-NULL-pointer-problem.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb new file mode 100644 index 000000000..b95c400b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPLv2 & openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver spice spice-protocol libsecret" + +DEPENDS_append_libc-musl = "libexecinfo" +LDFLAGS_append_libc-musl = " -lexecinfo" + +SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ +" +SRC_URI[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438" +SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a" + +S = "${WORKDIR}/Remmina-v${PV}" + +inherit cmake + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" + +do_install_append(){ + # We dont need the extra stuff form other desktop environments + rm -rf ${D}/${datadir}/xsessions + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/gnome-session +} + +RDEPENDS_${PN} = "bash" + +FILES_${PN}_append = " ${datadir}/icons/hicolor/*" + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb index cc07dcb06..fbf018d7f 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native pkgconfig SRC_URI = "git://github.com/abrt/satyr.git \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "dff1b877d42bf2153f8f090905d9cc8fb333bf1e" +SRCREV = "8b5547b89b712b39a59f1d8b366e7de0f5f46108" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -23,7 +23,6 @@ PACKAGES += "python3-${BPN}" FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" PACKAGECONFIG ??= "python3 rpm" -PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb index 62028a96e..b294d77ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "6e05aee30e348ae2fd13ce8bfaa10f4f7d45d66f" +SRCREV = "c9fa3c68a1b2c9790c731602b8bae2b513e80605" SRC_URI = "git://github.com/mvp/${BPN}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb index e394f34c7..0f8d7af3f 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb @@ -78,3 +78,6 @@ FILES_${PN} = "${base_sbindir}" # autoload if installed KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" + +PNBLACKLIST[vboxguestdrivers] = "Needs forward porting to kernel 5.2+" + |