diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-10-30 23:42:48 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-10-30 23:43:27 +0300 |
commit | bbbd5f468dc9c43b203cac3775f6c1b782ca7cba (patch) | |
tree | c1102cd773825fb6d69caaff22011b069e71a646 /meta-openembedded | |
parent | 157744bac930642ebf7952ec8dc3df2faffd0928 (diff) | |
download | openbmc-bbbd5f468dc9c43b203cac3775f6c1b782ca7cba.tar.xz |
meta-openembedded: subtree update:2258c9a767..164a6030b0
Alejandro Hernandez Samaniego (1):
emacs: Fix packaging for emacs-minimal
Andreas Müller (8):
fluidsynth: upgrade 2.1.3 -> 2.1.5
hdf5: Shorten SUMMARY and move long text to DESCRIPTION
wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES
wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it
wxwidgets: upgrade 3.1.3 -> 3.1.4
babl: upgrade 0.1.78 -> 0.1.82
gegl: upgrade 0.4.24 -> 0.4.26
gimp: upgrade 2.10.20 -> 2.10.22
Andrej Valek (2):
nss: upgrade 3.56 -> 3.57
nspr: upgrade 4.26 -> 4.29
Chen Qi (2):
open-isns: use /run instead of /var/run in systemd service file
openhpi: use /run instead of /var/run in systemd service file
Daniel Ammann (2):
dhex: add homepage
pcsc-tools: add new package
Fagundes, Paulo (1):
vnstat: add recipe
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.14 -> 6.1.16
Gianluca Pacchiella (1):
Add missing dependencies for rsnapshot.
Khem Raj (5):
meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT
apitrace: Disable secuirty flags for clang
iscsi-initiator-utils: Silence a clang warning on 64bit systems
minifi-cpp: Do not use lld on riscv32
redis: Fix build with clang on riscv32
Leon Anavi (44):
python3-aiohttp: Upgrade 3.6.2 -> 3.6.3
python3-ujson: Upgrade 3.2.0 -> 4.0.1
python3-passlib: Upgrade 1.7.2 -> 1.7.4
python3-croniter: Upgrade 0.3.34 -> 0.3.35
python3-isort: Upgrade 5.5.4 -> 5.6.4
python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8
python3-yarl: Upgrade 1.6.0 -> 1.6.2
python3-sqlparse: Upgrade 0.3.1 -> 0.4.1
python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20
python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0
python3-markdown: Upgrade 3.3 -> 3.3.1
python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0
python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7
python3-luma-core: Upgrade 1.17.1 -> 1.17.2
python3-graphviz: Upgrade 0.14.1 -> 0.14.2
python3-yappi: Upgrade 1.2.5 -> 1.3.0
python3-iniconfig: Upgrade 1.0.1 -> 1.1.1
transmission: Upgrade 2.94 -> 3.00
python3-regex: Upgrade 2020.10.11 -> 2020.10.15
python3-colorama: Upgrade 0.4.3 -> 0.4.4
python3-zipp: Upgrade 3.3.0 -> 3.3.1
python3-pychromecast: Upgrade 7.5.0 -> 7.5.1
python3-semver: Upgrade 2.10.2 -> 2.13.0
python3-pydicti: Upgrade 1.1.3 -> 1.1.4
python3-humanize: Upgrade 3.0.1 -> 3.1.0
python3-dominate: Upgrade 2.5.2 -> 2.6.0
python3-urllib3: Upgrade 1.25.10 -> 1.25.11
python3-bitarray: Upgrade 1.5.3 -> 1.6.0
python3-markdown: Upgrade 3.3.1 -> 3.3.2
python3-pymisp: Upgrade 2.4.131 -> 2.4.133
python3-typeguard: Upgrade 2.9.1 -> 2.10.0
python3-traitlets: Upgrade 5.0.4 -> 5.0.5
python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1
python3-lxml: Upgrade 4.5.2 -> 4.6.1
python3-regex: Upgrade 2020.10.15 -> 2020.10.23
python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5
python3-cryptography: Upgrade 3.1.1 -> 3.2
python3-psutil: Upgrade 5.7.2 -> 5.7.3
python3-pyparted: Upgrade 3.11.6 -> 3.11.7
python3-tqdm: Upgrade 4.50.2 -> 4.51.0
python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1
python3-luma-core: Upgrade 1.17.2 -> 1.17.3
python3-zipp: Upgrade 3.3.1 -> 3.4.0
python3-aiohttp: Upgrade 3.6.3 -> 3.7.1
Luca Boccassi (2):
Add recipe for fsverity-utils
Add new recipe for squashfs-tools-ng
Mario Schuknecht (1):
wireguard-tools: Fix systemd service installation
Martin Jansa (3):
packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST
python3-colorama: add native and nativesdk to BBCLASSEXTEND
mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled
Michael Tretter (1):
apitrace: add new recipe
Mingli Yu (1):
mariadb: Upgrade to 10.5.6
Pascal Bach (1):
fmt: make available as native and nativesdk
Pierre-Jean Texier (3):
c-periphery: upgrade 2.2.1 -> 2.2.4
c-periphery: fix typo in SUMMARY
stunnel: upgrade 5.56 -> 5.57
Qi.Chen@windriver.com (4):
php: use /run instead /var/run in systemd service file
lmsensors: use /run instead of /var/run for systemd service
cyrus-sasl: use /run instead of /var/run for systemd service file
freediameter: use /run instead of /var/run in systemd service file
Ross Burton (2):
mpv: fetch waf in do_fetch
glmark2: no need to patch waf
Sakib Sajal (1):
python3-prettytable: add python3-wcwidth to RDEPENDS
Siming Yuan (1):
python3-paramiko: fixing runtime dependencies
Taisei Nakano (1):
anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM
Ulrich Ölmann (1):
usb-modeswitch, usb-modeswitch-data: fix usrmerge
Yi Zhao (2):
samba: upgrade 4.10.17 -> 4.10.18
networkmanager: remove PACKAGECONFIG[dhclient]
Zang Ruochen (13):
firewalld: upgrade 0.9.0 -> 0.9.1
mtr: upgrade 0.93 -> 0.94
wireshark: upgrade 3.2.6 -> 3.2.7
hwdata: upgrade 0.339 -> 0.340
libmbim: upgrade 1.24.2 -> 1.24.4
linuxptp: upgrade 3.0 -> 3.1
memtester: upgrade 4.4.0 -> 4.5.0
paho-mqtt-c: upgrade 1.3.5 -> 1.3.6
mm-common: upgrade 1.0.1 -> 1.0.2
poppler: upgrade 20.09.0 -> 20.10.0
spdlog: upgrade 1.8.0 -> 1.8.1
libcgi-perl: upgrade 4.50 -> 4.51
libcurses-perl: upgrade 1.36 -> 1.37
zangrc (8):
gphoto2: upgrade 2.5.23 -> 2.5.26
libgphoto2: upgrade 2.5.25 -> 2.5.26
libmtp: upgrade 1.1.17 -> 1.1.18
libp11: upgrade 0.4.10 -> 0.4.11
libpwquality: upgrade 1.4.2 -> 1.4.4
libqmi: upgrade 1.26.4 -> 1.26.6
nano: upgrade 5.2 -> 5.3
protobuf: upgrade 3.13.0 -> 3.13.0.1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486
Diffstat (limited to 'meta-openembedded')
130 files changed, 656 insertions, 554 deletions
diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index be1635dee..47c99063f 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_filesystems-layer = "gatesgarth" diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 7706b7ca6..ac581e693 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_gnome-layer = "gatesgarth" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb index 173d5aa74..244b867fa 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb @@ -15,7 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[md5sum] = "b1a85d1f3d710407164848708f1f49f1" -SRC_URI[sha256sum] = "17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a" +SRC_URI[sha256sum] = "c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb index 77c30f7de..6ac1e6ca9 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb @@ -26,8 +26,7 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[md5sum] = "3a8062add20effb6f92b4b614facbbd5" -SRC_URI[sha256sum] = "7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a" +SRC_URI[sha256sum] = "0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb index 2923e6b0c..aec1ebf7b 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb @@ -38,8 +38,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "7479a4e90b28628d2948e6612fe44049" -SRC_URI[sha256sum] = "e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c" +SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb" EXTRA_OECONF = "--disable-python \ --without-webkit \ diff --git a/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf index 634e0883c..9752a5a2c 100644 --- a/meta-openembedded/meta-initramfs/conf/layer.conf +++ b/meta-openembedded/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_meta-initramfs = "gatesgarth" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 2d52fb938..be0e2b362 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_multimedia-layer = "gatesgarth" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index fcc9df8c3..73c1d0db6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -4,9 +4,9 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "19a20eb8526465fdf940b740b13462d71e190a1a" +SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.1.x" +SRCREV = "6776569abe9a885bcec14141692fa93c0568d51c" S = "${WORKDIR}/git" -PV = "2.1.3" +PV = "2.1.5" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb index 818b9271f..b214672c6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb @@ -1,6 +1,9 @@ SUMMARY = "Music Player Daemon" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +LICENSE_FLAGS = "${@bb.utils.contains_any('PACKAGECONFIG', ['ffmpeg', 'aac'], 'commercial', '', d)}" + HOMEPAGE ="http://www.musicpd.org" inherit autotools useradd systemd pkgconfig @@ -27,8 +30,7 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" -PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" -PACKAGECONFIG_append = " ${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', '', d)}" +PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index c9db21ab5..b4f09cdf5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -30,8 +30,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\ dleyna-renderer \ dleyna-server \ dvb-apps \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac", "", d)} \ - fdk-aac \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "faac fdk-aac mpd", "", d)} \ gerbera \ libao \ libavc1394 \ @@ -43,7 +42,6 @@ RDEPENDS_packagegroup-meta-multimedia = "\ libmusicbrainz \ libmpdclient \ mpc \ - mpd \ ncmpc \ libmpd \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \ diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf index 7bc0702ba..bd0a44cae 100644 --- a/meta-openembedded/meta-networking/conf/layer.conf +++ b/meta-openembedded/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_networking-layer = "gatesgarth" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb index a76877652..eca926ee4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://firewalld.init \ " -SRC_URI[sha256sum] = "7cfbf8a33f726151e60c07486af0921fa05cbbab097adf90ec1caef37b49d9a0" +SRC_URI[sha256sum] = "7e3db6ed84919dd10add39cc7a28d97b5a9e27a53aeb73abf8af01ef082b74f9" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index ac2282ea1..2613076a7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -45,6 +45,10 @@ EXTRA_OECONF = " \ --with-tests \ --with-nmtui=yes \ --with-udev-dir=${nonarch_base_libdir}/udev \ + --with-dhclient=no \ + --with-dhcpcd=no \ + --with-dhcpcanon=no \ + --with-netconfig=no \ " # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template @@ -58,7 +62,7 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" } -PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ +PACKAGECONFIG ??= "nss ifupdown dnsmasq \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ @@ -73,8 +77,6 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcpcd" PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch deleted file mode 100644 index e724c04bc..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f9d9ba6cd06aca053c747c399ba700db80b1623c Mon Sep 17 00:00:00 2001 -From: Martin Schwenke <martin@meltin.net> -Date: Tue, 9 Jun 2020 11:52:50 +1000 -Subject: [PATCH 1/3] util: Simplify input validation - -It appears that snprintf(3) is being used for input validation. -However, this seems like overkill because it causes szPath to be -copied an extra time. The mostly likely protections being sought -here, according to https://cwe.mitre.org/data/definitions/20.html, -look to be DoS attacks involving CPU and memory usage. A simpler -check that uses strnlen(3) can mitigate against both of these and is -simpler. - -Signed-off-by: Martin Schwenke <martin@meltin.net> -Reviewed-by: Volker Lendecke <vl@samba.org> -Reviewed-by: Bjoern Jacke <bjacke@samba.org> -(cherry picked from commit 922bce2668994dd2a5988c17060f977e9bb0c229) - -Upstream-Status:Backport -[https://gitlab.com/samba-team/samba/-/commit/f9d9ba6cd06aca053c747c399ba700db80b1623c] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - lib/util/util_paths.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c -index c0ee5c32c30..dec91772d9e 100644 ---- a/lib/util/util_paths.c -+++ b/lib/util/util_paths.c -@@ -69,21 +69,20 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) - struct passwd pwd = {0}; - struct passwd *pwdbuf = NULL; - char buf[NSS_BUFLEN_PASSWD] = {0}; -+ size_t len; - int rc; - - rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); - if (rc != 0 || pwdbuf == NULL ) { -- int len_written; - const char *szPath = getenv("HOME"); - if (szPath == NULL) { - return NULL; - } -- len_written = snprintf(buf, sizeof(buf), "%s", szPath); -- if (len_written >= sizeof(buf) || len_written < 0) { -- /* Output was truncated or an error. */ -+ len = strnlen(szPath, PATH_MAX); -+ if (len >= PATH_MAX) { - return NULL; - } -- return talloc_strdup(mem_ctx, buf); -+ return talloc_strdup(mem_ctx, szPath); - } - - return talloc_strdup(mem_ctx, pwd.pw_dir); --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch deleted file mode 100644 index dcd79044a..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 57bd719af1f138f44f71b2078995452582da0da6 Mon Sep 17 00:00:00 2001 -From: Martin Schwenke <martin@meltin.net> -Date: Fri, 5 Jun 2020 21:52:23 +1000 -Subject: [PATCH 2/3] util: Fix build on FreeBSD by avoiding NSS_BUFLEN_PASSWD - -NSS_BUFLEN_PASSWD is not defined on FreeBSD. Use -sysconf(_SC_GETPW_R_SIZE_MAX) instead, as per POSIX. - -Use a dynamically allocated buffer instead of trying to cram all of -the logic into the declarations. This will come in useful later -anyway. - -Signed-off-by: Martin Schwenke <martin@meltin.net> -Reviewed-by: Volker Lendecke <vl@samba.org> -Reviewed-by: Bjoern Jacke <bjacke@samba.org> -(cherry picked from commit 847208cd8ac68c4c7d1dae63767820db1c69292b) - -Upstream-Status:Backport -[https://gitlab.com/samba-team/samba/-/commit/57bd719af1f138f44f71b2078995452582da0da6] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - lib/util/util_paths.c | 27 ++++++++++++++++++++++----- - 1 file changed, 22 insertions(+), 5 deletions(-) - -diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c -index dec91772d9e..9bc6df37e5d 100644 ---- a/lib/util/util_paths.c -+++ b/lib/util/util_paths.c -@@ -68,24 +68,41 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) - { - struct passwd pwd = {0}; - struct passwd *pwdbuf = NULL; -- char buf[NSS_BUFLEN_PASSWD] = {0}; -+ char *buf = NULL; -+ char *out = NULL; -+ long int initlen; - size_t len; - int rc; - -- rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); -+ initlen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ if (initlen == -1) { -+ len = 1024; -+ } else { -+ len = (size_t)initlen; -+ } -+ buf = talloc_size(mem_ctx, len); -+ if (buf == NULL) { -+ return NULL; -+ } -+ -+ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); - if (rc != 0 || pwdbuf == NULL ) { - const char *szPath = getenv("HOME"); - if (szPath == NULL) { -- return NULL; -+ goto done; - } - len = strnlen(szPath, PATH_MAX); - if (len >= PATH_MAX) { - return NULL; - } -- return talloc_strdup(mem_ctx, szPath); -+ out = talloc_strdup(mem_ctx, szPath); -+ goto done; - } - -- return talloc_strdup(mem_ctx, pwd.pw_dir); -+ out = talloc_strdup(mem_ctx, pwd.pw_dir); -+done: -+ TALLOC_FREE(buf); -+ return out; - } - - char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d) --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch deleted file mode 100644 index 53a3f6781..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 016e08ca07f86af9e0131a908a2df116bcb9a48e Mon Sep 17 00:00:00 2001 -From: Martin Schwenke <martin@meltin.net> -Date: Fri, 5 Jun 2020 22:05:42 +1000 -Subject: [PATCH 3/3] util: Reallocate larger buffer if getpwuid_r() returns - ERANGE - -Signed-off-by: Martin Schwenke <martin@meltin.net> -Reviewed-by: Volker Lendecke <vl@samba.org> -Reviewed-by: Bjoern Jacke <bjacke@samba.org> - -Autobuild-User(master): Martin Schwenke <martins@samba.org> -Autobuild-Date(master): Tue Jun 9 21:07:24 UTC 2020 on sn-devel-184 - -(cherry picked from commit ddac6b2eb4adaec8fc5e25ca07387d2b9417764c) - -Upstream-Status:Backport -[https://gitlab.com/samba-team/samba/-/commit/016e08ca07f86af9e0131a908a2df116bcb9a48e] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - lib/util/util_paths.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c -index 9bc6df37e5d..72cc0aab8de 100644 ---- a/lib/util/util_paths.c -+++ b/lib/util/util_paths.c -@@ -86,6 +86,19 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) - } - - rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); -+ while (rc == ERANGE) { -+ size_t newlen = 2 * len; -+ if (newlen < len) { -+ /* Overflow */ -+ goto done; -+ } -+ len = newlen; -+ buf = talloc_realloc_size(mem_ctx, buf, len); -+ if (buf == NULL) { -+ goto done; -+ } -+ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); -+ } - if (rc != 0 || pwdbuf == NULL ) { - const char *szPath = getenv("HOME"); - if (szPath == NULL) { --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb index 3ae5afbe9..b5085c913 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb @@ -28,9 +28,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ - file://0001-util-Simplify-input-validation.patch \ - file://0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch \ - file://0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch \ " SRC_URI_append_libc-musl = " \ file://samba-pam.patch \ @@ -39,8 +36,8 @@ SRC_URI_append_libc-musl = " \ file://0001-samba-fix-musl-lib-without-innetgr.patch \ " -SRC_URI[md5sum] = "f69cac9ba5035ee60257520a209a0a83" -SRC_URI[sha256sum] = "03dc9758e7bfa2faf7cdeb45b4d40997e2ee16a41e71996aa666bc069e70ba3e" +SRC_URI[md5sum] = "f006a3d1876113e4a049015969d20fe6" +SRC_URI[sha256sum] = "7dcfc2aaaac565b959068788e6a43fc79ce2a03e7d523f5843f7a9fddffc7c2c" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 0e668f7dd..a9dc6a13e 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -250,6 +250,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tinyproxy \ uftp \ unbound \ + vnstat \ wpan-tools \ ettercap \ " diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service index 96dbae378..e63592af6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -PIDFile=@LOCALSTATEDIR@/run/saslauthd/saslauthd.pid +PIDFile=/run/saslauthd/saslauthd.pid EnvironmentFile=@SYSCONFDIR@/default/saslauthd ExecStart=@SBINDIR@/saslauthd -m $SOCKETDIR -a $MECH $FLAGS diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch new file mode 100644 index 000000000..c71f01299 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch @@ -0,0 +1,48 @@ +From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Oct 2020 09:11:20 -0700 +Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long + +This compares value member of int_list_tbl struct which is of unsigned +int type. + +struct int_list_tbl { +const char *name; +unsigned int value; +}; + +Clang compiler reports this comparison when +-Wtautological-constant-out-of-range-compare is enabled + +| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] +| _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| idbm.c:263:23: note: expanded from macro '_rec_int_list' +| if (_org->_name[_i] != ~0UL) { \ +| ~~~~~~~~~~~~~~~ ^ ~~~~ + +Since max value for int can be less than unsinged long e.g. on LP64 its +better to use UINT_MAX here + +Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libopeniscsiusr/idbm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c +index 7bc2381..060196f 100644 +--- a/libopeniscsiusr/idbm.c ++++ b/libopeniscsiusr/idbm.c +@@ -260,7 +260,7 @@ do {\ + _recs[_n].type = TYPE_INT_LIST; \ + _strncpy(_recs[_n].name, _key, NAME_MAXVAL); \ + for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \ +- if (_org->_name[_i] != ~0UL) { \ ++ if (_org->_name[_i] != UINT_MAX) { \ + for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \ + if (_tbl[_j].value == _org->_name[_i]) { \ + strcat(_recs[_n].value, _tbl[_j].name); \ +-- +2.29.0 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb index 254362881..dfcd4ee3c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb @@ -16,6 +16,7 @@ SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://0001-Makefile-Do-not-set-Werror.patch \ + file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service index cd4168f8e..816e44f82 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=forking -PIDFile=/var/run/openhpid.pid +PIDFile=/run/openhpid.pid ExecStart=@SBINDIR@/openhpid -c @SYSCONFDIR@/openhpi/openhpi.conf [Install] diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb index 31b33a045..3403fd943 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb @@ -9,7 +9,7 @@ DEPENDS += "libmnl" do_install () { oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ + SYSTEMDUNITDIR="${systemd_system_unitdir}" \ WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ WITH_BASHCOMPLETION=yes \ WITH_WGQUICK=yes \ @@ -18,7 +18,7 @@ do_install () { FILES_${PN} = " \ ${sysconfdir} \ - ${systemd_unitdir} \ + ${systemd_system_unitdir} \ ${bindir} \ " diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service index 514481b43..70ed3803c 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -PIDFile=/var/run/freediameter.pid +PIDFile=/run/freediameter.pid ExecStart=@BINDIR@/freeDiameterd [Install] diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb index dd150700a..265eefb94 100644 --- a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb +++ b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" -SRCREV = "304349bad86229aedbc62c07d5e98a8292967991" +SRCREV = "2c73cbf4094e4eed343ed11ae5bab2580f3122d1" SRC_URI = "git://github.com/traviscross/mtr" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch b/meta-openembedded/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch new file mode 100644 index 000000000..1dde1cae8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/files/0001-isnsd.socket-use-run-instead-of-var-run.patch @@ -0,0 +1,26 @@ +From 9413921d5af5e5e38541f97fee0f1aa40024a3ed Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 20 Oct 2020 13:21:57 +0800 +Subject: [PATCH] isnsd.socket: use /run instead of /var/run + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + isnsd.socket | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isnsd.socket b/isnsd.socket +index 652cd46..7dfcf51 100644 +--- a/isnsd.socket ++++ b/isnsd.socket +@@ -1,5 +1,5 @@ + [Socket] +-ListenStream=/var/run/isnsctl ++ListenStream=/run/isnsctl + PassCredentials=true + + [Socket] +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb index a03b92f5f..eb04dfae3 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.99.bb @@ -13,7 +13,9 @@ SECTION = "net" DEPENDS = "openssl" -SRC_URI = "git://github.com/open-iscsi/open-isns" +SRC_URI = "git://github.com/open-iscsi/open-isns \ + file://0001-isnsd.socket-use-run-instead-of-var-run.patch \ + " SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.56.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb index 3411e5d0c..8f6de571f 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.56.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.57.bb @@ -6,7 +6,7 @@ SECTION = "net" # a combined work based on stunnel. Thus, the terms and conditions of the GNU # General Public License cover the whole combination. LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=d6d635d290ba1705821254a0278f1ef7" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=6bae28875b3b599f8f621f4335b17955" DEPENDS = "autoconf-archive libnsl2 openssl" @@ -14,8 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[md5sum] = "01b0ca9e071f582ff803a85d5ed72166" -SRC_URI[sha256sum] = "7384bfb356b9a89ddfee70b5ca494d187605bb516b4fff597e167f97e2236b22" +SRC_URI[sha256sum] = "af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1" inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb new file mode 100644 index 000000000..9a650f409 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)." +HOMEPAGE = "https://humdi.net/vnstat/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +SECTION = "net" +DEPENDS = "gd sqlite3" + +SRC_URI = "https://github.com/vergoh/vnstat/releases/download/v${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "fe2928a81243cc8a532a357f97221736" +SRC_URI[sha256sum] = "89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7" + +inherit autotools pkgconfig systemd + +EXTRA_OECONF = "--disable-extra-paths" + +do_install_append() { + install -Dm644 ${S}/examples/systemd/vnstat.service "${D}${systemd_system_unitdir}/vnstat.service" +} + +SYSTEMD_SERVICE_${PN} = "vnstat.service" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb index 916c5b7a4..65f925ce1 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.2.7.bb @@ -12,7 +12,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "ebb1eebe39bcecee02195dc328dd25f6862fc9e9dea4c2e29eae50537d5eb4f2" +SRC_URI[sha256sum] = "be832fb86d9c455c5be8b225a755cdc77cb0e92356bdfc1fe4b000d93f7d70da" PE = "1" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 5b79b59b7..a964a99fb 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -37,7 +37,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_openembedded-layer = "gatesgarth" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch deleted file mode 100644 index df208cf87..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch +++ /dev/null @@ -1,12 +0,0 @@ -Use Python 3 instead of Python 2. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/waf b/waf -index 6ce2a24..de3c898 100755 ---- a/waf -+++ b/waf -@@ -1 +1 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 82821ad63..2e727a01c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -14,8 +14,7 @@ PV = "20191226+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ - file://python3.patch" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb index 646ff90ba..1a041101b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ file://Makefile.patch \ " -SRC_URI[md5sum] = "e1883b69cd7c0bb74ef6a475c93a4fbf" -SRC_URI[sha256sum] = "6ffe23e6e6449b42c577c7953778fb6f698050196797a94fc619d9badc59f8e8" +SRC_URI[md5sum] = "674a8a88ff54bdb229ca4148218a41f1" +SRC_URI[sha256sum] = "8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37" do_compile () { echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch new file mode 100644 index 000000000..c34db695f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Change-PIDFile-path-from-var-run-to-run.patch @@ -0,0 +1,44 @@ +From 25f4f8793730ef3d170f1f2bd729a82fd61a4784 Mon Sep 17 00:00:00 2001 +From: puneetse <22071208+puneetse@users.noreply.github.com> +Date: Wed, 11 Mar 2020 09:36:51 -0700 +Subject: [PATCH] Change PIDFile path from /var/run to /run + +/var/run is considered a legacy directory by systemd 239+ and having it in unit files causes a warning to be emitted to the journal. + +Upstream-Status: Backport [25f4f8793730ef3d170f1f2bd729a82fd61a4784] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + prog/init/fancontrol.service | 2 +- + prog/init/sensord.service | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/prog/init/fancontrol.service b/prog/init/fancontrol.service +index 3ac1ed02..43293141 100644 +--- a/prog/init/fancontrol.service ++++ b/prog/init/fancontrol.service +@@ -5,7 +5,7 @@ After=lm_sensors.service + + [Service] + Type=simple +-PIDFile=/var/run/fancontrol.pid ++PIDFile=/run/fancontrol.pid + ExecStart=/usr/sbin/fancontrol + + [Install] +diff --git a/prog/init/sensord.service b/prog/init/sensord.service +index 2448beeb..af2f0ae9 100644 +--- a/prog/init/sensord.service ++++ b/prog/init/sensord.service +@@ -5,7 +5,7 @@ After=lm_sensors.service + [Service] + EnvironmentFile=/etc/sysconfig/sensord + Type=forking +-PIDFile=/var/run/sensord.pid ++PIDFile=/run/sensord.pid + ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon + + [Install] +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 9c561e9f4..4ee96df98 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -13,6 +13,7 @@ DEPENDS = " \ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https \ file://fancontrol.init \ file://sensord.init \ + file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ " SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb index c7a04b664..148b3ca8d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.4.bb @@ -13,5 +13,5 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "6c2b490af87773c8446f37536e7411ac" -SRC_URI[sha256sum] = "32198c099987849c5f442d1cbf4b6e43e645cbdbe9cfdc197b19ddd63c6981e4" +SRC_URI[md5sum] = "4b4b12ab7153d7c999289b5dfc2d25db" +SRC_URI[sha256sum] = "dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb index 54decbccf..423bfd689 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.17.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb @@ -21,8 +21,8 @@ DEPENDS_append_class-target = " ${BPN}-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI_append_class-target = " file://0001-Use-native-mtp-hotplug.patch" -SRC_URI[md5sum] = "81aea5d3139e5189c2e055ed2c98cd91" -SRC_URI[sha256sum] = "f8a34cf52d9f9b9cb8c7f26b12da347d4af7eb904c13189602e4c6b62d1a79dc" +SRC_URI[md5sum] = "7915496daa3f4ea3e095f0161f83d4d4" +SRC_URI[sha256sum] = "7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.6.bb index f778ffac4..6d60a6702 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.6.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "c0adcb84ba452e3e13edeb3f94f7b003ea927b354bc187629e05efb333ce270b" +SRC_URI[sha256sum] = "a71963bb1097a42665287e40a9a36f95b8f9d6d6a4b7a5de22d660328af97cb9" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb index 1472a671a..c8527260b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb @@ -7,8 +7,8 @@ SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}. file://Use-cross-cpp-in-incdefs.patch \ " -SRC_URI[md5sum] = "1318805702eb6d59f9f247e1dd5ce12a" -SRC_URI[sha256sum] = "d74ceca722c75bfff53c633425f926dd48eb04f4a089451b855155c016d15785" +SRC_URI[md5sum] = "2264cb69c9af947028835c12c89a7572" +SRC_URI[sha256sum] = "f58f5b11cf14dc7c4f7c9efdfb27190e43d02cf20c3525f6639edac10528ce7d" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb index 673a24742..8e3557500 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.6.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" -SRCREV = "153dfd3a4a1d510697c5d55e169fa158db16e04a" +SRCREV = "e4c3757524a272c086e369cda5a56b8f766a401a" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch deleted file mode 100644 index 130ead084..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 11 May 2020 17:01:35 +0000 -Subject: [PATCH] configure.ac: Fix no libsystemd-daemon - -Replace libsystemd-daemon with libsystemd. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index df8cb5007..9a6fb9b2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,10 +249,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], - [Add support for systemd startup notification (default is autodetected)]), - [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) - AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ -- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -+ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], - [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], - [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], -- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] - )] - ) - ]) -@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then - GETTEXT_PACKAGE=transmission-gtk - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -- AM_GLIB_GNU_GETTEXT - transmissionlocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(transmissionlocaledir) - fi --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 412bd9d3f..297185de7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -2,20 +2,19 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" SECTION = "network" HOMEPAGE = "https://transmissionbt.com/" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0dd9fcdc1416ff123c41c785192a1895" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS_${PN}-web = "${PN}" SRC_URI = " \ - git://github.com/transmission/transmission \ - file://0001-configure.ac-Fix-no-libsystemd-daemon.patch \ + gitsm://github.com/transmission/transmission \ file://transmission-daemon \ " -# Transmission release 2.94 -SRCREV = "d8e60ee44f4295935bd98bf741f85ed19f5a7dfb" -PV = "2.94" +# Transmission release 3.00 +SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd" +PV = "3.00" S = "${WORKDIR}/git" @@ -25,7 +24,7 @@ PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd," +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," # Weak default values for transmission user and group # Change them in bbappend if needed @@ -62,7 +61,7 @@ PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" FILES_${PN}-web = "${datadir}/transmission/web" -FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon" +FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.2.bb index 64b58db54..207d9394e 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.2.bb @@ -6,8 +6,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase -SRC_URI[archive.md5sum] = "5b5a589f648bd83bfa6291081ebf5864" -SRC_URI[archive.sha256sum] = "28a2d775afbf05c5c957b24b220ed6e9b2023179b98ecde471d89e9754ea5ac9" +SRC_URI[archive.md5sum] = "440133a2676275ae26770b3651f89827" +SRC_URI[archive.sha256sum] = "a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d" SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 5a4375d72..4d86ef977 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -186,6 +186,7 @@ RDEPENDS_packagegroup-meta-oe-core_remove_riscv32 = "safec" RDEPENDS_packagegroup-meta-oe-crypto ="\ botan \ cryptsetup \ + fsverity-utils \ libkcapi \ libmcrypt \ libsodium \ @@ -206,6 +207,7 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ RDEPENDS_packagegroup-meta-oe-devtools ="\ abseil-cpp \ + apitrace \ breakpad \ bootchart \ android-tools-conf \ @@ -273,6 +275,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ python3-distutils-extra \ rapidjson \ sip3 \ + squashfs-tools-ng \ uftrace \ libxerces-c \ xerces-c-samples \ @@ -839,6 +842,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ tbb \ satyr \ pcsc-lite \ + pcsc-tools \ sharutils \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "toscoterm", "", d)} \ sg3-utils \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb new file mode 100644 index 000000000..4d5dbafb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "Userspace utilities for fs-verity" +DESCRIPTION = "fs-verity is a Linux kernel feature that does transparent \ +on-demand integrity/authenticity verification of the contents of read-only \ +files, using a hidden Merkle tree (hash tree) associated with the file. The \ +mechanism is similar to dm-verity, but implemented at the file level rather \ +than at the block device level." +HOMEPAGE = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html" +SECTION = "console" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" + +SRCREV = "406187bb3a885e083b448b2c2aa42c22957ae629" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" + +S = "${WORKDIR}/git" + +DEPENDS = "openssl" + +EXTRA_OEMAKE += "PREFIX=${prefix} USE_SHARED_LIB=1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +PACKAGES =+ "libfsverity" +FILES_libfsverity = "${libdir}/libfsverity*${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb index 73b2a0980..73b2a0980 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.6.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 46a64006d..7c92bbaad 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,9 +19,8 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ - file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \ " -SRC_URI[sha256sum] = "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72" +SRC_URI[sha256sum] = "ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch index 574dfd317..0cf0560e1 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -14,12 +14,12 @@ index e97dd63e2b0..2f4694e727c 100644 +++ b/cmake/FindLZ4.cmake @@ -1,5 +1,10 @@ -find_path(LZ4_INCLUDE_DIR NAMES lz4.h) --find_library(LZ4_LIBRARY NAMES lz4) +-find_library(LZ4_LIBRARIES NAMES lz4) +find_path(LZ4_INCLUDE_DIR + NAMES lz4.h + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + -+find_library(LZ4_LIBRARY ++find_library(LZ4_LIBRARIES + NAMES lz4 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch deleted file mode 100644 index 1856c1af7..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d88ea260882ca414e940cd6af225617f00503f71 Mon Sep 17 00:00:00 2001 -From: Krunal Bauskar <krunalbauskar@gmail.com> -Date: Mon, 27 Jul 2020 18:38:10 +0800 -Subject: [PATCH] MDEV-23137: RocksDB: undefined reference to crc32c_arm64 - -RocksDB fails to build on arm64: undefined reference to - `crc32c_arm64(unsigned int, unsigned char const*, unsigned int)' - -MariaDB uses storage/rocksdb/build_rocksdb.cmake to compile RocksDB. -Said cmake missed adding crc32c_arm64 compilation target so if -machine native architecture supported crc32 then complier would enable -usage of function defined in crc32c_arm64 causing the listed error. - -Added crc32c_arm64 complition target. - -closes #1642 - -Upstream-Status: Backport - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - storage/rocksdb/build_rocksdb.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake -index 3f3dca7e990..7d2252c5f77 100644 ---- a/storage/rocksdb/build_rocksdb.cmake -+++ b/storage/rocksdb/build_rocksdb.cmake -@@ -442,6 +442,16 @@ else() - util/crc32c_ppc.c - util/crc32c_ppc_asm.S) - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+ # aarch -+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") -+ CHECK_CXX_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC) -+ if(HAS_ARMV8_CRC) -+ message(STATUS " HAS_ARMV8_CRC yes") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function") -+ list(APPEND ROCKSDB_SOURCES -+ util/crc32c_arm64.cc) -+ endif(HAS_ARMV8_CRC) -+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") - endif() - SET(SOURCES) - FOREACH(s ${ROCKSDB_SOURCES}) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb index e6743fe97..e6743fe97 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.6.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb new file mode 100644 index 000000000..826291a5e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_9.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Tools for tracing OpenGL, Direct3D, and other graphics APIs" +HOMEPAGE = "http://apitrace.github.io/" +SECTION = "console/tools" +LICENSE = "MIT & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ + file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" + +SRCREV = "cae55f54c53449fd07f8a917dcd0874db2c15032" +SRC_URI = "git://github.com/${BPN}/${BPN}.git" + +S = "${WORKDIR}/git" + +DEPENDS += "zlib libpng python3-native" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DENABLE_GUI=OFF \ + -DENABLE_X11=OFF \ + -DENABLE_STATIC_LIBGCC=OFF \ + -DENABLE_STATIC_LIBSTDCXX=OFF \ + -DPython3_ROOT_DIR=/usr/bin/python3-native \ +" + +# Use the bundled snappy library +EXTRA_OECMAKE += "\ + -DENABLE_STATIC_SNAPPY=ON \ +" + +SECURITY_CFLAGS_toolchain-clang = "" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service index ac79dc931..eec76fb56 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service @@ -3,7 +3,7 @@ Description=PHP-FPM After=network.target [Service] Type=forking -PIDFile=@LOCALSTATEDIR@/run/php-fpm.pid +PIDFile=/run/php-fpm.pid ExecStart=@SYSCONFDIR@/init.d/php-fpm start ExecStop=@SYSCONFDIR@/init.d/php-fpm stop [Install] diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb index f2c5e2bee..8c349db4d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a" +SRCREV = "d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb new file mode 100644 index 000000000..6e2606be6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "New set of tools for working with SquashFS images" +SECTION = "base" +LICENSE = "GPL-3.0+ & LGPL-3.0+ & MIT & BSD-2-Clause & Zlib" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=c0de2c0aca56349dab98e97992316f7e \ + file://licenses/GPLv3.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://licenses/hash_table.txt;md5=874823605326caeaabaa95bfbd0f9fb0 \ + file://licenses/LGPLv3.txt;md5=3000208d539ec061b899bce1d9ce9404 \ + file://licenses/LZ4.txt;md5=ebc2ea4814a64de7708f1571904b32cc \ + file://licenses/xxhash.txt;md5=f042a9be092bd6d7fe6f217d8d00f4ca \ + file://licenses/xz.txt;md5=1c389b9610ccfdb25f7abaea6a0bb5a4 \ + file://licenses/zlib.txt;md5=ae27c72096606131f760e5f59cf98b06 \ + file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8" + +SRCREV = "b96f0fc154feef531be76034bf6e38925636146f" +SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "gzip xz lzo lz4 zstd ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[gzip] = "--with-gzip,--without-gzip,zlib" +PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" +PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +PACKAGES =+ "libsquashfs" +FILES_libsquashfs = "${libdir}/libsquashfs*${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb index 24d2f7ec1..ee75a9847 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb @@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME} file://add-missing-python-include-dir-for-cross.patch \ " -SRC_URI[md5sum] = "ae6e61fc33f5dac0de5e847eb7520d71" -SRC_URI[sha256sum] = "5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e" +SRC_URI[md5sum] = "1fe43f6641dbf1e1766e2a02cf68a9c3" +SRC_URI[sha256sum] = "d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545" UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 5127e11d8..9113fa67a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -55,6 +55,7 @@ EXTRA_OECMAKE += " \ " EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" +LDFLAGS_remove_riscv32 = "-fuse-ld=lld" # There are endian issues when communicating with the x86 nifi on the the mips and the ppc machines. COMPATIBLE_MACHINE_mips = "(!.*mips).*" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/riscv32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/riscv32.patch new file mode 100644 index 000000000..79ec7423d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/riscv32.patch @@ -0,0 +1,47 @@ +Define correct gregs for RISCV32 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/debug.c ++++ b/src/debug.c +@@ -942,7 +942,9 @@ static void *getMcontextEip(ucontext_t * + #endif + #elif defined(__linux__) + /* Linux */ +- #if defined(__i386__) || defined(__ILP32__) ++ #if defined(__riscv) && __riscv_xlen == 32 ++ return (void*) uc->uc_mcontext.__gregs[REG_PC]; ++ #elif defined(__i386__) || defined(__ILP32__) + return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */ + #elif defined(__X86_64__) || defined(__x86_64__) + return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */ +@@ -1102,8 +1104,28 @@ void logRegisters(ucontext_t *uc) { + #endif + /* Linux */ + #elif defined(__linux__) ++ /* Linux RISCV32 */ ++ #if defined(__riscv) && __riscv_xlen == 32 ++ serverLog(LL_WARNING, ++ "\n" ++ "RA:%08lx S0:%08lx S1:%08lx S2:%08lx\n" ++ "SP:%08lx PC:%08lx A0:%08lx A1:%08lx\n" ++ "A2 :%08lx A3:%08lx A4:%08lx", ++ (unsigned long) uc->uc_mcontext.__gregs[REG_RA], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_S0], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_S1], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_S2], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_SP], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_PC], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 0], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 1], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 2], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 3], ++ (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 4] ++ ); ++ logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); + /* Linux x86 */ +- #if defined(__i386__) || defined(__ILP32__) ++ #elif defined(__i386__) || defined(__ILP32__) + serverLog(LL_WARNING, + "\n" + "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb index 64b137c1b..546332851 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb @@ -15,6 +15,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://oe-use-libc-malloc.patch \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE.patch \ + file://riscv32.patch \ " SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b" @@ -23,6 +24,7 @@ SRC_URI[sha256sum] = "04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce inherit autotools-brokensep update-rc.d systemd useradd FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_riscv32_toolchain-clang = "-latomic" FINAL_LIBS_mips = "-latomic" FINAL_LIBS_arm = "-latomic" FINAL_LIBS_powerpc = "-latomic" diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch new file mode 100644 index 000000000..b3b9e79c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch @@ -0,0 +1,35 @@ +From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 11 Oct 2020 22:16:55 +0200 +Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +E.g 'wx-config --libs' appends a '-Linux' to all libraries (e.g +-lwx_gtk3u_xrc-3.1 is reported as -lwx_gtk3u_xrc-3.1-Linux) which is wrong and +make projects depending on wxwidgets fail. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + wx-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wx-config.in b/wx-config.in +index d132e3182f..d0d162e8a3 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -396,7 +396,7 @@ get_mask() + } + + # Returns true if this script is for a cross compiled config. +-is_cross() { [ "x@cross_compiling@" = "xyes" ]; } ++is_cross() { [ "xno" = "xyes" ]; } + + + # Determine the base directories we require. +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index 1d3c972da..26a9004fb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -10,7 +10,7 @@ LICENSE = "wxWidgets" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} -inherit features_check lib_package +inherit features_check lib_package binconfig # All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" @@ -21,9 +21,12 @@ DEPENDS += " \ tiff \ " -SRC_URI = "git://github.com/wxWidgets/wxWidgets.git" -PV = "3.1.3" -SRCREV= "8a40d23b27ed1c80b5a2ca9f7e8461df4fbc1a31" +SRC_URI = " \ + git://github.com/wxWidgets/wxWidgets.git \ + file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ +" +PV = "3.1.4" +SRCREV= "6cdaedd42ba59331b3dc4ead50e0bac76ae14c19" S = "${WORKDIR}/git" # These can be either 'builtin' or 'sys' and builtin means cloned soures are @@ -39,10 +42,10 @@ EXTRA_OECMAKE_append_libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " -PACKAGECONFIG ?= "gtk" +PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt' -PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk" +PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk opengl" PACKAGECONFIG[gtk] = "-DwxBUILD_TOOLKIT=gtk3 -DwxUSE_GUI=ON,,gtk+3,,,no_gui qt" PACKAGECONFIG[qt] = "-DwxBUILD_TOOLKIT=qt -DwxUSE_GUI=ON,,qtbase,,,no_gui gtk" python () { @@ -63,9 +66,28 @@ PACKAGECONFIG[gstreamer] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF,gstreamer PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libsecret,,,no_gui" PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz" PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack" +PACKAGECONFIG[opengl] = ",,libglu" PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2" PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui" +do_compile_append() { + # if not at re-compile + if [ -L ${B}/wx-config ]; then + # ${B}/wx-config is a symlink for build and not needed after compile + # So for our purposes do: + # 1. make a file out of wx-config so that binconfig.bbclass detects it + # 2. make sure we do not move the file used for compiling into sysroot + cp --remove-destination `readlink ${B}/wx-config | sed 's:inplace-::'` ${B}/wx-config + fi + # 3. Set full sysroot paths so sstate can translate them when setting + # up wxwidgets's consumer sysroots + sed -i \ + -e 's,^includedir=.*,includedir="${STAGING_INCDIR}",g' \ + -e 's,^libdir=.*",libdir="${STAGING_LIBDIR}",g' \ + -e 's,^bindir=.*",bindir="${STAGING_BINDIR}",g' \ + ${B}/wx-config +} + do_install_append() { # do not ship bindir if empty rmdir --ignore-fail-on-non-empty ${D}${bindir} diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.26.bb index ef3100f66..a425287a8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.23.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.26.bb @@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \ " -SRC_URI[gphoto2.md5sum] = "0abd5ae8315109ae66bf06ac37902678" -SRC_URI[gphoto2.sha256sum] = "df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1" +SRC_URI[gphoto2.md5sum] = "f663b10bca639290fdb150b6ffe23e93" +SRC_URI[gphoto2.sha256sum] = "7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f" inherit autotools pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.26.bb index fe7657f54..e9a300282 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.26.bb @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " -SRC_URI[libgphoto2.md5sum] = "39999aa4bdd3bf849b5716153c659405" -SRC_URI[libgphoto2.sha256sum] = "7c0e98f438c2b128186afe16ce7833a12fa36f87d01467e837b9d27e7a167f3a" +SRC_URI[libgphoto2.md5sum] = "7e7e18abe6a764cb4becb2728d86ed84" +SRC_URI[libgphoto2.sha256sum] = "7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4" inherit autotools pkgconfig gettext lib_package diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index 057f9c6f3..973a978b1 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -18,7 +18,9 @@ LICENSE_FLAGS = "commercial" SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" SRC_URI = " \ git://github.com/mpv-player/mpv;name=mpv \ + https://waf.io/waf-2.0.20;name=waf;subdir=git \ " +SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" S = "${WORKDIR}/git" @@ -100,14 +102,10 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -do_patch[postfuncs] += "get_waf" - -get_waf() { - cd ${S} - ./bootstrap.py - sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/waf - cd - +link_waf() { + ln -s waf-2.0.20 ${S}/waf } +do_unpack[postfuncs] += "link_waf" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index a65d324ea..9d78c3457 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -2,8 +2,10 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana t AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>" HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://not_build_elc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb index b53cd6b19..621e174ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb @@ -1,4 +1,4 @@ -SUMMURY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" HOMEPAGE = "https://github.com/vsergeev/c-periphery" @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "c2aa7d164f87b807077daeeb3443a56b89e1d1c9" +SRCREV = "d34077d7ee45fa7d1947cc0174919452fac31597" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb index cfbb2caaf..6f8c86a16 100644 --- a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb +++ b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -1,5 +1,6 @@ SUMMARY = "dhex is a hex editor that includes a diff mode" SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" DEPENDS = "ncurses" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb index 9b3adcf9d..cfc089b3b 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb @@ -177,6 +177,7 @@ FILES_${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ ${bindir}/emacs* \ ${prefix}/libexec \ " diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb index ed3de0b50..d52731161 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb @@ -13,3 +13,5 @@ inherit cmake inherit ptest EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index 9af2b6714..11285451a 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb @@ -1,4 +1,5 @@ -SUMMARY = "Unique technology suite that makes possible the management of \ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ extremely large and complex data collections" HOMEPAGE = "https://www.hdfgroup.org/" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 42b92106b..cc12a6890 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.339" -SRCREV = "1cd8ee29eb2dcb954961be008b96cfbf982f0700" +PV = "0.340" +SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb index 7fe0640d9..1c5cc52bf 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRCREV = "9ca6a71c890b5583c8af3b4900172626bca55e72" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb index f2cd2909c..48e92de4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "32c2da43e1ae9a5e43437d8c6e1ec0388af870c7762c479e5bffb5f292bda7e1" +SRC_URI[sha256sum] = "c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb index a15afd667..6307c159e 100644 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -23,8 +23,8 @@ CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68" -SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d" +SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" +SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" CVE_PRODUCT = "netscape_portable_runtime" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index bfc375e83..65e1500ae 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -10,22 +10,24 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/Makefile | 3 +++ nss/lib/freebl/gcm.c | 2 ++ - 2 files changed, 6 insertions(+) + 2 files changed, 5 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index fe8c526..922f67c 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -126,6 +126,8 @@ else +@@ -125,6 +125,8 @@ else + DEFINES += -DNSS_X86 endif endif - ifdef NS_USE_GCC +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c -@@ -150,6 +152,7 @@ endif + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -166,6 +168,7 @@ endif endif endif endif @@ -33,15 +35,23 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -21,7 +21,9 @@ +@@ -18,6 +18,7 @@ + + #include <limits.h> + ++#ifdef NSS_USE_ARM_HW_CRYPTO /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -+# ifdef NSS_USE_ARM_HW_CRYPTO - #define USE_ARM_GCM -+# endif - #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ - !defined(NSS_DISABLE_ARM32_NEON) +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch deleted file mode 100644 index 432312da2..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Aug 2020 17:30:40 -0700 -Subject: [PATCH] pkix: Do not use NULL where 0 is needed - -Clang finds this error - -pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -2 errors generated. - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c -index a916e6e..10f537a 100644 ---- a/nss/lib/libpkix/pkix/util/pkix_logger.c -+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c -@@ -313,7 +313,7 @@ pkix_Logger_Destroy( - - logger->callback = NULL; - PKIX_DECREF(logger->context); -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - cleanup: - -@@ -614,7 +614,7 @@ PKIX_Logger_Create( - - logger->callback = callback; - logger->maxLevel = 0; -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - PKIX_INCREF(loggerContext); - logger->context = loggerContext; --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb index 997f8950f..5d9318a92 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb @@ -31,9 +31,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \ " -SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" +SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb new file mode 100644 index 000000000..bc82e49ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb @@ -0,0 +1,16 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https" + +SRCREV = "34ac207adbba0d1a951b314c1676610a1d0bba01" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite" + +FILES_${PN} += "${datadir}/pcsc/smartcard_list.txt" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb index ceff2d0d6..0f04b88f2 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363" +SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index dcadede0e..33f5dccca 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -13,11 +13,13 @@ RDEPENDS_${PN} = "rsync \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb index b79eb7c28..7d28fff5e 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "4a9ccf7e38e257feecce0c579a782741254eaeef" +SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" DEPENDS += "fmt" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 938c0f9c2..ca970e59b 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ +FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb index baad34090..6a5287af4 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} = "tcl" RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb index 35dc4953b..9282f663b 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb @@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ " -SRC_URI[md5sum] = "6e4313df24fd00b0dc0437c3746b940d" -SRC_URI[sha256sum] = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0" +SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" +SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" S ?= "${WORKDIR}/vbox_module" S_task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-openembedded/meta-perl/conf/layer.conf b/meta-openembedded/meta-perl/conf/layer.conf index 1361fe084..f97527c55 100644 --- a/meta-openembedded/meta-perl/conf/layer.conf +++ b/meta-openembedded/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_perl-layer = "gatesgarth" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.51.bb index 61ed78b6f..e3a83679e 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.51.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[md5sum] = "6c7c9d0c272849f3c3c1859cb78962fe" -SRC_URI[sha256sum] = "d8c7a2143352842a9b4962c314ee7e0385273c8b9d8314dcbd04a09c008eef46" +SRC_URI[md5sum] = "87b6cf5bc68739c9310ca501adad998e" +SRC_URI[sha256sum] = "0bd215e7012f9f52e6a7d3fe695ee30ef959d796e8e53472fa0ed8c53fba600a" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.37.bb index 782b973b5..17fbbae25 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.37.bb @@ -10,8 +10,8 @@ DEPENDS += "perl ncurses " SRC_URI = "http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz" -SRC_URI[md5sum] = "389c70ee5530b887f8e5dc1303cb5294" -SRC_URI[sha256sum] = "a414795ba031c5918c70279fe534fee594a96ec4b0c78f44ce453090796add64" +SRC_URI[md5sum] = "aede9d1ed9856eff89f4ce208ee59de0" +SRC_URI[sha256sum] = "74707ae3ad19b35bbefda2b1d6bd31f57b40cdac8ab872171c8714c88954db20" S = "${WORKDIR}/Curses-${PV}" diff --git a/meta-openembedded/meta-python/conf/layer.conf b/meta-openembedded/meta-python/conf/layer.conf index 0dbc4296e..47ab154b5 100644 --- a/meta-openembedded/meta-python/conf/layer.conf +++ b/meta-openembedded/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_meta-python = "gatesgarth" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.1.bb index 121447cdb..8b5b1dd16 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.7.1.bb @@ -2,10 +2,10 @@ SUMMARY = "Async http client/server framework" DESCRIPTION = "Asynchronous HTTP client/server framework for asyncio and Python" HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cf056e8e7a0a5477451af18b7b5aa98c" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3bf3d48554bdca1ea7fdb48de378c2ca" -SRC_URI[md5sum] = "ca40144c199a09fc1a141960cf6295f0" -SRC_URI[sha256sum] = "259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326" +SRC_URI[md5sum] = "ed78633cc420b29d3b61c7d877dc0901" +SRC_URI[sha256sum] = "04f9d70f6c4d089be5068d7df6281e638f6820d4f1b1ec3dc012b0b43fa997d2" PYPI_PACKAGE = "aiohttp" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.0.bb index e36a17027..b085cf7c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.6.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[md5sum] = "7cfa242b99351646fab0d76b05aab747" -SRC_URI[sha256sum] = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5" +SRC_URI[md5sum] = "08ddac722b139c1544087c4953a6335b" +SRC_URI[sha256sum] = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb index 7a3f533f2..54640de04 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" inherit pypi setuptools3 -SRC_URI[md5sum] = "02daee502863d24112a8c05a5d69a612" -SRC_URI[sha256sum] = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1" +SRC_URI[md5sum] = "57b22f2597f63df051b69906fbf310cc" +SRC_URI[sha256sum] = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.35.bb index 123d17613..388885c15 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.35.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[md5sum] = "adfeeb0032ab7aeccba908fa2eb09c33" -SRC_URI[sha256sum] = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964" +SRC_URI[md5sum] = "8bb1443b90123f96ad64d7fae26df342" +SRC_URI[sha256sum] = "b9075573d9d18fdc4c67ad6741c4bfa4b446b1b1d7f03279757244c8a75abedf" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb index 1d6a9b32e..cec37b027 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" LDSHARED += "-pthread" -SRC_URI[md5sum] = "c3807891d36aa9de8187e9db8b2bb457" -SRC_URI[sha256sum] = "9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d" +SRC_URI[md5sum] = "1e476287399bae923514e19429804155" +SRC_URI[sha256sum] = "e4789b84f8dedf190148441f7c5bfe7244782d9cbb194a36e17b91e7d3e1cca9" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.6.0.bb index 204433894..b7c738d65 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.6.0.bb @@ -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] = "4a249c71cb009815923e9a47fa03ca08" -SRC_URI[sha256sum] = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928" +SRC_URI[md5sum] = "9f714324ca99eee98bb3c3cdbe838de6" +SRC_URI[sha256sum] = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb index cf6504462..87c221241 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" -SRC_URI[md5sum] = "24e87dbe11fbbe3d97f23c230f518531" -SRC_URI[sha256sum] = "844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a" +SRC_URI[md5sum] = "4aee3820666e80944f38c39176193d5c" +SRC_URI[sha256sum] = "1892cd490d164e5ec2f2168dc3b4fa0af68f36ca15a88b91bca1826b3d4f2829" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb index f26a1efce..0de4c8f40 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://graphviz.readthedocs.io/en/stable/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f7831c564aeff14e68aa4ff7a93dc89f" -SRC_URI[md5sum] = "436cb0f41f6a949f916357ca037e205a" -SRC_URI[sha256sum] = "f5aad52a652c06825dcc5ee018d920fca26aef339386866094597fb3f2f222ce" +SRC_URI[md5sum] = "7123efabb68270f579525df74bf8b0c9" +SRC_URI[sha256sum] = "92b7637ece63c77e3d39221ae1f4df98e9256cb449e9860c598335b34496d195" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb index 92831bf13..43b882cb8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.1.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://github.com/jmoiron/humanize" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" -SRC_URI[md5sum] = "53faa88dedddba1227f9c41d65440c54" -SRC_URI[sha256sum] = "8ff8f292c9bf52bbefdc620410e7defd1c95e7eeb1a5cfc2859aaea4b1877ff5" +SRC_URI[md5sum] = "bde0a033cf200f2874e6e3fc860bed48" +SRC_URI[sha256sum] = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.1.1.bb index 9ed0e033b..af4291bbf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.1.1.bb @@ -3,6 +3,7 @@ SUMMARY = "A small and simple INI-file parser module" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" -SRC_URI[sha256sum] = "e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69" +SRC_URI[md5sum] = "0b7f3be87481211c183eae095bcea6f1" +SRC_URI[sha256sum] = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb index 0c5842790..66a5332be 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.6.4.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[md5sum] = "6b90dd55851a8ccb3a19fe2cb82cb82f" -SRC_URI[sha256sum] = "ba040c24d20aa302f78f4747df549573ae1eaf8e1084269199154da9c483f07f" +SRC_URI[md5sum] = "d2dfc32943b1d64311facec6a05c2f98" +SRC_URI[sha256sum] = "dcaeec1b5f0eca77faea2a35ab790b4f3680ff75590bfcb7145986905aab2f58" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.3.bb index 9246d1b3a..8301d7f77 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.3.bb @@ -2,12 +2,12 @@ SUMMARY = "A component library to support SBC display drivers" DESCRIPTION = "A component library to support SBC display drivers" HOMEPAGE = "https://github.com/rm-hull/luma.core" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=eda804060ba2312e41fe96b6fa334fd7" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=db07e3d471938ea7d7fd2135f88ac9a1" inherit pypi setuptools3 -SRC_URI[md5sum] = "dea76a83c7130f59b7e807c3b2f1b3b5" -SRC_URI[sha256sum] = "b4a9f934f4dbf9b1d5c74259f871b4187aaa754b139964153f7702badaaccffd" +SRC_URI[md5sum] = "c13303a123c32c1a8dc5bc089a920822" +SRC_URI[sha256sum] = "1c928ad8e42af5fd395260176f89eb68a8af61911971f94124fabc9c6b550689" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb index 7e11a67e7..af012e630 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.6.1.bb @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[md5sum] = "83ad758eab6c254b3565715967d553a6" -SRC_URI[sha256sum] = "cdc13a1682b2a6241080745b1953719e7fe0850b40a5c71ca574f090a1391df6" +SRC_URI[md5sum] = "10924ab543397a06cb4cfaf9bdf0b80f" +SRC_URI[sha256sum] = "c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.2.bb index db8311be5..d8d530426 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.2.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" inherit pypi setuptools3 PYPI_PACKAGE = "Markdown" -SRC_URI[md5sum] = "76eb34a058bb8b637ccadc4ce384bae4" -SRC_URI[sha256sum] = "4f4172a4e989b97f96860fa434b89895069c576e2b537c4b4eed265266a7affc" +SRC_URI[md5sum] = "4bdebf1b5c64286c2214c99120da4292" +SRC_URI[sha256sum] = "4b71fbd2db30c1dfb400f22b25f41cb823fc1db0aa8b7b67d120644f92cc1011" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.2.bb index 324847c31..eb7ce62b8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.2.bb @@ -12,3 +12,9 @@ inherit pypi setuptools3 CLEANBROKEN = "1" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-bcrypt \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-pynacl \ + ${PYTHON_PN}-unixadmin \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb index b347163aa..fd26f3a76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb @@ -7,10 +7,10 @@ tasks, from verifying a hash found in /etc/shadow, to providing full-strength pa hashing for multi-user applications." HOMEPAGE = "https://foss.heptapod.net/python-libs/passlib/wikis/home" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=44fd7dcd5d42b48d6dea59ac643a0179" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c8449c5e10474d113ab787ed2753bafe" -SRC_URI[md5sum] = "b908529cfd4c33057c244324c692eae7" -SRC_URI[sha256sum] = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8" +SRC_URI[md5sum] = "3a229cbd00dfb33e99885b43325e0591" +SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb index a065b6c47..79341b9d2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb @@ -28,6 +28,7 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += " \ ${PYTHON_PN}-math \ ${PYTHON_PN}-html \ + ${PYTHON_PN}-wcwidth \ " RDEPENDS_${PN}-ptest += " \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb index 7b0d1a069..0debba48d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.8.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[md5sum] = "f1b34c688ef7dccccb951130f008f6fe" -SRC_URI[sha256sum] = "822f4605f28f7d2ba6b0b09a31e25e140871e96364d1d377667b547bb3bf4489" +SRC_URI[md5sum] = "cf3ca19873fa9e7f6162296cf6bae419" +SRC_URI[sha256sum] = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb index d61d501e9..2f927d2da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.3.bb @@ -2,9 +2,8 @@ SUMMARY = "A cross-platform process and system utilities module for Python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1/psutil-${PV}.tar.gz" -SRC_URI[md5sum] = "50bf39b4faa268ba1da8a9730bb38bb6" -SRC_URI[sha256sum] = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb" +SRC_URI[md5sum] = "b07a067e6a930608235f4e5d9b1f90f5" +SRC_URI[sha256sum] = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb index adfdbb17b..b7796251e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.1.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[md5sum] = "d35c610f57cae909348ff6c60e5e9256" -SRC_URI[sha256sum] = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8" +SRC_URI[md5sum] = "9dee7207b7a5c73ebf8fad64be137f27" +SRC_URI[sha256sum] = "cf2e9fa795ea1e9d0d180adfbdccefd6b4f532eae56f41f15d1a75b323096f51" PYPI_PACKAGE = "PyChromecast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydicti_1.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydicti_1.1.4.bb index bca0ba737..29ad30e0f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydicti_1.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydicti_1.1.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/coldfix/pydicti" LICENSE = "WTFPL" LIC_FILES_CHKSUM = "file://COPYING;md5=389a9e29629d1f05e115f8f05c283df5" -SRC_URI[md5sum] = "b02ed35da91e400f1f17a57ab02ba06b" -SRC_URI[sha256sum] = "eea50576baa751a9b6b862f09f081c47d557e0298623ca8742851da72b00eec4" +SRC_URI[md5sum] = "c8925e333a78766cb469c1626880bd35" +SRC_URI[sha256sum] = "dcea4d1892fc68ca62aba835b1ed444a1eb48bd0cca0b4599efd45cbb6272b5c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.131.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb index 82ab80314..28a24fed5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.131.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.133.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[md5sum] = "8844204f8b059ff2fc508ba9ac07dcb2" -SRC_URI[sha256sum] = "59adb7ee95bfb1b5c35abbc01b5372df7327baea4a8df9efe30140ea64b73c18" +SRC_URI[md5sum] = "00e258da18f59845687f58389a2e8e12" +SRC_URI[sha256sum] = "4a2a8a4da78c6321550522d5cf1575c095773d0867c0a4f5157a658f6e1994d5" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.23.bb index df2c00bba..c8cbdd11f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.23.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c0 inherit pypi setuptools3 -SRC_URI[md5sum] = "642c259122a3b578cec66d8bba5665e4" -SRC_URI[sha256sum] = "463e770c48da76a8da82b8d4a48a541f314e0df91cbb6d873a341dbe578efafd" +SRC_URI[md5sum] = "13fb62a1b276623e38931f7217f080d8" +SRC_URI[sha256sum] = "2278453c6a76280b38855a263198961938108ea2333ee145c5168c36b8e2b376" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.13.0.bb index 71cb1acec..8c7c424c6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.13.0.bb @@ -4,8 +4,8 @@ BUGTRACKER = "https://github.com/k-bx/python-semver/issues" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" -SRC_URI[md5sum] = "3e11ae9782121e8ffe9f8a8b763a8cb5" -SRC_URI[sha256sum] = "c0a4a9d1e45557297a722ee9bac3de2ec2ea79016b6ffcaca609b0bc62cf4276" +SRC_URI[md5sum] = "e98b5fb283ea84daa5195087de83ebf1" +SRC_URI[sha256sum] = "fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb index e4ab9f33d..2da9908e3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.19.1.bb @@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/getsentry/sentry-python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" -SRC_URI[md5sum] = "d6a85d958aea9277c1728c77dcf063a1" -SRC_URI[sha256sum] = "1d91a0059d2d8bb980bec169578035c2f2d4b93cd8a4fb5b85c81904d33e221a" +SRC_URI[md5sum] = "1e6aabe30f4c86356d1d85a9beb0b05a" +SRC_URI[sha256sum] = "5cf36eb6b1dc62d55f3c64289792cbaebc8ffa5a9da14474f49b46d20caa7fc8" PYPI_PACKAGE = "sentry-sdk" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb index 52e7bf376..e8f598ada 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.20.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" -SRC_URI[md5sum] = "a5710b0aee19a743e513f3bf002072a8" -SRC_URI[sha256sum] = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e" +SRC_URI[md5sum] = "40200b570274446a05959abd3fa81778" +SRC_URI[sha256sum] = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch index ad6c50ff7..94121340d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch @@ -1,4 +1,4 @@ -From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001 +From 7fd00ab8c1b663052d57e735b6b956d5c92fbaed Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 9 Mar 2020 13:10:37 +0800 Subject: [PATCH] sqlparse: change shebang to python3 @@ -10,42 +10,102 @@ we can only make this change after python2 is offcially dropped. Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - setup.py | 2 +- - sqlparse/__main__.py | 2 +- - sqlparse/cli.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + 0001-sqlparse-change-shebang-to-python3.patch | 51 +++++++++++++++++++ + setup.py | 2 +- + sqlparse/__main__.py | 2 +- + sqlparse/cli.py | 2 +- + 4 files changed, 54 insertions(+), 3 deletions(-) + create mode 100644 0001-sqlparse-change-shebang-to-python3.patch +diff --git a/0001-sqlparse-change-shebang-to-python3.patch b/0001-sqlparse-change-shebang-to-python3.patch +new file mode 100644 +index 0000000..ad6c50f +--- /dev/null ++++ b/0001-sqlparse-change-shebang-to-python3.patch +@@ -0,0 +1,51 @@ ++From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001 ++From: Changqing Li <changqing.li@windriver.com> ++Date: Mon, 9 Mar 2020 13:10:37 +0800 ++Subject: [PATCH] sqlparse: change shebang to python3 ++ ++Upstream-Status: Pending ++ ++Don't send upstream since upstream still support python2, ++we can only make this change after python2 is offcially ++dropped. ++ ++Signed-off-by: Changqing Li <changqing.li@windriver.com> ++--- ++ setup.py | 2 +- ++ sqlparse/__main__.py | 2 +- ++ sqlparse/cli.py | 2 +- ++ 3 files changed, 3 insertions(+), 3 deletions(-) ++ ++diff --git a/setup.py b/setup.py ++index 345d0ce..ce3abc3 100644 ++--- a/setup.py +++++ b/setup.py ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/env python +++#!/usr/bin/env python3 ++ # -*- coding: utf-8 -*- ++ # ++ # Copyright (C) 2009-2018 the sqlparse authors and contributors ++diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py ++index 867d75d..dd0c074 100644 ++--- a/sqlparse/__main__.py +++++ b/sqlparse/__main__.py ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/env python +++#!/usr/bin/env python3 ++ # -*- coding: utf-8 -*- ++ # ++ # Copyright (C) 2009-2018 the sqlparse authors and contributors ++diff --git a/sqlparse/cli.py b/sqlparse/cli.py ++index 25555a5..8bf050a 100755 ++--- a/sqlparse/cli.py +++++ b/sqlparse/cli.py ++@@ -1,4 +1,4 @@ ++-#!/usr/bin/env python +++#!/usr/bin/env python3 ++ # -*- coding: utf-8 -*- ++ # ++ # Copyright (C) 2009-2018 the sqlparse authors and contributors ++-- ++2.7.4 ++ diff --git a/setup.py b/setup.py -index 345d0ce..ce3abc3 100644 +index ede0aff..dc6a323 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- # - # Copyright (C) 2009-2018 the sqlparse authors and contributors + # Copyright (C) 2009-2020 the sqlparse authors and contributors + # <see AUTHORS file> diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py -index 867d75d..dd0c074 100644 +index 2bf2513..6a3a115 100644 --- a/sqlparse/__main__.py +++ b/sqlparse/__main__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- # - # Copyright (C) 2009-2018 the sqlparse authors and contributors + # Copyright (C) 2009-2020 the sqlparse authors and contributors + # <see AUTHORS file> diff --git a/sqlparse/cli.py b/sqlparse/cli.py -index 25555a5..8bf050a 100755 +index 7a8aacb..9c727e8 100755 --- a/sqlparse/cli.py +++ b/sqlparse/cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # -*- coding: utf-8 -*- # - # Copyright (C) 2009-2018 the sqlparse authors and contributors + # Copyright (C) 2009-2020 the sqlparse authors and contributors + # <see AUTHORS file> -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb index 1aef28be0..c8a64c109 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb @@ -8,8 +8,8 @@ SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "423047887a3590b04dd18f8caf843a2f" -SRC_URI[sha256sum] = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548" +SRC_URI[md5sum] = "eebbc6b5f1033054873033e54b0c1266" +SRC_URI[sha256sum] = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8" export BUILD_SYS export HOST_SYS diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb index 9c2d06ba9..e4510ad44 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.51.0.bb @@ -5,8 +5,8 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" -SRC_URI[md5sum] = "2e56a15d28aa1fa06eeb31031c16c1f3" -SRC_URI[sha256sum] = "69dfa6714dee976e2425a9aab84b622675b7b1742873041e3db8a8e86132a4af" +SRC_URI[md5sum] = "b188c2dc7802c19b262971e566c265ce" +SRC_URI[sha256sum] = "ef54779f1c09f346b2b5a8e5c61f96fbcb639929e640e59f8cf810794f406432" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb index 194193f63..53451cd3c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.0.5.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=eec4de4d599518742e54e75954e33b46" PYPI_PACKAGE = "traitlets" -SRC_URI[md5sum] = "592dde72b6b706d09ea624cce9af3cf5" -SRC_URI[sha256sum] = "86c9351f94f95de9db8a04ad8e892da299a088a64fd283f9f6f18770ae5eae1b" +SRC_URI[md5sum] = "2ffe54aee5d0d87890127dd28ce3f6c4" +SRC_URI[sha256sum] = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396" RDEPENDS_${PN} = "\ ${PYTHON_PN}-ipython-genutils \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb index 3786ccb85..bd9221677 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.10.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://pypi.org/project/typeguard/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" -SRC_URI[md5sum] = "411df8eefd76ffa014328a46342bdf38" -SRC_URI[sha256sum] = "529ef3d88189cc457f4340388028412f71be8091c2c943465146d4170fb67288" +SRC_URI[md5sum] = "cc43e0eb1dea7e409a74c7f1effc4544" +SRC_URI[sha256sum] = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.1.bb index 4797a3535..c5524d152 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.1.bb @@ -3,8 +3,8 @@ DESCRIPTION = "A portable, lightweight MessagePack serializer and deserializer w LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb4691bcb66360acee473a8cf75f594" -SRC_URI[md5sum] = "231609d87aa58459a1491c8f5df4e4cd" -SRC_URI[sha256sum] = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54" +SRC_URI[md5sum] = "8691cea6bc7b44bce6e2115260a54323" +SRC_URI[sha256sum] = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb index e1d7d9d79..2475306f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_4.0.1.bb @@ -4,8 +4,8 @@ DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pu LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" -SRC_URI[md5sum] = "a524264ef4069e18d742e32e90845a3f" -SRC_URI[sha256sum] = "abb1996ba1c1d2faf5b1e38efa97da7f64e5373a31f705b96fe0587f5f778db4" +SRC_URI[md5sum] = "c8030a62912c3be18ff99fa5b25258b8" +SRC_URI[sha256sum] = "26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3" inherit pypi ptest setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.11.bb index db985a2ff..980f4c53d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.11.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" -SRC_URI[md5sum] = "94e3d4d472a14e788d4bd1a903fd102b" -SRC_URI[sha256sum] = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a" +SRC_URI[md5sum] = "d47dd21a6e66a03c3633cac468ffd010" +SRC_URI[sha256sum] = "8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.7.bb index f3314037f..a8f013c58 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.7.bb @@ -8,7 +8,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "XlsxWriter" -SRC_URI[md5sum] = "378642a3754fb233e418e3869cf051bb" -SRC_URI[sha256sum] = "b89002dea57bb3d4c8207f3e28ef8244bfd9e936b85d74e7dd1f97e11bb70313" +SRC_URI[md5sum] = "8c0595292fae76297eac03ae76507b7b" +SRC_URI[sha256sum] = "9b1ade2d1ba5d9b40a6d1de1d55ded4394ab8002718092ae80a08532c2add2e6" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb index 366dec3dc..f87c3fb63 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/sumerc/yappi" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=71c208c9a4fd864385eb69ad4caa3bee" -SRC_URI[md5sum] = "83237494e7d22df2a31935a1e6650fa6" -SRC_URI[sha256sum] = "ad5fa4caf2859e480ffc4ec3e85615a6f7dea852c8f035f2db723f824ed4ba11" +SRC_URI[md5sum] = "6dde41b116566cbe1575e41a1e376f74" +SRC_URI[sha256sum] = "a443240f4a776fa1be04430bf423dbf09615c05eba34f4a2a6af344a7ce8ff61" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.2.bb index 543acc51b..dbb5d23bd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" -SRC_URI[md5sum] = "802bb27ebdb260fbbaecbcc8168d6f28" -SRC_URI[sha256sum] = "61d3ea3c175fe45f1498af868879c6ffeb989d4143ac542163c45538ba5ec21b" +SRC_URI[md5sum] = "65c3346f694e37f45045f4e29a60d280" +SRC_URI[sha256sum] = "c45b49b59a5724869899798e1bbd447ac486215269511d3b76b4c235a1b766b6" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.4.0.bb index 746f9cea5..97523e8e7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.4.0.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[md5sum] = "87a53f0bf48671f6bf6d3e9938218509" -SRC_URI[sha256sum] = "64ad89efee774d1897a58607895d80789c59778ea02185dd846ac38394a8642b" +SRC_URI[md5sum] = "ae81f228995578b840d76d1b7d87fede" +SRC_URI[sha256sum] = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.6.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb index 63f493366..8909aa11f 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.6.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "\ file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ " -SRC_URI[md5sum] = "b85dcaecc3106eb6e9a117270b09615e" -SRC_URI[sha256sum] = "727ccdf308c194069aa9797f7a6a973bc95b2e407cdf5d58d6c8bc4c9dec92dc" +SRC_URI[md5sum] = "69284f943982f54ded76960c92098a02" +SRC_URI[sha256sum] = "61cde7b096bccd69ddc75c85b17f8baed45c3687d404706d91403a319453b903" inherit pypi distutils3 diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb index 8620057f5..03caec539 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.8.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -SRC_URI[md5sum] = "e3f8cadb8d1253b1b51afabcce4c3461" -SRC_URI[sha256sum] = "b475da4389ac77901191c886f4348660f3c0fd59365feb18ede47a086442efff" +SRC_URI[md5sum] = "e41ef654a0af0461d6c164752963fdfb" +SRC_URI[sha256sum] = "b869bb217613cdfee1e97e8afc28fe3f9bf3b88f8fc99e588d03c4be0922c319" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 24469115e..94489983e 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_webserver = "gatesgarth" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index 7e4bb178e..a71eb8fe5 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_xfce-layer = "gatesgarth" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \ |