diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-11 15:58:48 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-11 15:59:15 +0300 |
| commit | 2f9739240bcb1cfd0675bbe77c02b5f7c32219b1 (patch) | |
| tree | 1055886a67869b77ae1c7c2f3722934153574ea6 /meta-openembedded | |
| parent | bf18570e7823c708c807889633686f17f4632e4a (diff) | |
| download | openbmc-2f9739240bcb1cfd0675bbe77c02b5f7c32219b1.tar.xz | |
meta-openembedded: subtree update:e0daf6f8e0..3a9262866d
Adrian Bunk (1):
xfce-polkit: Upgrade 0.2 -> 0.3
Alex Kiernan (2):
ostree: Add support for ptest
ostree: Upgrade 2019.4 -> 2019.5
Alistair Francis (1):
openocd: Update to latest git version
Anders Roxell (1):
s-suite: install missing create_config.sh
Andreas Müller (6):
mm-common: upgrade 0.9.12 -> 1.0.0 / meson build / add SUMMARY
mm-common: do really build with meson
libpeas: upgrade 1.22.0 -> 1.24.1
xfce4-screenshooter: upgrade 1.9.6 -> 1.9.7
xfce4-time-out-plugin: upgrade 1.0.3 -> 1.1.0
xfce4-whiskermenu-plugin: upgrade 2.3.3 -> 2.3.4
Andreas Oberritter (4):
haveged: Fix missing initscript when both systemd and sysvinit are enabled
samba: fix installation for minimal build
autofs: set some paths for configure script
autofs: install sysvinit script manually if systemd is enabled
André Draszik (8):
jansson: allow to build a -native package
cunit: allow to build a -native package
libev: allow to build a -native package
nghttp2: fix UPSTREAM_CHECK_URI
nghttp2: update to 1.39.2
nghttp2: build more of this & fix packaging
nghttp2: allow to build a -native package
nodejs: allow use of system nghttp2
Hongxu Jia (10):
python-pluggy: add python-importlib-metadata to RDEPENDS
python-more-itertools.inc: fix python2 package not incorrectly generated
python-more-itertools: downgrade 7.2.0 -> 5.0.0
python-importlib-metadata: add missing runtime depends
python-pathlib2: add python-scandir and python-misc to runtime depends
python-scandir: add version 1.10.0
python-contextlib2/python3-contextlib2: add version 0.6.0
python3-importlib-metadata: add python3-misc to runtime depends
python-importlib-metadata: add python-compression to runtime depends
python-configparser: add python-pkgutil to runtime depends
Kai Kang (4):
xfce4-genmon-plugin: 4.0.1 -> 4.0.2
xfce-panel-plugin.bbclass: correct SRC_URI with xfce_verdir
xfce4-weather-plugin: 0.9.1 -> 0.10.0
xfce4-screensaver: 0.1.5 -> 0.1.8
Khem Raj (8):
iwd: Fix installed-vs-shipped QA errors on systemd units
iwd: Fix build race during documentation build
ifplugd: Include stdint.h for uintXX_t
netkit-rwho: Include stdint.h for int32_t
libowfat: Fix parallel build
grpc: Add dep on libnsl
gtkwave: Upgrade to 3.3.102
syslog-ng: Do not install non-existing systemd file
Ming Liu (2):
python-jsonschema: RDEPENDS on python-importlib-metadata
ostree: fix some invalid condition checking
Oleksandr Kravchuk (1):
iwd: update to 1.0
Stefan Agner (2):
zstd: Upgrade 1.4.3 -> 1.4.4
zstd: move recipe to oe-core
Yi Zhao (2):
libldb: upgrade 1.5.5 -> 1.5.6
samba: upgrade 4.10.8 -> 4.10.10
Zang Ruochen (20):
python-pyjks: upgrade 17.1.1 -> 19.0.0
python-pyjwt: upgrade 1.6.4 -> 1.7.1
python-pymisp: upgrade 2.4.93 -> 2.4.117.2
xorriso: upgrade 1.5.0 -> 1.5.3
python-cython: upgrade 0.29.13 -> 0.29.14
python-decorator: upgrade 4.4.0 -> 4.4.1
python-dominate: upgrade 2.3.1 -> 2.4.0
python-flask-babel: upgrade 0.11.2 -> 0.12.2
python-flask-migrate: upgrade 2.2.1 -> 2.5.2
python-flask-restful: upgrade 0.3.6 -> 0.3.7
python-flask-socketio: upgrade 3.3.2 -> 4.2.1
python-flask-sqlalchemy: upgrade 2.3.2 -> 2.4.1
python-paho-mqtt: upgrade 1.4.0 -> 1.5.0
python-pyroute2: upgrade 0.5.2 -> 0.5.7
python-pyrsistent: upgrade 0.15.4 -> 0.15.5
python-pysmi: upgrade 0.2.2 -> 0.3.4
python-pytest: upgrade 5.2.1 -> 5.2.2
python-serpent: upgrade 1.25 -> 1.28
python-smbus: upgrade 4.0 -> 4.1
python-snimpy: upgrade 0.8.12 -> 0.8.13
Zheng Ruoqin (19):
mdns: upgrade 878.200.35 -> 878.260.1
ledmon: Modify the Upstream-Status to Submitted.
byacc: upgrade 20190617 -> 20191103
ccid: upgrade 1.4.30 -> 1.4.31
dialog: upgrade 1.3-20190728 -> 1.3-20190808
cryptsetup: upgrade 2.2.1 -> 2.2.2
lvm2/libdevmapper: 2.03.05 -> 2.03.06
libssh2: upgrade 1.8.2 -> 1.9.0
mariadb: upgrade 10.3.16 -> 10.3.18
mcelog: upgrade 164 -> 165
mce-test: Update to latest git version
postgresql: upgrade 11.5 -> 12.0
protobuf: upgrade 3.10.0 -> 3.10.1
sshfs-fuse: upgrade 3.5.2 -> 3.6.0
syslog-ng: upgrade 3.19.1 -> 3.24.1
tslib: upgrade 1.16 -> 1.21
xkbprint: upgrade 1.0.4 -> 1.0.5
xterm: upgrade 349 -> 350
zabbix: upgrade 4.2.7 -> 4.2.8
Zhixiong Chi (1):
gtkwave: add the libtirpc dependence and config
Change-Id: I7dd3609b2d3166e5ba2f977e26026f2b675dc108
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded')
149 files changed, 819 insertions, 878 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb index b10c5c5ff..2515d07d4 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.6.0.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "695cd8916f0e78d28009de3ffe112b9d1a1c9e5e" +SRCREV = "a1e5f12c530ccf59434a7d59a34a049f160b3559" S = "${WORKDIR}/git" inherit meson diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb index 1c743ef7a..c1ed6265e 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.3.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.gnu.org/software/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "e5fbae9ada52730fbe248ab9a88e7127" -SRC_URI[sha256sum] = "a93fa7ae5bb1902198cddfec25201388156932f36f2f5da829bf4fcae9a6062b" +SRC_URI[md5sum] = "d6b16763a2ca23eec718cfac1761b40f" +SRC_URI[sha256sum] = "97a9c9831fa1b053f781f74a17b79327e7402c6163f5c7973453ba881616aeb4" PACKAGECONFIG ??= "acl attr zlib bzip2 readline" PACKAGECONFIG[acl] = "--enable-libacl,--disable-libacl,acl," diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.10.bb index d824eacf9..e002a9da5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.10.bb @@ -34,8 +34,8 @@ SRC_URI_append_libc-musl = " \ file://0001-samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "f3c722bbcd903479008fa1b529f56365" -SRC_URI[sha256sum] = "c41f05fb567f7359998b451543501c7690a2bf6551d658a76bd6916316a410f4" +SRC_URI[md5sum] = "dde27447f39d124efe18f719ccf956dd" +SRC_URI[sha256sum] = "700c734b51610e2feaa0d6744f9bec0c0d8917bca8cc78d5b63a4591f32866a5" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" @@ -189,15 +189,17 @@ do_install_append() { sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode fi - chmod 0750 ${D}${sysconfdir}/sudoers.d + chmod 0750 ${D}${sysconfdir}/sudoers.d || true rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba-gpupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_upgradedns - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_spnupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_kcc - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_dnsupdate - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool + fi } diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb index aeadc9d5d..54f0b9991 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb @@ -47,13 +47,19 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ --enable-ignore-busy --with-openldap=no \ + --with-confdir=${sysconfdir}/default \ + --with-fifodir=/run \ + --with-flagdir=/run \ --with-sasl=no --with-libtirpc \ + --with-mapdir=${sysconfdir} \ --with-path=${STAGING_BINDIR_NATIVE} \ --with-fifodir=${localstatedir}/run \ --with-flagdir=${localstatedir}/run \ " CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ ac_cv_path_RPCGEN=rpcgen \ + initdir=${INIT_D_DIR} \ + piddir=/run \ " do_configure_prepend () { @@ -73,6 +79,11 @@ do_install_append () { if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run fi + # On hybrid systemd/sysvinit builds, we need to install the sysvinit script by hand. + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d -m 755 ${D}${INIT_D_DIR} + install -m 755 ${S}/samples/rc.autofs ${D}${INIT_D_DIR}/autofs + fi } SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb index 2d7694a4f..ecc575bcf 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "Apache-2" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl" +DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2" DEPENDS_append_class-target = " googletest grpc-native " DEPENDS_append_class-nativesdk = " grpc-native " diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch index 717b4d73f..349a1351f 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -12,8 +12,6 @@ Upstream-Status: Pending rwhod/rwhod.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c -index 1d4f7b6..f1f043c 100644 --- a/ruptime/ruptime.c +++ b/ruptime/ruptime.c @@ -53,6 +53,7 @@ char ruptime_rcsid[] = @@ -24,11 +22,9 @@ index 1d4f7b6..f1f043c 100644 struct hs { char hs_hostname[MAXHOSTNAMELEN]; -diff --git a/rwho/rwho.c b/rwho/rwho.c -index 63919ac..71aec9e 100644 --- a/rwho/rwho.c +++ b/rwho/rwho.c -@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; +@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/0 #include <assert.h> #include <stdio.h> #include <time.h> @@ -36,8 +32,6 @@ index 63919ac..71aec9e 100644 #include <protocols/rwhod.h> #include "../version.h" -diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c -index 54498d0..40cabcf 100644 --- a/rwhod/rwhod.c +++ b/rwhod/rwhod.c @@ -76,6 +76,7 @@ char rcsid[] = @@ -66,6 +60,13 @@ index 54498d0..40cabcf 100644 /* * Taken from: * --- -2.14.1 - +--- a/include/protocols/rwhod.h ++++ b/include/protocols/rwhod.h +@@ -37,6 +37,7 @@ + #ifndef _RWHOD_H_ + #define _RWHOD_H_ + ++#include <stdint.h> + /* + * rwho protocol packet format. + */ diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb index 1353b2bed..017894531 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_878.260.1.bb @@ -12,8 +12,8 @@ SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${P file://build.patch;patchdir=.. \ file://mdns.service \ " -SRC_URI[md5sum] = "e773f290a7d29f1072247985d6add2ff" -SRC_URI[sha256sum] = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0" +SRC_URI[md5sum] = "aeb92d838a4aa2402ef128ed501484eb" +SRC_URI[sha256sum] = "3cc71582e8eee469c2de8ecae1d769e7f32b3468dfb7f2ca77f1dee1f30a7d1e" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.5.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb index b19c964d8..99eb6f9ce 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.6.bb @@ -33,8 +33,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "339a41ac9efaec680e6d1469dd9aa35b" -SRC_URI[sha256sum] = "199f5861aa863f538ec66d5fa95ecc13254a2030c53daf0e47363fa9ba235c68" +SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" +SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" inherit waf-samba distro_features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch new file mode 100644 index 000000000..6226e2c03 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat/0001-Depend-on-haveuint128.h-for-umult64.c.patch @@ -0,0 +1,44 @@ +From 7f6a104a682d59f28f7df889129f4467cc45e912 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 6 Nov 2019 19:55:42 -0800 +Subject: [PATCH] Depend on haveuint128.h for umult64.c + +This fixes parallel build issue e.g. +mult/umult64.c:9:10: fatal error: 'haveuint128.h' file not found + ^~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + GNUmakefile | 1 + + Makefile | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 3f3193d..751ca60 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -126,6 +126,7 @@ $(CDB_OBJS): cdb.h uint32.h + $(CRITBIT_OBJS): critbit.h + + mult64.o: haveuint128.h ++umult64.o: haveuint128.h + + + iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h +diff --git a/Makefile b/Makefile +index 0d08da4..02df6c6 100644 +--- a/Makefile ++++ b/Makefile +@@ -430,7 +430,7 @@ range_str4inbuf.o: mult/range_str4inbuf.c rangecheck.h + range_strinbuf.o: mult/range_strinbuf.c rangecheck.h + umult16.o: mult/umult16.c uint16.h + umult32.o: mult/umult32.c uint32.h +-umult64.o: mult/umult64.c uint64.h ++umult64.o: mult/umult64.c uint64.h haveuint128.h + open_append.o: open/open_append.c open.h + open_excl.o: open/open_excl.c open.h + open_read.o: open/open_read.c open.h +-- +2.24.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb index a5e2c21cf..24f413555 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -6,7 +6,9 @@ HOMEPAGE = "http://www.fefe.de/libowfat" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz" +SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ + file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \ + " SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc" SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1" diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch new file mode 100644 index 000000000..e4db09638 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch @@ -0,0 +1,27 @@ +From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 7 Nov 2019 09:58:52 +0000 +Subject: [PATCH] fetch-ocsp-response: use python3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: André Draszik <git@andred.net> +--- + script/fetch-ocsp-response | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response +index 0ff7461..185116b 100755 +--- a/script/fetch-ocsp-response ++++ b/script/fetch-ocsp-response +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + # nghttp2 - HTTP/2 C Library +-- +2.23.0.rc1 + diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb deleted file mode 100644 index 6077daf76..000000000 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "HTTP/2 C Library and tools" -HOMEPAGE = "https://nghttp2.org/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" - -+UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases" - -SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz" -SRC_URI[md5sum] = "02b015cb178c46f27dd87228e33db35f" -SRC_URI[sha256sum] = "679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448" - -DEPENDS = "libxml2 openssl zlib jansson cunit c-ares" - -inherit cmake pythonnative python-dir diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb new file mode 100644 index 000000000..c27afdb55 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "HTTP/2 C Library and tools" +HOMEPAGE = "https://nghttp2.org/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" +DEPENDS = "c-ares cunit jansson libev libevent libxml2 openssl zlib" + +UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases" + +SRC_URI = "\ + https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ + file://0001-fetch-ocsp-response-use-python3.patch \ +" +SRC_URI[md5sum] = "de52cd6b587b76486346745514972995" +SRC_URI[sha256sum] = "a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b" + +inherit cmake manpages pythonnative +PACKAGECONFIG[manpages] = "" + +# examples are never installed, and don't need to be built in the +# first place +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON" + +do_install_append() { + rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd +} + +PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server" + +RDEPENDS_${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}-proxy = "openssl python3-core python3-io python3-shell" + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" +FILES_lib${PN} = "${libdir}/*${SOLIBS}" +FILES_${PN}-client = "${bindir}/h2load ${bindir}/nghttp" +FILES_${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" +FILES_${PN}-server = "${bindir}/nghttpd" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 71483d88b..d6852e29f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -19,6 +19,7 @@ do_install() { install -m0755 ${S}/def_config.sh ${D}/opt/S-suite install -m0755 ${S}/config_params.sh ${D}/opt/S-suite + install -m0755 ${S}/create_config.sh ${D}/opt/S-suite install -m0755 ${S}/process_config.sh ${D}/opt/S-suite } diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch index b65f1a732..09f4993a2 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch @@ -5,7 +5,8 @@ Subject: [PATCH] Don't build with -Werror to fix compile error. | amd_sgpio.c: In function '_write_amd_register': | amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] -Upstream-Status: Pending +Upstream-Status: Submitted +https://github.com/intel/ledmon/pull/48/commits Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch index 4bd40606b..35665bd3f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/Fix-build-with-musl.patch @@ -9,13 +9,14 @@ Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> src/ethtool-local.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/ethtool-local.h b/src/ethtool-local.h -index 200476b..0edc7a9 100644 --- a/src/ethtool-local.h +++ b/src/ethtool-local.h -@@ -22,9 +22,9 @@ +@@ -20,11 +20,11 @@ + * along with ifplugd; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - +- ++#include <stdint.h> typedef unsigned long long u64; -typedef __uint32_t u32; -typedef __uint16_t u16; @@ -26,6 +27,3 @@ index 200476b..0edc7a9 100644 #include "ethtool-kernel.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch new file mode 100644 index 000000000..93ef007f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch @@ -0,0 +1,40 @@ +From f2a2b9f445ab1e31fbb27a74744e9a2ededfce17 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 4 Nov 2019 16:38:04 -0800 +Subject: [PATCH] Makefile.am: Avoid redirection of input and output files + +Ensure that directory is created before its written to + +This can cause a build race in a highly parallelised build where a directory is not yet created but +output file is being written using redirection e.g. + +rst2man.py --strict --no-raw --no-generator --no-datestamp < ../git/monitor/iwmon.rst > monitor/iwmon.1 +/bin/sh: monitor/iwmon.1: No such file or directory +make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 823b7d02..1bd0005c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -626,8 +626,9 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + < $< > $@ + + if RUN_RST2MAN +-RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ +- --no-datestamp < $< > $@ ++RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ ++ $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ ++ --no-generator --no-datestamp $< $@ + else + RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ + { echo "Generated manual page $@ does not exist"; false; } +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb index 20c6d04f7..d11e0d4ae 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.23.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb @@ -6,8 +6,10 @@ inherit autotools pkgconfig systemd python3native DEPENDS = "ell readline dbus python3-docutils-native" -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "77f16ae26fc013477f6362a0c33f0e52e82863e0" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db" S = "${WORKDIR}/git" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -26,7 +28,7 @@ do_install_append() { install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} } -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d" +FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d ${systemd_unitdir}/network/" SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb index b72b7af4f..be4536b9c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.27.bb @@ -17,3 +17,5 @@ do_install_append() { # still basic so drop it for now. rm ${D}${includedir}/event.h } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb index ed6c55bba..489ab0b63 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.7.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_4.2.8.bb @@ -28,8 +28,8 @@ SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stab file://zabbix-agent.service \ " -SRC_URI[md5sum] = "601d3c29322c720c72018950ed969d0a" -SRC_URI[sha256sum] = "9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627" +SRC_URI[md5sum] = "9a816afd4f7984a841bed64a25ba523c" +SRC_URI[sha256sum] = "57dbc2a95a09581b5196d2abc86ee1aaf65f3c909d6b4bc53d260dc4dd69b9c6" inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch new file mode 100644 index 000000000..6031eaa78 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -0,0 +1,41 @@ +From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 4 Nov 2019 19:19:47 +0100 +Subject: [PATCH] meson.build: do not ask for python installation / version +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Even by adding python3-setuptools-native the following error is not fixed so +just ask for python3 executable. + +| meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 3255328..7a6094c 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,12 +6,7 @@ project('mm-common', + license: 'GPLv2+' + ) + +-python3 = import('python').find_installation('python3') +-python_version = python3.language_version() +-python_version_req = '>= 3.5' +-if not python_version.version_compare(python_version_req) +- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) +-endif ++python3 = import('python3').find_python() + + # Use these instead of meson.source_root() and meson.build_root(). + # source_root() and build_root() are not useful, if this is a subproject. +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb deleted file mode 100644 index 4f91f31e4..000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.12.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit gnomebase - -SRC_URI[archive.md5sum] = "be1c61587db989c7677375a729b94672" -SRC_URI[archive.sha256sum] = "ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb new file mode 100644 index 000000000..c7d1f2b73 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718" +SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb index ae5988b57..479b9eb37 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.2.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "1654c8d2aa0dac51c8d1d755df61ae6c" -SRC_URI[sha256sum] = "94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61" +SRC_URI[md5sum] = "2b64ca9ea16e823df359eacf9c02414b" +SRC_URI[sha256sum] = "2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb index e1a038dfa..e1a038dfa 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.16.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.3.18.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index f1c71feeb..e1ae58ae7 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,8 +19,8 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ " -SRC_URI[md5sum] = "11220d0b94c5c24caa2e1e9eaba38e31" -SRC_URI[sha256sum] = "39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b" +SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0" +SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb index de24c920f..de24c920f 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.16.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch index f14da06d9..84cd5c157 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch @@ -9,21 +9,25 @@ xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. Signed-off-by: Philip Balister <philip@balister.org> -upate to version 10.4 +update to version 10.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update for version 12.0 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + configure.in | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in -index d9fe56e..3e2cd3a 100644 +index 6942f81..7fd3e78 100644 --- a/configure.in +++ b/configure.in -@@ -816,19 +816,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], +@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) if test "$with_libxml" = yes ; then - PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) +- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl - if test -n "$XML2_CONFIG"; then - for pgac_option in `$XML2_CONFIG --cflags`; do - case $pgac_option in diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb index fd4200a73..d5b1ebdb5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.0.bb @@ -8,5 +8,5 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ " -SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" -SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" +SRC_URI[md5sum] = "87545416ef021eee8621d31a93fcc899" +SRC_URI[sha256sum] = "cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4afe341f9..4013c6931 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -55,6 +55,7 @@ PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch deleted file mode 100644 index c80d9f19f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bee22f143ffa0457aefcf31053f76416e6d242e5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 20 May 2019 23:24:26 -0700 -Subject: [PATCH] esirisc_flash: Rename PAGE_SIZE to FLASH_PAGE_SIZE - -PAGE_SIZE is defined in system includes on some systems, this would -avoid the unintended conflict - -Fixes -| src/flash/nor/esirisc_flash.c:95:9: error: 'PAGE_SIZE' macro redefined [-Werror,-Wmacro-redefined] -| #define PAGE_SIZE 4096 -| ^ -| /mnt/a/yoe/build/tmp/work/core2-64-yoe-linux-musl/openocd/0.10+gitrAUTOINC+7ee618692f-r0/recipe-sysroot/usr/inclu -de/limits.h:89:9: note: previous definition is here -| #define PAGE_SIZE PAGESIZE - -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/5180/2] -Change-Id: I195b303fc88a7c848ca4e55fd6ba893796df55cc -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/flash/nor/esirisc_flash.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/flash/nor/esirisc_flash.c b/src/flash/nor/esirisc_flash.c -index 4e33b942..3bed0658 100644 ---- a/src/flash/nor/esirisc_flash.c -+++ b/src/flash/nor/esirisc_flash.c -@@ -92,7 +92,7 @@ - #endif - - #define CONTROL_TIMEOUT 5000 /* 5s */ --#define PAGE_SIZE 4096 -+#define FLASH_PAGE_SIZE 4096 - #define PB_MAX 32 - - #define NUM_NS_PER_S 1000000000ULL -@@ -264,7 +264,7 @@ static int esirisc_flash_erase(struct flash_bank *bank, int first, int last) - (void)esirisc_flash_disable_protect(bank); - - for (int page = first; page < last; ++page) { -- uint32_t address = page * PAGE_SIZE; -+ uint32_t address = page * FLASH_PAGE_SIZE; - - target_write_u32(target, esirisc_info->cfg + ADDRESS, address); - -@@ -464,8 +464,8 @@ static int esirisc_flash_probe(struct flash_bank *bank) - if (target->state != TARGET_HALTED) - return ERROR_TARGET_NOT_HALTED; - -- bank->num_sectors = bank->size / PAGE_SIZE; -- bank->sectors = alloc_block_array(0, PAGE_SIZE, bank->num_sectors); -+ bank->num_sectors = bank->size / FLASH_PAGE_SIZE; -+ bank->sectors = alloc_block_array(0, FLASH_PAGE_SIZE, bank->num_sectors); - - retval = esirisc_flash_init(bank); - if (retval != ERROR_OK) { --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 241b4baa3..9ec77fdc4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,22 +9,21 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-esirisc_flash-Rename-PAGE_SIZE-to-FLASH_PAGE_SIZE.patch \ file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "7ee618692f56b0efea864890da45d73d28e393d9" +SRCREV_openocd = "ded67990255cc1e63c77832ffd6e6bef9120873d" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" -SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" +SRCREV_jimtcl = "dc4ba7770d580800634f90b67a24e077b4a26d98" +SRCREV_libjaylink = "cfccbc9d6763733f1d14dff3c2dc5b75aaef136b" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext -BBCLASSEXTEND += "nativesdk" +BBCLASSEXTEND += "native nativesdk" EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb index 928454117..58526f131 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.10.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "6d4e7fd7966c989e38024a8ea693db83758944f1" +SRCREV = "d09d649aea36f02c03f8396ba39a8d4db8a607e4" SRC_URI = "git://github.com/google/protobuf.git;branch=3.10.x \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index 24864ea60..c7830ed90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -12,16 +12,19 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Update for 20190617. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + +Update for 20191103. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- aclocal.m4 | 1 - configure | 259 ------------------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 338465f..3311057 100644 +index b90cfe6..413ea9c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1231,7 +1231,6 @@ CF_GCC_VERSION +@@ -1232,7 +1232,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -30,20 +33,20 @@ index 338465f..3311057 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index ebb1f0f..a56cb17 100755 +index ec77bba..234f271 100755 --- a/configure +++ b/configure -@@ -1957,265 +1957,6 @@ esac +@@ -2059,265 +2059,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} --echo "$as_me:1960: checking \$CFLAGS variable" >&5 +-echo "$as_me:2062: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:1964: result: broken" >&5 +- echo "$as_me:2066: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:1966: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -151,18 +154,18 @@ index ebb1f0f..a56cb17 100755 - done - ;; -(*) -- echo "$as_me:2074: result: ok" >&5 +- echo "$as_me:2176: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2079: checking \$CC variable" >&5 +-echo "$as_me:2181: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2083: result: broken" >&5 +- echo "$as_me:2185: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2085: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -279,24 +282,24 @@ index ebb1f0f..a56cb17 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2202: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2206: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2210: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2214: result: ok" >&5 +- echo "$as_me:2316: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2219: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb index 2834b7c5e..eae4618e2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20190617.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20191103.bb @@ -7,6 +7,6 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=3eb7c635434fafe23ef30fc263e63b2f" require byacc.inc -SRC_URI[md5sum] = "17b3f7e7ed570d785b145064d99df615" -SRC_URI[sha256sum] = "f87868167b920bf2cb30fc32b62f63ae15671181ef329226d1063100be02518d" +SRC_URI[md5sum] = "84ffe59166f67bbe147a6f502c7af309" +SRC_URI[sha256sum] = "d291fb34816f45079067366b7f7300ffbf9f7e3f1aaf6d509b84442d065d11b9" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb index d414bc683..a1acfcd00 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "e9d7f8b5e7b17183b0fb9297c0f57840" -SRC_URI[sha256sum] = "e5eb0eaaef9cae8c822887bd998e33c2c3b94ebadd37b4f6aba018c0194a2a87" +SRC_URI[md5sum] = "f48b597251a26c522002736652e0300c" +SRC_URI[sha256sum] = "886e12f2cf3df36cde65f32f6ae52bc598eb2599a611b1d8ce5dfdea599e47e2" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index 0189e19c0..a2f0d07f2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -35,6 +35,12 @@ do_install_append() { # The exit status is 143 when the service is stopped if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + # Hybrid systemd-sysvinit distros must install the initscript manually + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${INIT_D_DIR} + sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged + chmod 755 ${D}${INIT_D_DIR}/haveged + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb index 3cc353ee7..f47fe5725 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.12.bb @@ -11,3 +11,4 @@ SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c70 inherit autotools pkgconfig +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch deleted file mode 100644 index c9e1306af..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Wed, 4 Sep 2019 17:29:15 +0100 -Subject: [PATCH 1/2] Always enable trivial-httpd for tests - -When running tests we always need ostree-trivial-httpd, so enable it -unconditionally - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile.am | 1 + - ci/build.sh | 5 +++++ - ci/travis-build.sh | 1 + - 3 files changed, 7 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index cd04a055045a..673dbf88de55 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ - --enable-gtk-doc \ - --enable-man \ - --disable-maintainer-mode \ -+ --enable-trivial-httpd-cmdline \ - $(NULL) - - GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make -diff --git a/ci/build.sh b/ci/build.sh -index 0901507498f2..806af050b780 100755 ---- a/ci/build.sh -+++ b/ci/build.sh -@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in - fi - ;; - esac -+# unless libsoup is disabled, enable trivial-httpd for the tests -+case "${CONFIGOPTS:-}" in -+ *--without-soup*) ;; -+ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; -+esac - - # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 - # NB: this disables the default set of flags from configure.ac -diff --git a/ci/travis-build.sh b/ci/travis-build.sh -index 3fd969bdced6..7c85313a2d32 100755 ---- a/ci/travis-build.sh -+++ b/ci/travis-build.sh -@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" - - ../configure \ - --enable-always-build-tests \ -+ --enable-trivial-httpd-cmdline \ - ${ci_configopts} - "$@" - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch new file mode 100644 index 000000000..d94b3ded9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-build-create-tests-directory-for-split-builds.patch @@ -0,0 +1,43 @@ +From 114fe5067b58a2434b44855eee48f865186fe0fa Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Tue, 5 Nov 2019 22:26:23 +0000 +Subject: [PATCH] build: create tests directory for split builds + +When `--disable-dependency-tracking` is in effect with separate build +directory, the tests directory isn't created as a result of the +dependency generation, which leads to a build race for the tests +directory being created and failures: + + Making all in . + make[2]: Entering directory 'TOPDIR/build/tmp/work/riscv64-yoe-linux-musl/ostree/2019.5-r0/build' + (echo '[Test]' > tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Type=session' >> tests/test-local-pull-depth.sh.test.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=/usr/libexec/installed-tests/libostree G_TEST_BUILDDIR=/usr/libexec/installed-tests/libostree /usr/libexec/installed-tests/libostree/test-local-pull-depth.sh' >> tests/test-local-pull-depth.sh.test.tmp; \ + mv tests/test-local-pull-depth.sh.test.tmp tests/test-local-pull-depth.sh.test) + /bin/sh: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 1: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + /bin/sh: line 2: tests/test-local-pull-depth.sh.test.tmp: No such file or directory + mv: cannot stat 'tests/test-local-pull-depth.sh.test.tmp': No such file or directory + make[2]: *** [Makefile:9282: tests/test-local-pull-depth.sh.test] Error 1 + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Pending +--- + buildutil/glib-tap.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk +index 34b8f21ea26a..9a944a0acc88 100644 +--- a/buildutil/glib-tap.mk ++++ b/buildutil/glib-tap.mk +@@ -116,6 +116,7 @@ installed_testcases = $(test_programs) $(installed_test_programs) \ + installed_test_meta_DATA = $(installed_testcases:=.test) + + %.test: %$(EXEEXT) Makefile ++ @$(MKDIR_P) $(dir $@) + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch new file mode 100644 index 000000000..fdb733ebe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-Handle-EPIPE-failures-when-head-terminates.patch @@ -0,0 +1,51 @@ +From fb519f0361565cad0d340095263a1e8866ec4f89 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 11:30:00 +0000 +Subject: [PATCH 1/3] tests: Handle EPIPE failures when head terminates + +When using musl, it appears that the default is line buffered output, so +when `head -1` reads from a pipe we have to handle the source end of the +pipe getting EPIPE. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/pull-test.sh | 2 +- + tests/test-pull-mirrorlist.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index 0a97a1195582..2cfd8e02f790 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh +@@ -177,7 +177,7 @@ if ! skip_one_without_user_xattrs; then + ${CMD_PREFIX} ostree --repo=cacherepo pull-local ostree-srv/gnomerepo main + rev=$(ostree --repo=cacherepo rev-parse main) + ${CMD_PREFIX} ostree --repo=cacherepo ls -R -C main > ls.txt +- regfile_hash=$(grep -E -e '^-0' ls.txt | head -1 | awk '{ print $5 }') ++ regfile_hash=$((grep -E -e '^-0' ls.txt || true) | head -1 | awk '{ print $5 }') + ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false corruptrepo $(cat httpd-address)/ostree/corruptrepo + # Make this a loop so in the future we can add more object types like commit etc. + for object in ${regfile_hash}.file; do +diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh +index 4e44852d3971..85ff66e99f8e 100755 +--- a/tests/test-pull-mirrorlist.sh ++++ b/tests/test-pull-mirrorlist.sh +@@ -47,12 +47,12 @@ setup_mirror content_mirror3 + + # Let's delete a file from 1 so that it falls back on 2 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + + # Let's delete a file from 1 and 2 so that it falls back on 3 + cd ${test_tmpdir}/content_mirror1/ostree/gnomerepo +-filez=$(find objects/ -name '*.filez' | head -n 1) ++filez=$((find objects/ -name '*.filez' || true) | head -n 1) + rm ${filez} + cd ${test_tmpdir}/content_mirror2/ostree/gnomerepo + rm ${filez} +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch new file mode 100644 index 000000000..dcafb0995 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch @@ -0,0 +1,42 @@ +From 4d17cd917fe4fb67d2f9e4881b6693ac7289f423 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 30 Oct 2019 07:55:41 +0000 +Subject: [PATCH 1/4] tests/core: Fallback to en_US.UTF-8 locale + +A number of tests expect explicit left/right single quotes in their +messages, which will never happen in the C locale. Change so we pick a +likely UTF-8 locale, or fail if we can't find one. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index f6f94288fc61..bc191332c916 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -35,15 +35,11 @@ assert_not_reached () { + } + + # Some tests look for specific English strings. Use a UTF-8 version +-# of the C (POSIX) locale if we have one, or fall back to POSIX ++# of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-if locale -a | grep '^C.UTF-8$' >/dev/null; then +- export LC_ALL=C.UTF-8 +-elif locale -a | grep '^C.utf8$' >/dev/null; then +- export LC_ALL=C.utf8 +-else +- export LC_ALL=C +-fi ++export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++ + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch deleted file mode 100644 index 362b2f36a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Thu, 5 Sep 2019 13:22:15 +0100 -Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD - -When building without --enable-trivial-httpd-cmdline, don't build or install -the ostree-trivial-httpd binary. - -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] ---- - Makefile-ostree.am | 3 ++- - configure.ac | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index 76f39cad4b74..7b53cb148960 100644 ---- a/Makefile-ostree.am -+++ b/Makefile-ostree.am -@@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c - endif - - if USE_LIBSOUP --# Eventually once we stop things from using this, we should support disabling this -+if BUILDOPT_TRIVIAL_HTTPD - ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c - pkglibexec_PROGRAMS += ostree-trivial-httpd - ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c - ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) - ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) -+endif - - if !USE_CURL - # This is necessary for the cookie jar bits -diff --git a/configure.ac b/configure.ac -index 069bab01752e..ffc67980d507 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -192,6 +192,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, - [Continue to support "ostree trivial-httpd" [default=no]])],, - enable_trivial_httpd_cmdline=no) - AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) -+AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ -+ AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) -+]) - AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, - [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] - ) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch new file mode 100644 index 000000000..5ab9c8f6d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch @@ -0,0 +1,40 @@ +From 3d48021fb0892721fab8359b49470e521aaed493 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 11:28:07 +0000 +Subject: [PATCH 2/3] tests/core: Assume C.UTF-8 if locale isn't found + +When building with musl there's no locale command, also its default +locale is C.UTF-8, so just get C.UTF-8 if we can't find locale. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest-core.sh | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh +index bc191332c916..46aafab03cc8 100644 +--- a/tests/libtest-core.sh ++++ b/tests/libtest-core.sh +@@ -37,9 +37,15 @@ assert_not_reached () { + # Some tests look for specific English strings. Use a UTF-8 version + # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8 + # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) +-export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) +-if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi +- ++# ++# If we can't find the locale command assume we have support for C.UTF-8 ++# (e.g. musl based systems) ++if type -p locale >/dev/null; then ++ export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true) ++ if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi ++else ++ export LC_ALL=C.UTF-8 ++fi + # A GNU extension, used whenever LC_ALL is not C + unset LANGUAGE + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch new file mode 100644 index 000000000..834617c12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0003-tests-Avoid-musl-failure-with-cp-a.patch @@ -0,0 +1,52 @@ +From abf1a7392b2fa1945286a39a35190d74fe141e52 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 31 Oct 2019 17:09:36 +0000 +Subject: [PATCH 3/3] tests: Avoid musl failure with `cp -a` + +When copying the tree, using musl and GNU coreutils, something gets confused +when setting the ownership of symlinks and the copy fails with: + + cp: failed to preserve ownership for osdata-devel/bin: Not supported + +Rework using tar to avoid the problem. + +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +Upstream-Status: Accepted [v2019.6] +--- + tests/libtest.sh | 4 +++- + tests/test-admin-gpg.sh | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index ba00073a10a7..3f5fd931bc1e 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -440,7 +440,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh +index 1f50c8a9a508..dc776743776c 100755 +--- a/tests/test-admin-gpg.sh ++++ b/tests/test-admin-gpg.sh +@@ -90,7 +90,9 @@ EOF + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" --gpg-sign=$keyid --gpg-homedir=${test_tmpdir}/gpghome + + cd ${test_tmpdir} +- cp -a osdata osdata-devel ++ rm -rf osdata-devel ++ mkdir osdata-devel ++ tar -C osdata -cf - . | tar -C osdata-devel -xf - + cd osdata-devel + mkdir -p usr/include + echo "a development header" > usr/include/foo.h +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest new file mode 100644 index 000000000..963d1f692 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner libostree diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb index 505c9fccc..b3b34a15e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.5.bb @@ -25,18 +25,22 @@ PREMIRRORS = "" SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ - file://0001-Always-enable-trivial-httpd-for-tests.patch \ - file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ + file://run-ptest \ + file://0001-tests-core-Fallback-to-en_US.UTF-8-locale.patch \ + file://0001-tests-Handle-EPIPE-failures-when-head-terminates.patch \ + file://0002-tests-core-Assume-C.UTF-8-if-locale-isn-t-found.patch \ + file://0003-tests-Avoid-musl-failure-with-cp-a.patch \ + file://0001-build-create-tests-directory-for-split-builds.patch \ " -SRCREV = "9d39e7d91e8497987cad69a3fbed5c5fc91eebdc" +SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" S = "${WORKDIR}/git" -inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig systemd +inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig ptest-gnome systemd -# package configuration - match ostree defaults, but without rofiles-fuse +# Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ @@ -107,6 +111,7 @@ PACKAGES += " \ ${PN}-grub \ ${PN}-mkinitcpio \ ${PN}-switchroot \ + ${PN}-trivial-httpd \ " FILES_${PN} = " \ @@ -118,7 +123,6 @@ FILES_${PN} = " \ ${libdir}/girepository-1.0 \ ${libdir}/lib*${SOLIBS} \ ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ - ${libexecdir}/libostree/ostree-trivial-httpd \ ${sysconfdir}/ostree/remotes.d \ ${systemd_unitdir}/system-generators/ostree-system-generator \ ${systemd_unitdir}/system/ostree-finalize-staged.path \ @@ -141,17 +145,48 @@ FILES_${PN}-switchroot = " \ ${libdir}/ostree/ostree-prepare-root \ ${systemd_unitdir}/system/ostree-prepare-root.service \ " +FILES_${PN}-trivial-httpd = " \ + ${libexecdir}/libostree/ostree-trivial-httpd \ +" +RDEPENDS_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ +" RDEPENDS_${PN}-dracut = "bash" RDEPENDS_${PN}-mkinitcpio = "bash" RDEPENDS_${PN}_class-target = " \ gnupg \ ${PN}-switchroot \ " +RDEPENDS_${PN}-ptest += " \ + attr \ + bash \ + coreutils \ + cpio \ + diffutils \ + findutils \ + grep \ + python3-core \ + python3-multiprocessing \ + python3-pyyaml \ + ${PN}-trivial-httpd \ +" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS_${PN} += "kernel-module-overlay" +RRECOMMENDS_${PN}-ptest += "strace" SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" BBCLASSEXTEND = "native" + +python __anonymous() { + if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d): + if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires meta-python to be present.') + elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d): + raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.') + elif not oe.utils.any_distro_features(d, "xattr"): + raise bb.parse.SkipRecipe('ptest requires xattr enabled in DISTRO_FEATURES.') +} 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 deleted file mode 100644 index e97b4efb2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.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 = "a3d655d2255481333e09ecca9855f1b37f757c52" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\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-gnome/libpeas/libpeas_1.22.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb deleted file mode 100644 index dd1b53e39..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "libpeas is a gobject-based plugins engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" - -DEPENDS = "gnome-common gtk+3 intltool-native" - -inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache distro_features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" - -SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558" -SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962" - -PACKAGECONFIG[python3] = "--enable-python3,--disable-python3,python3-pygobject" - -export GIR_EXTRA_LIBS_PATH = "${B}/libpeas/.libs" - -PACKAGES =+ "${PN}-demo ${PN}-python3" -FILES_${PN}-demo = " \ - ${bindir}/peas-demo \ - ${libdir}/peas-demo \ -" - -RDEPENDS_${PN}-python3 = "python3-pygobject" -FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb new file mode 100644 index 000000000..6c8e0e0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "libpeas is a gobject-based plugins engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" + +DEPENDS = "gtk+3" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache + +SRC_URI[archive.md5sum] = "bbecf334a7333d0a5d4d655ba38be9b4" +SRC_URI[archive.sha256sum] = "9c3acf7a567cbb4f8bf62b096e013f12c3911cc850c3fa9900cbd5aa4f6ec284" + +PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" + +PACKAGES =+ "${PN}-demo ${PN}-python3" +FILES_${PN}-demo = " \ + ${bindir}/peas-demo \ + ${libdir}/peas-demo \ +" + +RDEPENDS_${PN}-python3 = "python3-pygobject" +FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb index 310c41067..1644e38da 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" -SRC_URI[md5sum] = "eac3073ef381e0c09da33590296ca37f" -SRC_URI[sha256sum] = "efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6" +SRC_URI[md5sum] = "13da7d4235d4031fde52971830458850" +SRC_URI[sha256sum] = "80bb7cb92db45872209f4ca48fc95a0460e0d89b0fe0c310c836d9b04c77fec7" inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" @@ -18,6 +18,6 @@ RDEPENDS_${PN} = "tk-lib" inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" +EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" FILES_${PN} = "${bindir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb index 8d23bd5eb..2bc40d939 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.21.bb @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. file://ts.conf \ file://tslib.sh \ " -SRC_URI[md5sum] = "254a022fc8aa89d164840fe8869c2441" -SRC_URI[sha256sum] = "c9a54651337a701a66b074c603c313225579995a7910e519bbc7b1dcdab9a755" +SRC_URI[md5sum] = "b2b20d3ed520128513f8d3135b42e142" +SRC_URI[sha256sum] = "d2a57b823ea59e53a3b130eef05dfed1190b857854f886eec764e1ca1957cf56" UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" @@ -79,4 +79,4 @@ FILES_tslib-calibrate += "${bindir}/ts_calibrate" FILES_tslib-uinput += "${bindir}/ts_uinput" FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ - ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev" + ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb index 26977bea5..7b6ef9682 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb @@ -9,5 +9,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "3c25b40de530112c08bf7d229c5c6a28" -SRC_URI[sha256sum] = "0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12" +SRC_URI[md5sum] = "9c34da77363dc3d0f616980da87244bf" +SRC_URI[sha256sum] = "5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb index 137a1655e..d98ce4751 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_349.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_350.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=c7faceb872d90115e7 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[md5sum] = "194012229738f74bc44e7c0f5f6bf0c8" -SRC_URI[sha256sum] = "39a6a3d3724f9a0a068f8cc353ab0c82831f0a43abb24470d933af299658475f" +SRC_URI[md5sum] = "189b593841189da66bc1cea92df602a5" +SRC_URI[sha256sum] = "aefb59eefd310268080d1a90a447368fb97a9a6737bfecfc3800bf6cc304104d" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch new file mode 100644 index 000000000..586ff18c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -0,0 +1,22 @@ +Subject: [PATCH] Add build rule for README. + +fix do_configure error: +Makefile.am: required file `./README' not found + +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 49574a3..a5a7c2a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) + ChangeLog: + git log --stat --decorate=short > $@ + ++README: README.md +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb index 95a41d2f7..de07bfd23 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.31.bb @@ -8,10 +8,11 @@ RDEPENDS_${PN} = "pcsc-lite" SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://no-dep-on-libfl.patch \ + file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[md5sum] = "817abceef715e02cb47617621fe192e0" -SRC_URI[sha256sum] = "ac17087be08880a0cdf99a8a2799a4ef004dc6ffa08b4d9b0ad995f39a53ff7c" +SRC_URI[md5sum] = "e4690f3362f95adb2332fd47a2b08212" +SRC_URI[sha256sum] = "6b48d7b6e4390e038d25630f8664fe81618ab00f232d6efbe0e3cc6df28ce8f7" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 6428958f9..25e0af3ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" -SRC_URI[md5sum] = "616efd99af3d9ef731a26bed6cee9593" -SRC_URI[sha256sum] = "088307d9f6b6c4b8c13f34602e8ff65d21c2dc4d55284dfe15d502c4ee190d67" +SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" +SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" inherit autotools pkgconfig @@ -21,7 +21,7 @@ EXTRA_OECONF += "\ # only one of openssl and gcrypt could be set PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl" -PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt" +PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch deleted file mode 100644 index 07cb88ffb..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 -From: Marian Csontos <mcsontos@redhat.com> -Date: Mon, 19 Aug 2019 14:54:43 +0200 -Subject: [PATCH] configure: Fix setting of CLDFLAGS default - ---- - configure | 6 +++--- - configure.ac | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> - -diff --git a/configure b/configure -index ff3a59b6b..4c8476502 100755 ---- a/configure -+++ b/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - -diff --git a/configure.ac b/configure.ac -index 5da694631..830edb8da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) - AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -51,7 +51,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -64,7 +64,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb index be558ce1d..be558ce1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.05.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 41bf78a3f..01c9df45c 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,9 +15,8 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ - file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " -SRCREV = "60bd9e8406ac28a04aa5e8165149f7a5d4f3265a" +SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd license diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch deleted file mode 100644 index a864f1e21..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-activation-add-synchronization-point.patch +++ /dev/null @@ -1,82 +0,0 @@ -From f8466749dd73f5b0ccf4fc86c8a7585c4140b3f9 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 16 Aug 2019 23:49:59 +0200 -Subject: [PATCH 1/3] activation: add synchronization point - -Resuming of 'error' table entry followed with it's dirrect removal -is now troublesame with latest udev as it may skip processing of -udev rules for already 'dropped' device nodes. - -As we cannot 'synchronize' with udev while we know we have devices -in suspended state - rework 'cleanup' so it collects nodes -for removal into pending_delete list and process the list with -synchronization once we are without any suspended nodes. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - WHATS_NEW | 9 +++++++++ - lib/activate/dev_manager.c | 20 ++++++++++++-------- - 2 files changed, 21 insertions(+), 8 deletions(-) - -diff --git a/WHATS_NEW b/WHATS_NEW -index 3a58de5f9..0b48e032b 100644 ---- a/WHATS_NEW -+++ b/WHATS_NEW -@@ -1,3 +1,12 @@ -+Version 2.03.06 - -+================================ -+ Synchronize with udev when dropping snapshot. -+ Add missing device synchronization point before removing pvmove node. -+ Correctly set read_ahead for LVs when pvmove is finished. -+ Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. -+ Prevent creating VGs with PVs with different logical block sizes. -+ Fix metadata writes from corrupting with large physical block size. -+ - Version 2.03.05 - 15th June 2019 - ================================ - Fix command definition for pvchange -a. -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 981f4674a..7101ffa12 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3558,13 +3558,6 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - const char *name, *uuid; - struct dm_str_list *dl; - -- /* Deactivate any tracked pending delete nodes */ -- dm_list_iterate_items(dl, &dm->pending_delete) { -- log_debug_activation("Deleting tracked UUID %s.", dl->str); -- if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -- return_0; -- } -- - while ((child = dm_tree_next_child(&handle, root, 0))) { - if (!(name = dm_tree_node_get_name(child))) - continue; -@@ -3585,10 +3578,21 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (non_toplevel_tree_dlid && !strcmp(non_toplevel_tree_dlid, uuid)) - continue; - -- if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) -+ if (!str_list_add(dm->mem, &dm->pending_delete, uuid)) - return_0; - } - -+ /* Deactivate any tracked pending delete nodes */ -+ if (!dm_list_empty(&dm->pending_delete) && !dm_get_suspended_counter()) { -+ fs_unlock(); -+ dm_tree_set_cookie(root, fs_get_cookie()); -+ dm_list_iterate_items(dl, &dm->pending_delete) { -+ log_debug_activation("Deleting tracked UUID %s.", dl->str); -+ if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) -+ return_0; -+ } -+ } -+ - return 1; - } - --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch deleted file mode 100644 index 5a6db4b88..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e48f8328f9d35f23a24e5b27237e8ebf1dbfa269 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 10 Oct 2019 22:38:00 -0400 -Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule - -The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216, -that is ~5 years ago. - -Since systemd/udev version 243, there's a new message printed if unsupported -OPTIONS value is used: - - Invalid value for OPTIONS key, ignoring: 'event_timeout=180' - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666 - -Signed-off-by: Peter Rajnoha <prajnoha@redhat.com> - -Upstream-Status: Backport [https://github.com/lvmteam/lvm2/commit/125f27ac37bc9b93cc96f64052b9681b3d479ee1] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - udev/11-dm-lvm.rules.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in -index 91cb991..7c58994 100644 ---- a/udev/11-dm-lvm.rules.in -+++ b/udev/11-dm-lvm.rules.in -@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE - - ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" - --OPTIONS+="event_timeout=180" -- - # Do not create symlinks for inappropriate subdevices. - ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" - ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch deleted file mode 100644 index e30731593..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0002-activation-extend-handling-of-pending_delete.patch +++ /dev/null @@ -1,124 +0,0 @@ -From d06ad77b47f4dfd25bc3da88c0621ac073ad8ce5 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Fri, 23 Aug 2019 13:08:34 +0200 -Subject: [PATCH 2/3] activation: extend handling of pending_delete - -With previous patch 30a98e4d6710a543692d40d11428ae4baea11b7b we -started to put devices one pending_delete list instead -of directly scheduling their removal. - -However we have operations like 'snapshot merge' where we are -resuming device tree in 2 subsequent activation calls - so -1st such call will still have suspened devices and no chance -to push 'remove' ioctl. - -Since we curently cannot easily solve this by doing just single -activation call (which would be preferred solution) - we introduce -a preservation of pending_delete via command structure and -then restore it on next activation call. - -This way we keep to remove devices later - although it might be -not the best moment - this may need futher tunning. - -Also we don't keep the list of operation in 1 trasaction -(unless we do verify udev symlinks) - this could probably -also make it more correct in terms of which 'remove' can -be combined we already running 'resume'. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - lib/activate/dev_manager.c | 24 +++++++++++------------- - lib/commands/toolcontext.c | 8 ++++++++ - lib/commands/toolcontext.h | 1 + - 3 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c -index 7101ffa12..7a7689291 100644 ---- a/lib/activate/dev_manager.c -+++ b/lib/activate/dev_manager.c -@@ -3591,6 +3591,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, const - if (!dm_tree_deactivate_children(root, dl->str, strlen(dl->str))) - return_0; - } -+ dm_list_init(&dm->pending_delete); - } - - return 1; -@@ -3717,25 +3718,22 @@ out_no_root: - int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv, - struct lv_activate_opts *laopts) - { -+ dm_list_splice(&dm->pending_delete, &lv->vg->cmd->pending_delete); -+ - if (!_tree_action(dm, lv, laopts, ACTIVATE)) - return_0; - -- /* -- * When lvm2 resumes a device and shortly after that it removes it, -- * udevd rule will try to blindly call 'dmsetup info' on already removed -- * device leaving the trace inside syslog about failing operation. -- * -- * TODO: It's not completely clear this call here is the best fix. -- * Maybe there can be a better sequence, but ATM we do usually resume -- * error device i.e. on cache deletion and remove it. -- * TODO2: there could be more similar cases! -- */ -- if (!dm_list_empty(&dm->pending_delete)) -- fs_unlock(); -- - if (!_tree_action(dm, lv, laopts, CLEAN)) - return_0; - -+ if (!dm_list_empty(&dm->pending_delete)) { -+ log_debug("Preserving %d device(s) for removal while being suspended.", -+ dm_list_size(&dm->pending_delete)); -+ if (!(str_list_dup(lv->vg->cmd->mem, &lv->vg->cmd->pending_delete, -+ &dm->pending_delete))) -+ return_0; -+ } -+ - return 1; - } - -diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index 1e03ea235..0a9355361 100644 ---- a/lib/commands/toolcontext.c -+++ b/lib/commands/toolcontext.c -@@ -1734,6 +1734,8 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, - cmd->current_settings = cmd->default_settings; - - cmd->initialized.config = 1; -+ -+ dm_list_init(&cmd->pending_delete); - out: - if (!cmd->initialized.config) { - destroy_toolcontext(cmd); -@@ -1922,6 +1924,12 @@ int refresh_toolcontext(struct cmd_context *cmd) - - cmd->initialized.config = 1; - -+ if (!dm_list_empty(&cmd->pending_delete)) { -+ log_debug(INTERNAL_ERROR "Unprocessed pending delete for %d devices.", -+ dm_list_size(&cmd->pending_delete)); -+ dm_list_init(&cmd->pending_delete); -+ } -+ - if (cmd->initialized.connections && !init_connections(cmd)) - return_0; - -diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h -index 6e4530c8a..54ddec320 100644 ---- a/lib/commands/toolcontext.h -+++ b/lib/commands/toolcontext.h -@@ -237,6 +237,7 @@ struct cmd_context { - const char *report_list_item_separator; - const char *time_format; - unsigned rand_seed; -+ struct dm_list pending_delete; /* list of LVs for removal */ - }; - - /* --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch deleted file mode 100644 index 953e4ad65..000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0003-snapshot-always-activate.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9143445478871b47ba28b41f5e88d4c415f8205b Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac <zkabelac@redhat.com> -Date: Mon, 26 Aug 2019 15:13:55 +0200 -Subject: [PATCH 3/3] snapshot: always activate - -Drop the 'cluster-only' optimization so we do resume ALL device -before we try to wait on cookie before 'removal' operation. - -It's more correct order of operation - alhtough possibly slightly -less efficient - but until we have correct list of operations -'in-progress' we can't do anything better. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - lib/metadata/snapshot_manip.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c -index 5ccf251c7..65d8dbd13 100644 ---- a/lib/metadata/snapshot_manip.c -+++ b/lib/metadata/snapshot_manip.c -@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow) - return 0; - } - -- /* -- * For merged snapshot and clustered VG activate cow LV so -- * the following call to deactivate_lv() can clean-up table -- * entries. For this clustered lock need to be held. -- */ -- if (vg_is_clustered(cow->vg) && -- merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { -+ if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) { - log_error("Failed to activate %s.", cow->name); - return 0; - } --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index b80f1fd4b..e2b551bbc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.05.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -3,10 +3,6 @@ require lvm2.inc 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 \ - file://0001-udev-remove-unsupported-OPTIONS-event_timeout-rule.patch \ - file://0001-activation-add-synchronization-point.patch \ - file://0002-activation-extend-handling-of-pending_delete.patch \ - file://0003-snapshot-always-activate.patch \ " DEPENDS += "autoconf-archive-native" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 888c729b3..007b3944a 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ file://makefile-remove-ldflags.patch \ " -SRCREV = "74bffd8b0aa27051aeaa1983a7b23975ca8d8726" -PV = "20171030+git${SRCPV}" +SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" +PV = "20190917+git${SRCPV}" RDEPENDS_${PN} = "mcelog mce-inject dialog bash" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb index af309d1c6..8af919fea 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_164.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; file://run-ptest \ " -SRCREV = "e53631f84a181be371c08e0b961180bff77fd2ab" +SRCREV = "6b6a8a571b5b0967cadbee770bf444f4e8634cca" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch index 0fc40be4a..b5bfcd025 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch @@ -1,6 +1,3 @@ -From caeccb7bec45f65bc89efa8195b3853368328361 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 17 Sep 2018 12:49:36 +0800 Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 service start failed since segment fault on arch arm64, @@ -17,12 +14,15 @@ https://github.com/buytenh/ivykis/issues/15 Upstream-Status: Pending Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - lib/ivykis/src/pthr.h | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + lib/ivykis/src/pthr.h | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index a41eaf3..72c5190 100644 +index 29e4be7..5d29096 100644 --- a/lib/ivykis/src/pthr.h +++ b/lib/ivykis/src/pthr.h @@ -24,6 +24,16 @@ @@ -47,12 +47,12 @@ index a41eaf3..72c5190 100644 #ifdef HAVE_PRAGMA_WEAK -/* -- * On Linux, pthread_atfork() is defined in libpthread_nonshared.a, -- * a static library, and we want to avoid "#pragma weak" for that -- * symbol because that causes it to be undefined even if you link -- * libpthread_nonshared.a in explicitly. +- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for +- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and +- * we want to avoid "#pragma weak" for that symbol because that causes +- * it to be undefined even if you link lib*_nonshared.a in explicitly. - */ --#ifndef HAVE_LIBPTHREAD_NONSHARED +-#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) -#pragma weak pthread_atfork -#endif - @@ -60,16 +60,15 @@ index a41eaf3..72c5190 100644 #pragma weak pthread_create #pragma weak pthread_detach #pragma weak pthread_getspecific -@@ -73,8 +74,7 @@ static inline int +@@ -73,7 +74,7 @@ static inline int pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { if (pthreads_available()) - return pthread_atfork(prepare, parent, child); -- + return __register_atfork(prepare, parent, child, __dso_handle); + return ENOSYS; } - -- 2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch index 553f4a517..4ad0afa95 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch @@ -6,25 +6,28 @@ This would avoid a implicit auto-detecting result. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Update for 3.24.1. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - configure.ac | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) + configure.ac | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) -Index: syslog-ng-3.8.1/configure.ac -=================================================================== ---- syslog-ng-3.8.1.orig/configure.ac -+++ syslog-ng-3.8.1/configure.ac -@@ -104,6 +104,9 @@ AC_CONFIG_HEADERS(config.h) +diff --git a/configure.ac b/configure.ac +index 00eb566..e7d5ac1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) dnl *************************************************************************** dnl Arguments -+AC_ARG_ENABLE(libnet, ++AC_ARG_ENABLE(libnet, + [ --enable-libnet Enable libnet support.],, enable_libnet="no") + AC_ARG_WITH(libnet, [ --with-libnet=path use path to libnet-config script], , -@@ -893,22 +896,26 @@ dnl ************************************ +@@ -1047,19 +1050,20 @@ dnl *************************************************************************** dnl libnet headers/libraries dnl *************************************************************************** AC_MSG_CHECKING(for LIBNET) @@ -39,7 +42,14 @@ Index: syslog-ng-3.8.1/configure.ac + else + LIBNET_CONFIG="$with_libnet/libnet-config" + fi -+ + +-if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" +- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" +- AC_MSG_RESULT(yes) +-dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build +-dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till +- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then + LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" + LIBNET_LIBS="`$LIBNET_CONFIG --libs`" @@ -48,16 +58,8 @@ Index: syslog-ng-3.8.1/configure.ac + AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) + fi --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) else LIBNET_LIBS= - AC_MSG_RESULT(no) - fi - -- - if test "x$enable_spoof_source" = "xauto"; then - AC_MSG_CHECKING(whether to enable spoof source support) - if test "x$LIBNET_LIBS" != "x"; then +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 39c3f59ce..0e1d09492 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,16 +1,17 @@ -From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Wed, 17 Jun 2015 14:46:30 +0900 -Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. Upstream-Status: pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> + +Update for 3.24.1 +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- - contrib/systemd/syslog-ng.service | 5 ++--- - 1 file changed, 2 insertion(+), 3 deletions(-) + contrib/systemd/syslog-ng@.service | 4 ++-- + contrib/systemd/syslog-ng@default | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service index a28640e..93aec94 100644 @@ -28,19 +29,18 @@ index a28640e..93aec94 100644 StandardError=journal Restart=on-failure diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default -index 02da288..3a8215d 100644 +index 0ccc2b9..7f08c0e 100644 --- a/contrib/systemd/syslog-ng@default +++ b/contrib/systemd/syslog-ng@default @@ -1,5 +1,5 @@ --CONFIG_FILE=/etc/syslog-ng.conf + CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist --CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl +-CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid -+CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" - -- -1.8.4.2 +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 4c22d4b0f..3aba4473d 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -92,7 +92,6 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 0644 ${S}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb index 852343c23..01ed76765 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb @@ -10,5 +10,5 @@ SRC_URI += " \ file://syslog-ng-tmp.conf \ " -SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" -SRC_URI[sha256sum] = "5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178" +SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" +SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index c9d87e36d..98f2cacf1 100644 --- a/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb +++ b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb @@ -17,3 +17,5 @@ EXTRA_OECONF = "--enable-memtrace --enable-automated --enable-basic --enable-con FILES_${PN}-dev += "${datadir}/CUnit" FILES_${PN}-doc += "${docdir}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb index 69f045dba..a8ed1e91b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.8.1.bb @@ -1,2 +1,3 @@ inherit setuptools require python-configparser.inc +RDEPENDS_${PN} += "python-pkgutil" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc new file mode 100644 index 000000000..50c93e943 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "Backports and enhancements for the contextlib module" +HOMEPAGE = "http://contextlib2.readthedocs.org/" +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=43d1c7827e8fad6454b553caf0e1d734" + +SRC_URI[md5sum] = "d03a631073b40073b5c41364ad8f5979" +SRC_URI[sha256sum] = "7197aa736777caac513dbd800944c209a49765bf1979b12b037dce0277077ed3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb new file mode 100644 index 000000000..87cffb98f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-contextlib2_0.6.0.bb @@ -0,0 +1,3 @@ +inherit pypi setuptools +require python-contextlib2.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc index 426159465..3260e92ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "f8109a2a86cded40b3896ee7a63bc5a5" -SRC_URI[sha256sum] = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e" +SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c" +SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.14.bb index d803a6ed4..d803a6ed4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.29.14.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc index caf4340b2..65db1a961 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc @@ -9,8 +9,8 @@ decorator, just because you can." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22" -SRC_URI[md5sum] = "a565a98581c0d110bc247323e89df9b1" -SRC_URI[sha256sum] = "86156361c50488b84a3f148056ea716ca587df2f0de1d34750d35c21312725de" +SRC_URI[md5sum] = "933981f288c4230816b5beee8d40e6ea" +SRC_URI[sha256sum] = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.1.bb index 2a2b455f5..2a2b455f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc index ecf74a0bc..7e499a6c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc @@ -2,8 +2,8 @@ SUMMARY = "Dominate is a Python library for creating and manipulating HTML docum LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" -SRC_URI[md5sum] = "45bd97e6f7888aac24ae86013c57638e" -SRC_URI[sha256sum] = "4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69" +SRC_URI[md5sum] = "27d3aa7e0d67902c505e248e705e5e2e" +SRC_URI[sha256sum] = "a92474b4312bd8b4c1789792f3ec8c571cd8afa8e7502a2b1c64dd48cd67e59c" RDEPENDS_${PN} += "\ ${PYTHON_PN}-numbers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.4.0.bb index c19445e72..c19445e72 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.4.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc index f560f3ed5..0e507f337 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc @@ -2,8 +2,8 @@ DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" -SRC_URI[md5sum] = "07803453743f139309021572a799c6b3" -SRC_URI[sha256sum] = "c0d75710bd4b0fe866f9f2347de6e19208712f9cec006436b4c1c15d4cb0c939" +SRC_URI[md5sum] = "fcf2f360ff279d3133e40974804efd72" +SRC_URI[sha256sum] = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86" PYPI_PACKAGE = "Flask-Babel" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.12.2.bb index 38e78c73f..38e78c73f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.12.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc index dfb20e9ee..5202f8be0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc @@ -2,8 +2,8 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[md5sum] = "aaeee55431d0287063657122ff41a0e6" -SRC_URI[sha256sum] = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07" +SRC_URI[md5sum] = "bedeb0366740fda6912fea683be11968" +SRC_URI[sha256sum] = "a96ff1875a49a40bd3e8ac04fce73fdb0870b9211e6168608cbafa4eb839d502" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.5.2.bb index ece516f50..ece516f50 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc index 0485f85aa..dcbcd0d76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/flask-restful/flask-restful" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=685bb55ed99a366bb431995f5eef2783" -SRC_URI[md5sum] = "8243ca101185b130d8fa529cbdbdbddd" -SRC_URI[sha256sum] = "5795519501347e108c436b693ff9a4d7b373a3ac9069627d64e4001c05dd3407" +SRC_URI[md5sum] = "a7217ef1159be38af5faf61aa09aabef" +SRC_URI[sha256sum] = "f8240ec12349afe8df1db168ea7c336c4e5b0271a36982bff7394f93275f2ca9" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.7.bb index 1968d1d9d..1968d1d9d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc index 251d13ede..8d778d4bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio.inc @@ -9,8 +9,8 @@ inherit pypi PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[md5sum] = "298965a43f6534e8a5b24d1ba1fc4186" -SRC_URI[sha256sum] = "8d8f9f104db5ddff1b06ba322d8e158881d590144199c993fe26cf53218c7edd" +SRC_URI[md5sum] = "b23222fb7dd2f0676d78bbe24153fd80" +SRC_URI[sha256sum] = "2172dff1e42415ba480cee02c30c2fc833671ff326f1598ee3d69aa02cf768ec" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_4.2.1.bb index 3b9ad33bb..3b9ad33bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-socketio_4.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc index 957d07dbb..86ba9dda5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc @@ -1,9 +1,9 @@ DESCRIPTION = "Adds SQLAlchemy support to your Flask application." LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5ed1b8cc741515a835a7f6bf2f62ef4a" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[md5sum] = "373ce61dfd03b593ad2eaba68c9fee35" -SRC_URI[sha256sum] = "5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53" +SRC_URI[md5sum] = "1f5781cf3e1a2b1aabda47a5b20d2073" +SRC_URI[sha256sum] = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d" PYPI_PACKAGE = "Flask-SQLAlchemy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.4.1.bb index 3dc355c5d..3dc355c5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb index 5c213004c..09c5700db 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb @@ -1,2 +1,7 @@ inherit pypi setuptools require python-importlib-metadata.inc +RDEPENDS_${PN} += "python-configparser \ + python-contextlib2 \ + python-pathlib2 \ + python-compression \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index d9ccf1cad..1841b5893 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -10,6 +10,7 @@ DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += " \ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-core \ + ${PYTHON_PN}-importlib-metadata \ ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ ${PYTHON_PN}-netclient \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc index 41c334e8d..33095b3d3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc @@ -2,8 +2,3 @@ DESCRIPTION = "More routines for operating on iterables, beyond itertools" HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" - -SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4" -SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb new file mode 100644 index 000000000..c66e55cac --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb @@ -0,0 +1,5 @@ +inherit pypi setuptools +require python-more-itertools.inc + +SRC_URI[md5sum] = "f2ea58aa336ce6c13b7b225b3bbe305d" +SRC_URI[sha256sum] = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb deleted file mode 100644 index 0702aad4e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-more-itertools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc index 66943ed6c..0a0e61084 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc @@ -8,8 +8,8 @@ SRCNAME = "paho-mqtt" inherit pypi -SRC_URI[md5sum] = "e3ac29cd5dc247a01083a2a8f3fddd08" -SRC_URI[sha256sum] = "e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79" +SRC_URI[md5sum] = "45e80d9b8066a8d0ba1ecfffe271bd3d" +SRC_URI[sha256sum] = "e3d286198baaea195c8b3bc221941d25a3ab0e1507fc1779bdb7473806394be4" DEPENDS += "${PYTHON_PN}-pytest-runner-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.5.0.bb index a1031176e..a1031176e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.5.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb index e4bf78913..6317e1c16 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.5.bb @@ -1,2 +1,6 @@ inherit pypi setuptools require python-pathlib2.inc + +RDEPENDS_${PN} += "python-scandir \ + python-misc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc index 57660060c..1931532a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc @@ -7,5 +7,8 @@ SRC_URI[md5sum] = "4b8384b69cddbc2e104fdd3ff5631788" SRC_URI[sha256sum] = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-importlib-metadata \ + ${PYTHON_PN}-more-itertools \ +" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc index d866c5650..9a066f7f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://github.com/kurtbrose/pyjks" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9694d6cc724caf7f7386be88a4a81958" -SRC_URI[md5sum] = "d53501e7c80d465969742bc6bee91d49" -SRC_URI[sha256sum] = "709c44a303dd6b2464078ebeb677417e717818d4b3dc3844a462bef9d215dcc8" +SRC_URI[md5sum] = "b6e8f3b91be355d15e3ba99de2cccf9b" +SRC_URI[sha256sum] = "9ce5b40289bcdffcd6a8e7118b333ba8ba2ec4c9ebc5e324885cc8a69767011a" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_19.0.0.bb index ce99f2835..ce99f2835 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_19.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc index 00c38e317..9b8938530 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" -SRC_URI[md5sum] = "2731c6b66b67b95d1944f072f5fa35a9" -SRC_URI[sha256sum] = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176" +SRC_URI[md5sum] = "a4712f980c008696e13e09504120b2a0" +SRC_URI[sha256sum] = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96" PYPI_PACKAGE = "PyJWT" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.7.1.bb index f0a77b674..f0a77b674 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc index 468a80122..4c61d9fff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[md5sum] = "6d549b36cbfa8c1a3323c5d6e299789e" -SRC_URI[sha256sum] = "f4ed2000cbe1a314f1f88fd8a8eba4ad05974b351b96f1235c6e532158a39fe0" +SRC_URI[md5sum] = "77aef367e57ba7dcc6f9b3d445a960ed" +SRC_URI[sha256sum] = "de67196f6a8916b9c52a84a1c45ea967c53fa9d2b3795b070ad2c1cbc28d79d7" RDEPENDS_${PN} += " \ ${PYTHON_PN}-dateutil \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.93.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.117.2.bb index 1b1fbe956..1b1fbe956 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.93.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.117.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc index ed1981e49..7a14b9efb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc @@ -3,8 +3,8 @@ LICENSE = "GPLv2 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" -SRC_URI[md5sum] = "2f6f951e94356ae9d224f417dc6ebed2" -SRC_URI[sha256sum] = "42bf74495d95a0196a74dd171357f660175aba2bfc23f9b5f63e3830ccbef9ac" +SRC_URI[md5sum] = "371683b62314211b8bc9807ac8ef1144" +SRC_URI[sha256sum] = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyroute2:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.7.bb index f25f1b4ab..f25f1b4ab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.5.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc index 2add037de..fad488dd9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/tobgu/pyrsistent" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.mit;md5=ca574f2891cf528b3e7a2ee570337e7c" -SRC_URI[md5sum] = "0298efae86e009e24136d39dc8b2d33e" -SRC_URI[sha256sum] = "34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" +SRC_URI[md5sum] = "903c518c8829de4ee255cff68ff8da45" +SRC_URI[sha256sum] = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778" RDEPENDS_${PN} += " \ ${PYTHON_PN}-six \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.5.bb index 832eb8038..832eb8038 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.3.4.bb index 7a2d89d99..43aa4b84c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.3.4.bb @@ -6,10 +6,10 @@ HOMEPAGE = "https://pypi.python.org/pypi/pysmi" SECTION = "devel/python" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d8b1bbadd635f187dee74d999a8c67b8" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a088b5c72b59d51a5368ad3b18e219bf" -SRC_URI[md5sum] = "3b0f71e4e9f730d211f09d8ef5371140" -SRC_URI[sha256sum] = "2a315cc3e556b3428372b69da663a24d2f0df9e9ab075b022cb133855f25aef7" +SRC_URI[md5sum] = "10a9dd140ad512eed9f37344df83ce9d" +SRC_URI[sha256sum] = "bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index fa264f791..a26d41084 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "00561d0295aab167987f8a4f784964c4" -SRC_URI[sha256sum] = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0" +SRC_URI[md5sum] = "889344299c9182aff67d6e461cb7af29" +SRC_URI[sha256sum] = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.2.bb index 39e50aca9..39e50aca9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.2.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb new file mode 100644 index 000000000..253c2342b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-scandir_1.10.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "A better directory iterator and faster os.walk()" +HOMEPAGE = "https://github.com/benhoyt/scandir" +AUTHOR = "Ben Hoyt" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=482ee62da51806409d432a80eed4e3ea" + +SRC_URI = "git://github.com/benhoyt/scandir.git" +SRCREV = "982e6ba60e7165ef965567eacd7138149c9ce292" + +S = "${WORKDIR}/git" + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc index 2ba65706b..1a3aac07f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc @@ -1,9 +1,9 @@ SUMMARY = "Serialization based on ast.literal_eval" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5a8193ba89f1083617f32d522f6485e9" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=5cd70632b6cdb96df9ddaf6a4ce619e6" -SRC_URI[md5sum] = "0f9684622125a527fa4fbe2587738973" -SRC_URI[sha256sum] = "264a028e059c1b557701ae7c567cdab330dbd228ff924489343efcb39bd828a0" +SRC_URI[md5sum] = "15ef8b67c76a6d19bac9c16731a1e62a" +SRC_URI[sha256sum] = "f306336ca09aa38e526f3b03cab58eb7e45af09981267233167bcf3bfd6436ab" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.28.bb index 0db3cf98a..0db3cf98a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.25.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.28.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc index f472a57f4..8ba1ab2b8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc @@ -1,11 +1,11 @@ SUMMARY = "Set of i2c tools for linux - Python module" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" +LIC_FILES_CHKSUM = "file://smbusmodule.c;beginline=1;endline=18;md5=46e424fb045901ab25e0f92c28c80055" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz " -SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa" -SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403" +SRC_URI[md5sum] = "3536237a6b51fb10caacdc3b8a496237" +SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a014e0073" DEPENDS += "i2c-tools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.1.bb index 1b9577887..1b9577887 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.13.bb index c5af48dd3..c885a7fbe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.13.bb @@ -8,8 +8,8 @@ DEPENDS += "libsmi python-cffi-native python-vcversioner-native" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=7c53ab2d1240828625c3e093d049d4f4" -SRC_URI[md5sum] = "6d016b6356db432e6a87ad708eb8fcb6" -SRC_URI[sha256sum] = "04efcfba867ffb0e10cc8d7f93a553ceb6bdf2ee34e49762749028a2c76096c1" +SRC_URI[md5sum] = "7c57acac10226df5bf43e10b929942df" +SRC_URI[sha256sum] = "98b1790977b435332c03ab2603f6621eeeee69a50453ac01ca55dc7696d08535" inherit pypi setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb new file mode 100644 index 000000000..1c0b560b4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-contextlib2_0.6.0.bb @@ -0,0 +1,3 @@ +inherit pypi setuptools3 +require python-contextlib2.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb index 2ce6bdbd6..2ce6bdbd6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb index 844cbdc9a..844cbdc9a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.4.0.bb index 5304ccc18..5304ccc18 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.4.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb index 104e7c28f..104e7c28f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.2.bb index c98cbfddb..c98cbfddb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.5.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.7.bb index 6bff59a56..6bff59a56 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.2.1.bb index ffc4aa7fd..ffc4aa7fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_4.2.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.1.bb index 07f45bcff..07f45bcff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.4.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb index d71c45b5f..4c53d5fbb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb @@ -1,2 +1,4 @@ inherit pypi setuptools3 require python-importlib-metadata.inc + +RDEPENDS_${PN} += "python3-misc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb index 28ddf88fb..06d45ce54 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb @@ -1,2 +1,5 @@ inherit pypi setuptools3 require python-more-itertools.inc + +SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4" +SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb index 4981e61ed..4981e61ed 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_19.0.0.bb index 8982fcebc..8982fcebc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_19.0.0.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb index dc16d2282..dc16d2282 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.7.1.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.93.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.117.2.bb index 4523d9e30..4523d9e30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.93.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.117.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb index a23e72c4a..a23e72c4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.5.bb index 2e567e9f9..2e567e9f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.5.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.2.bb index eba6632a2..eba6632a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.2.2.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.25.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.28.bb index 1e04def7b..1e04def7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.25.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.28.bb diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb index b357bcd82..b357bcd82 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb diff --git a/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass index 29c1245ca..f34ee0739 100644 --- a/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass +++ b/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass @@ -4,11 +4,11 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libxfce4ui libxfce4util xfce4-panel" -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" FILES_${PN} += "${datadir}/xfce4/panel-plugins/" FILES_${PN} += "${datadir}/xfce4/panel/plugins/" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel/plugins/*.so" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la"
\ No newline at end of file +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch deleted file mode 100644 index e872249d5..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fb1f83c04dd5262897b09e60fa8b39090d0d4619 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Thu, 12 Nov 2015 13:53:03 -0600 -Subject: [PATCH] fix Name/Comment fields - -Validate as a valid .desktop file per -http://standards.freedesktop.org/desktop-entry-spec/latest/ - -See also issue #2 - -Upstream-Status: Applied [1] - -[1] https://github.com/ncopa/xfce-polkit/commit/fb1f83c04dd5262897b09e60fa8b39090d0d4619 ---- - xfce-polkit.desktop.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xfce-polkit.desktop.in b/xfce-polkit.desktop.in -index 8575896..dd9f09c 100644 ---- a/xfce-polkit.desktop.in -+++ b/xfce-polkit.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application --_Name=XFCE PolKit --_Comment=Policykit Authentication Agent -+Name=XFCE PolKit -+Comment=Policykit Authentication Agent - Exec=@xfce_polkit_libexecdir@/xfce-polkit - Icon=gtk-dialog-authentication - NotShowIn=GNOME;KDE; --- -2.14.3 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 62d8d6de9..3a396c0f7 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -9,7 +9,6 @@ REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = " \ git://github.com/ncopa/${BPN}.git \ - file://0001-fix-Name-Comment-fields.patch \ " -SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" +SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.8.bb index 4a1aae764..9c9c327b7 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" inherit xfce-app @@ -16,11 +16,12 @@ SRC_URI_append = " \ file://fix-cross-compile.patch \ file://fix-pam-config.patch \ " -SRC_URI[md5sum] = "982f9a355456320933ec08313523a567" -SRC_URI[sha256sum] = "fdecf0fc432b59defba2dd706051696d47227ca0744c7971014021190126f2d5" +SRC_URI[md5sum] = "0fea7b676e6e533a3f305c6f642fe0cd" +SRC_URI[sha256sum] = "4056045ea5fd3eccfe328b86ae245ee4949b9e3044e42ca29c492c0f4ac860d7" do_install_append() { install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver } FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" +RDEPENDS_${PN} += "python3-core" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb index 7f6756fc9..a0de63004 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb @@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "9e4026d9ae7850b290992c9d2aea80dd" -SRC_URI[sha256sum] = "88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658" +SRC_URI[md5sum] = "9b63c0fa7cbde8ec4e6cacb75fc44b65" +SRC_URI[sha256sum] = "0f7161053a23a6413376f4d17db6b774d4849384a9b1ffe01fdb2b0035a070d1" do_compile_prepend() { mkdir -p lib diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb index 002e93da4..3108a7760 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" inherit xfce-panel-plugin -SRC_URI[md5sum] = "9dd0681c179302d56d92bbda5765bd09" -SRC_URI[sha256sum] = "4c6ce37fbe71094548b44862587c2813da991aeaaecff8e572724dbbec83ab86" +SRC_URI[md5sum] = "d808fe77a438c95b97ec6feda6162d22" +SRC_URI[sha256sum] = "256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb index 4218c0c50..c3de5964d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "81e1a961032c7b87d672bed09c681a73" -SRC_URI[sha256sum] = "7f9cd4694e83d9cc5e41140d174dcc5ffe00fd546f2706f619031039ad7e0f6b" +SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" +SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb index c53ca13c8..96c2048be 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.0.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "e0bde3ba6a7e863022a86a23c7871255" -SRC_URI[sha256sum] = "7cdc18b8df759dee4ceaaf6ce303eff7fda48e247dbc26b78142929213506cfd" +SRC_URI[md5sum] = "7ff4ab636f93addba0817bf6436d2964" +SRC_URI[sha256sum] = "4423a0c27830fd1f08e063aaefbf70f31d89235d75549ca841d677ab2e409572" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb index a05f0dc6f..595e3c815 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "21f1e1d8d4a030f23d358d6c5ac50f2a" -SRC_URI[sha256sum] = "e0c6cc4fc1e685bc9601ec217a803d5489ca3276f4008bf056600471c6ac1848" +SRC_URI[md5sum] = "ee9e378fae78b230a23b241cf727c84b" +SRC_URI[sha256sum] = "84d3de35695a023aab181f7a9b75f59029eb3b07c3e47a5e11e8bd79db62570e" RRECOMMENDS_${PN} += "menulibre" |