diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-04-13 17:07:35 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-04-14 02:10:00 +0300 |
| commit | 58776373dfbbda0388940c41752c07c18b4f15cd (patch) | |
| tree | c8a3e0ccd43548d6df30f960de94404009a2baf5 /meta-openembedded | |
| parent | dc43764abca8281445f5d50c2c44cd85b56cc4af (diff) | |
| download | openbmc-58776373dfbbda0388940c41752c07c18b4f15cd.tar.xz | |
subtree updates
meta-raspberrypi: cfbb192e5c..83f5577d8d:
AJ Bagwell (1):
linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR
poky: ed98f1a1ae..30b38d9cb9:
Alexander Kanavin (1):
connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific
Chen Qi (1):
spirv-tools: fix to use sdk-1.3.204 branch
Kevin Hao (1):
kernel.bbclass: Fix the do_strip() malfunction
Khem Raj (2):
libarchive: Upgrade to 3.6.1
musl: Move to 1.2.3 release tag
Martin Jansa (1):
license_image.bbclass: close package.manifest file
Ralph Siemsen (2):
xz: fix CVE-2022-1271
gzip: upgrade 1.11 -> 1.12
Richard Purdie (2):
uninative: Upgrade to 3.6 with gcc 12 support
package_ipk/deb: Fix specific version handling
Ross Burton (1):
python3-cryptography: backport fix for leaky test
meta-openembedded: b9e440ead8..1888971b1f:
Andreas Müller (5):
octave: add PACKAGECONFIG for (Qt-)gui - disabled by default
xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0
gnome-online-accounts: upgrade 3.43.1 -> 3.44.0
mutter: upgrade 41.2 -> 42.0
gnome-shell: upgrade 41.2 -> 42.0
Clément Péron (1):
grpc: remove unused patches
Kai Kang (2):
wxwidgets: fix wx-config multilib issue
python3-wxgtk4: pass '--baselib' to WX_CONFIG
Khem Raj (6):
Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1"
libotr: Include missing sys/socket.h header
libcereal: Link in libatomic on rv32 for ptests
gnuplot: Disable libcerf and fix typo
libcereal: Disable on ppc/ppc64
evolution-data-server: Disable g-i on musl
Markus Volk (1):
gparted: update to v1.4.0
Naveen Saini (1):
ndctl: fix build failure with EXEWRAPPER_ENABLED False
Oleksandr Kravchuk (27):
python3-beautifulsoup: update to 4.11.1
python3-bidict: update to 0.22.0
python3-can: update t 4.0.0
python3-elementpath: update to 2.5.0
python3-flask-login: update to 0.6.0
python3-flask: update to 2.1.1
python3-gcovr: update to 5.1
python3-google-api-core: update to 2.7.1
python3-google-auth: update to 2.6.3
python3-grpcio-tools: update to 1.45.0
python3-ipython: update to 8.2.0
python3-jmespath: update to 1.0.0
python3-mypy: update to 0.942
python3-pint: update to 0.19.1
python3-portalocker: update to 2.4.0
python3-pulsectl: update to 22.3.2
python3-pycurl: update to 7.45.1
python3-pymogo: update to 4.1.0
python3-pyscaffold: update to 4.2.1
python3-pytest-helpers-namespace: update to 2021.12.29
python3-pywbem: update to 1.4.1
python3-regex: update to 2022.3.15
python3-sympy: update to 1.10.1
python3-tqdm: update to 4.64.1
python3-twitter: update to 4.8.0
python3-xmlschema: update to 1.10.0
python3-zeroconf: update to 0.38.4
Robert Yang (1):
python3-wxgtk4: Require DISTRO_FEATURES as gtk3
Sakib Sajal (1):
drbd-utils: update 9.13.1 -> 9.20.2
Scott Murray (1):
wxwidgets: Fix building without x11
Stefan Herbrechtsmeier (2):
grpc: add cmake support for target
grpc: remove useless link with libatomic append
Stefan Schmidt (4):
ot-br-posix: add recipe for an OpenThread Border Router
ot-daemon: add recipe for OpenThread daemon
wpantund: add new recipe
MAINTAINERS: add entry for OpenThread
Willy Tu (1):
googletests: Update SRC_URI to 9e71237 to move closer to lastest version
Yi Zhao (1):
libyang: do not inherit binconfig-disabled
wangmy (9):
haveged: upgrade 1.9.17 -> 1.9.18
hidapi: upgrade 0.10.1 -> 0.11.2
hwdata: upgrade 0.357 -> 0.358
broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3
byacc: upgrade 20211224 -> 20220128
ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0
feh: upgrade 3.6.1 -> 3.8
fio: upgrade 3.29 -> 3.30
grpc: upgrade 1.45.1 -> 1.45.2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8
Diffstat (limited to 'meta-openembedded')
73 files changed, 718 insertions, 416 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch new file mode 100644 index 0000000000..aae200e27e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] BCache_Info.cc: use posix basename + +gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. + +fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ +recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ +gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + +error: use of undeclared identifier 'basename'; did you mean 'g_basename'? + return "/dev/" + Glib::ustring(basename(buf)); + ^~~~~~~~ + g_basename + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted + +https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 + +--- a/src/BCache_Info.cc 2022-03-02 22:04:17.000000000 +0100 ++++ b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include <string.h> // GNU version of basename() ++#include <libgen.h> // POSIX version of basename() + #include <unistd.h> + #include <glibmm/ustring.h> + #include <glibmm/fileutils.h> diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a9759303..6f774904b7 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ + file://0001-use-posix-basename.patch \ " -SRC_URI[sha256sum] = "5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109" +SRC_URI[sha256sum] = "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 48cf6f76bc..b4931d796d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -48,6 +48,9 @@ PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" # -ldb needs this on some platforms LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" +# invokes libraries from build host +GI_DATA_ENABLED:libc-musl="False" + do_configure:append () { cp ${WORKDIR}/iconv-detect.h ${S}/src # avoid writing perl-native path into csv2vcard shebang diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb index 8dabb9e0c1..64aa2f4d9a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb @@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "glib-2.0" SRC_URI += "file://0001-Update-to-rest-1.0.patch" -SRC_URI[archive.sha256sum] = "3bcb3663a12efd4482d9fdda3e171676267fc739eb6440a2b7109a0e87afb7e8" +SRC_URI[archive.sha256sum] = "381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342" # backend is required for gnome-control-center PACKAGECONFIG = "backend other" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch index 15e3c8c647..4a36625184 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch @@ -19,25 +19,25 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index 68e8bd12d..16efaebe5 100644 +index eb941ed..16efaeb 100644 --- a/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build @@ -27,7 +27,7 @@ foreach service, dir : dbus_services serviceconf = configuration_data() serviceconf.set('service', service) -- serviceconf.set('gjs', gjs.path()) +- serviceconf.set('gjs', gjs.full_path()) + serviceconf.set('gjs', gjs) serviceconf.set('pkgdatadir', pkgdatadir) configure_file( diff --git a/meson.build b/meson.build -index d4583ecf2..3448c6312 100644 +index 8d7478f..7c9cc6a 100644 --- a/meson.build +++ b/meson.build @@ -138,7 +138,11 @@ endif - mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir') + mutter_typelibdir = mutter_dep.get_variable('typelibdir') python = find_program('python3') -gjs = find_program('gjs') +if get_option('gjs_path') == '' @@ -49,7 +49,7 @@ index d4583ecf2..3448c6312 100644 cc = meson.get_compiler('c') diff --git a/meson_options.txt b/meson_options.txt -index f0f2ecf6c..a45f2e453 100644 +index f0f2ecf..a45f2e4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -45,3 +45,9 @@ option('soup2', @@ -63,20 +63,20 @@ index f0f2ecf6c..a45f2e453 100644 + description: 'Instead of searching gjs executable, configure path' +) diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build -index f311db6e0..8f7bba4e4 100644 +index ce2a776..8f7bba4 100644 --- a/subprojects/extensions-app/js/meson.build +++ b/subprojects/extensions-app/js/meson.build @@ -9,7 +9,7 @@ endif launcherconf.set('prefix', prefix) launcherconf.set('libdir', libdir) launcherconf.set('pkgdatadir', pkgdatadir) --launcherconf.set('gjs', gjs.path()) +-launcherconf.set('gjs', gjs.full_path()) +launcherconf.set('gjs', gjs) configure_file( input: prgname + '.in', diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build -index f9ccfc24d..bdf118975 100644 +index c260d7a..c5b7554 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build @@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale') @@ -94,7 +94,7 @@ index f9ccfc24d..bdf118975 100644 desktop_file_validate = find_program('desktop-file-validate', required: false) diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt -index ca2eb4115..2787785bf 100644 +index ca2eb41..2787785 100644 --- a/subprojects/extensions-app/meson_options.txt +++ b/subprojects/extensions-app/meson_options.txt @@ -10,3 +10,9 @@ option('profile', @@ -108,5 +108,5 @@ index ca2eb4115..2787785bf 100644 + description: 'Instead of searching gjs executable, configure path' +) -- -2.31.1 +2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch deleted file mode 100644 index edc32dee6c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 6f797c21703ce9e996da17c49879e2a16dfbc256 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Unlike other targets that take a name, i18n.merge_file() does not. - -Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 2 +- - src/calendar-server/meson.build | 2 +- - subprojects/extensions-app/data/meson.build | 2 +- - subprojects/extensions-app/data/metainfo/meson.build | 2 +- - subprojects/extensions-tool/src/templates/meson.build | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f924fdf..76ae45c 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', -diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build -index 7363282..8b4ef41 100644 ---- a/src/calendar-server/meson.build -+++ b/src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, -diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build -index d7e7d40..4b601e8 100644 ---- a/subprojects/extensions-app/data/meson.build -+++ b/subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', -diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build -index c4962c0..a19bfa8 100644 ---- a/subprojects/extensions-app/data/metainfo/meson.build -+++ b/subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, -diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build -index 670e2bf..d693bfa 100644 ---- a/subprojects/extensions-tool/src/templates/meson.build -+++ b/subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb index 8d0dba4840..f54d966c73 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb @@ -4,10 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gettext gobject-introspection features_check bash-completion - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" - DEPENDS = " \ libxml2-native \ sassc-native \ @@ -24,15 +20,19 @@ DEPENDS = " \ gsettings-desktop-schemas \ " +inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +GTKIC_VERSION = "4" GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "384651eb051393dbabe006d1ad057bf29d5cd73ebb87bc779ff5e1c31e80a827" +SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" -SRC_URI += " file://0001-build-Drop-incorrect-positional-arg.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb index 08ac897a7f..7855362800 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb @@ -25,7 +25,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "00dfa812f1c486d74a2b73f42045ae1182f9246c7794d67d74b5e543ea700617" +SRC_URI[archive.sha256sum] = "d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" @@ -60,7 +60,7 @@ PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -MUTTER_API_NAME = "mutter-9" +MUTTER_API_NAME = "mutter-10" do_install:append() { # Add gir links in standard paths. That makes dependents life much easier diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index 77e90668c4..ce53ec471b 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -37,3 +37,7 @@ F: recipes-* NETKIT M: Armin Kuster <akuster808@gmail.com> F: recipes-netkit + +OPENTHREAD +M: Stefan Schmidt <stefan@datenfreihafen.org> +F: recipes-connectivity/openthread/ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch new file mode 100644 index 0000000000..250de4bdd8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch @@ -0,0 +1,35 @@ +From ed60d4605b81c43b9ba9504a37835109c247c6f8 Mon Sep 17 00:00:00 2001 +From: Stefan Schmidt <stefan.schmidt@huawei.com> +Date: Fri, 1 Apr 2022 21:46:03 +0200 +Subject: [PATCH] otbr-agent.service.in: remove pre exec hook for mdns service + +It uses the service command which is not available in all cases under +Yocto/OE. The upstream project uses this mainly with Ubuntu and Raspian +as testbeds. + +In our case we simply ensure that avahi-daemon is installed on the +system inside the recipe. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> +--- + src/agent/otbr-agent.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/agent/otbr-agent.service.in b/src/agent/otbr-agent.service.in +index 8314121347..4c97869def 100644 +--- a/src/agent/otbr-agent.service.in ++++ b/src/agent/otbr-agent.service.in +@@ -6,7 +6,7 @@ After=dbus.socket + + [Service] + EnvironmentFile=-@CMAKE_INSTALL_FULL_SYSCONFDIR@/default/otbr-agent +-@EXEC_START_PRE@ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS ++ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS + KillMode=mixed + Restart=on-failure + RestartSec=5 +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch new file mode 100644 index 0000000000..df84550be0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/Turn-off-sign-compare-for-musl-libc.patch @@ -0,0 +1,131 @@ +From: Stefan Schmidt <stefan.schmidt@huawei.com> +Subject: Turn off sign compare for musl libc + +When building with musl and clang the usage of CMSG_NXTHDR results in +sign-compare error. Disable the check only in this specific part of the +code with a #pragma. + +| /home/stefan/huawei/yocto-upstream/yoe/workspace/sources/ot-br-posix/third_party/openthread/repo/src/posix/platform/udp.cpp:147:28: fatal error: comparison of integers of different signs: 'unsigned long' and 'long' [-Wsign-compare] +| cmsg = CMSG_NXTHDR(&msg, cmsg); +| ^~~~~~~~~~~~~~~~~~~~~~~ +| /home/stefan/huawei/yocto-upstream/yoe/build/tmp/work/cortexa57-yoe-linux-musl/ot-br-posix/0.3.0+git999-r0/recipe-sysroot/usr/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' +| __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ +| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| 1 error generated. + +Idea and fix taken from +recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch +by Khem Raj. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> + +diff --git a/src/backbone_router/nd_proxy.cpp b/src/backbone_router/nd_proxy.cpp +index 7136878c3d..8a223c95c7 100644 +--- a/src/backbone_router/nd_proxy.cpp ++++ b/src/backbone_router/nd_proxy.cpp +@@ -185,9 +185,18 @@ void NdProxyManager::ProcessMulticastNeighborSolicition() + VerifyOrExit(icmp6header->icmp6_type == ND_NEIGHBOR_SOLICIT, error = OTBR_ERROR_PARSE); + + otbrLogDebug("NdProxyManager: Received ND-NS from %s", src.ToString().c_str()); +- ++#ifndef __GLIBC__ ++ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes ++ // clang to throw sign-compare warning. This is to suppress the warning ++ // inline. ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wsign-compare" ++#endif + for (cmsghdr = CMSG_FIRSTHDR(&msghdr); cmsghdr; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) +- { ++#ifndef __GLIBC__ ++ #pragma clang diagnostic pop ++#endif ++ { + if (cmsghdr->cmsg_level != IPPROTO_IPV6) + { + continue; +Submodule third_party/openthread/repo contains modified content +diff --git a/third_party/openthread/repo/src/posix/platform/infra_if.cpp b/third_party/openthread/repo/src/posix/platform/infra_if.cpp +index 9f93d2b1c..1ed40fe50 100644 +--- a/third_party/openthread/repo/src/posix/platform/infra_if.cpp ++++ b/third_party/openthread/repo/src/posix/platform/infra_if.cpp +@@ -228,7 +228,17 @@ otError InfraNetif::SendIcmp6Nd(uint32_t aInfraIfIndex, + packetInfo->ipi6_ifindex = mInfraIfIndex; + + // Per section 6.1.2 of RFC 4861, we need to send the ICMPv6 message with IP Hop Limit 255. ++#ifndef __GLIBC__ ++ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes ++ // clang to throw sign-compare warning. This is to suppress the warning ++ // inline. ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wsign-compare" ++#endif + cmsgPointer = CMSG_NXTHDR(&msgHeader, cmsgPointer); ++#ifndef __GLIBC__ ++ #pragma clang diagnostic pop ++#endif + cmsgPointer->cmsg_level = IPPROTO_IPV6; + cmsgPointer->cmsg_type = IPV6_HOPLIMIT; + cmsgPointer->cmsg_len = CMSG_LEN(sizeof(hopLimit)); +@@ -481,7 +491,17 @@ void InfraNetif::ReceiveIcmp6Message(void) + + bufferLength = static_cast<uint16_t>(rval); + ++#ifndef __GLIBC__ ++ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes ++ // clang to throw sign-compare warning. This is to suppress the warning ++ // inline. ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wsign-compare" ++#endif + for (cmh = CMSG_FIRSTHDR(&msg); cmh; cmh = CMSG_NXTHDR(&msg, cmh)) ++#ifndef __GLIBC__ ++ #pragma clang diagnostic pop ++#endif + { + if (cmh->cmsg_level == IPPROTO_IPV6 && cmh->cmsg_type == IPV6_PKTINFO && + cmh->cmsg_len == CMSG_LEN(sizeof(struct in6_pktinfo))) +diff --git a/third_party/openthread/repo/src/posix/platform/udp.cpp b/third_party/openthread/repo/src/posix/platform/udp.cpp +index b7aacc5fa..a814fea70 100644 +--- a/third_party/openthread/repo/src/posix/platform/udp.cpp ++++ b/third_party/openthread/repo/src/posix/platform/udp.cpp +@@ -144,8 +144,18 @@ otError transmitPacket(int aFd, uint8_t *aPayload, uint16_t aLength, const otMes + { + struct in6_pktinfo pktinfo; + ++#ifndef __GLIBC__ ++ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes ++ // clang to throw sign-compare warning. This is to suppress the warning ++ // inline. ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wsign-compare" ++#endif + cmsg = CMSG_NXTHDR(&msg, cmsg); +- cmsg->cmsg_level = IPPROTO_IPV6; ++#ifndef __GLIBC__ ++ #pragma clang diagnostic pop ++#endif ++ cmsg->cmsg_level = IPPROTO_IPV6; + cmsg->cmsg_type = IPV6_PKTINFO; + cmsg->cmsg_len = CMSG_LEN(sizeof(pktinfo)); + +@@ -200,7 +210,17 @@ otError receivePacket(int aFd, uint8_t *aPayload, uint16_t &aLength, otMessageIn + VerifyOrExit(rval > 0, perror("recvmsg")); + aLength = static_cast<uint16_t>(rval); + ++#ifndef __GLIBC__ ++ // In musl-libc, CMSG_NXTHDR typecasts char* to cmsghdr* which causes ++ // clang to throw sign-compare warning. This is to suppress the warning ++ // inline. ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wsign-compare" ++#endif + for (struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); cmsg != nullptr; cmsg = CMSG_NXTHDR(&msg, cmsg)) ++#ifndef __GLIBC__ ++ #pragma clang diagnostic pop ++#endif + { + if (cmsg->cmsg_level == IPPROTO_IPV6) + { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb new file mode 100644 index 0000000000..d9f558d792 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -0,0 +1,59 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "OpenThread Border Router" +SECTION = "net" +LICENSE = "BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ + file://third_party/Simple-web-server/repo/LICENSE;md5=852b3f7f320b19f6431487b8b2fb1d74 \ + file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ + file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \ + file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + " +DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue" +SRCREV = "ad6822257ffddbac295db97186e4ab449a2ed32a" +PV = "0.3.0+git${SRCPV}" + +SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ + file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ + file://Turn-off-sign-compare-for-musl-libc.patch \ + " + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} = "otbr-agent.service" + +inherit pkgconfig cmake systemd + +EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ + -DOTBR_DBUS=ON \ + -DOTBR_REST=ON \ + -DOTBR_WEB=OFF \ + -DCMAKE_LIBRARY_PATH=${libdir} \ + -DOTBR_MDNS=avahi \ + -DOTBR_BACKBONE_ROUTER=ON \ + -DOTBR_BORDER_ROUTING=ON \ + -DOTBR_SRP_ADVERTISING_PROXY=ON \ + -DOTBR_BORDER_AGENT=ON \ + -DOT_SPINEL_RESET_CONNECTION=ON \ + -DOT_TREL=ON \ + -DOT_MLR=ON \ + -DOT_SRP_SERVER=ON \ + -DOT_ECDSA=ON \ + -DOT_SERVICE=ON \ + -DOTBR_DUA_ROUTING=ON \ + -DOT_DUA=ON \ + -DOT_BORDER_ROUTING_NAT64=ON \ + -DOTBR_DNSSD_DISCOVERY_PROXY=ON \ + -DOTBR_INFRA_IF_NAME=eth0 \ + -DOTBR_NO_AUTO_ATTACH=1 \ + -DOT_REFERENCE_DEVICE=ON \ + -DOT_DHCP6_CLIENT=ON \ + -DOT_DHCP6_SERVER=ON \ + " + +RDEPENDS:${PN} = "iproute2 avahi-daemon" + +RCONFLICTS:${PN} = "ot-daemon" + +FILES:${PN} += "${systemd_unitdir}/*" +FILES:${PN} += "${datadir}/*" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb new file mode 100644 index 0000000000..f3f4c70fa2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb @@ -0,0 +1,27 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "OpenThread Daemon is an OpenThread POSIX build mode that runs OpenThread as a service." +SECTION = "net" +LICENSE = "BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + file://third_party/mbedtls/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + " +DEPENDS = "readline" +SRCREV = "7dfde1f12923f03c9680be4d838b94b7a2320324" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ + " + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DOT_DAEMON=ON \ + -DOT_SPINEL_RESET_CONNECTION=ON \ + -DOT_THREAD_VERSION=1.2 \ + -DOT_COVERAGE=OFF \ + -DOT_PLATFORM=posix \ + -DCMAKE_BUILD_TYPE=Release \ + " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb new file mode 100644 index 0000000000..bb444d04f5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -0,0 +1,32 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 +SUMMARY = "wpantund, Userspace WPAN Network Daemon" +SECTION = "net" +LICENSE = "Apache-2.0 & MIT & BSL-1.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ + file://third_party/assert-macros/LICENSE;md5=cbf35ecdc8161026afe4da2906fab204 \ + file://third_party/boost/LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ + file://third_party/fgetln/LICENSE;md5=389e03d2254ecad45d0d9bbdefef7129 \ + file://third_party/openthread/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ + file://third_party/pt/LICENSE;md5=dcd598b69cad786beea33da7b1ae14b7 \ + " +DEPENDS = "autoconf-archive dbus readline" +SRCREV = "0fb1f57e4224e2df3e630e146702bfcf63fbf07a" +PV = "0.07.01+git${SRCPV}" + +SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=master \ + " + +S = "${WORKDIR}/git" + +inherit pkgconfig perlnative autotools + +# CVE-2020-8916 has been fixed in commit +# 3f108441e23e033b936e85be5b6877dd0a1fbf1c which is included in the SRCREV +# CVE-2021-33889 has been fixed in commit +# a8f3f761f6753b567d1e5ad22cbe6b0ceb6f2649 which is included in the SRCREV +# There has not been a wpantund release as of yet that includes these fixes. +# That means cve-check can not match them. Once a new release comes we can +# remove the ignore statement. +CVE_CHECK_IGNORE = "CVE-2020-8916 CVE-2021-33889" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 5e128727d5..d976680e3b 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,4 +1,4 @@ -From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 +From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 5 Sep 2019 18:57:39 +0800 Subject: [PATCH] drbd-utils: support usrmerge @@ -6,18 +6,19 @@ Subject: [PATCH] drbd-utils: support usrmerge Upstream-Status: Inappropriate[oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- configure.ac | 2 +- - scripts/Makefile.in | 4 ++-- + scripts/Makefile.in | 10 +++++----- user/v83/Makefile.in | 14 +++++++------- user/v84/Makefile.in | 14 +++++++------- - 4 files changed, 17 insertions(+), 17 deletions(-) + 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac -index 4df1b4d..c4ef1bc 100644 +index ae575586..3d7deeae 100644 --- a/configure.ac +++ b/configure.ac -@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -27,22 +28,28 @@ index 4df1b4d..c4ef1bc 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index fbb0beb..da701a1 100644 +index fcd298e9..2521fb08 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in -@@ -75,8 +75,8 @@ endif - ifeq ($(subst both,systemd,$(initscripttype)),systemd) +@@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) install -d $(DESTDIR)$(systemdunitdir) install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ -- install -d $(DESTDIR)/lib/drbd/ -- install -m 755 drbd $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd -+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd + install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ +- install -d $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts +- install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts ++ install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts ++ install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts install -d $(DESTDIR)$(tmpfilesdir)/ install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf endif diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in -index 27516de..b301376 100644 +index 08cfe574..4c4971b6 100644 --- a/user/v83/Makefile.in +++ b/user/v83/Makefile.in @@ -96,19 +96,19 @@ install: @@ -73,10 +80,10 @@ index 27516de..b301376 100644 .PHONY: install uninstall clean distclean ../../configure: diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in -index 38977c6..05ef060 100644 +index 0fcefc5f..81f7d5ec 100644 --- a/user/v84/Makefile.in +++ b/user/v84/Makefile.in -@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) +@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) install -d $(DESTDIR)$(localstatedir)/lib/drbd install -d $(DESTDIR)$(localstatedir)/run/drbd install -d $(DESTDIR)$(localstatedir)/lock @@ -104,5 +111,5 @@ index 38977c6..05ef060 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ -- -2.7.4 +2.33.0 diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch new file mode 100644 index 0000000000..354be0ff18 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch @@ -0,0 +1,29 @@ +From a61b9ff2d2cb7387a5cd347b2201535ee45a46ee Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Thu, 31 Mar 2022 15:09:58 -0400 +Subject: [PATCH] drbdmon: add LDFLAGS when linking + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + user/drbdmon/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/user/drbdmon/Makefile.in ++++ b/user/drbdmon/Makefile.in +@@ -1,6 +1,6 @@ + CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror -pedantic-errors -fPIC -O2 \ + -Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \ +--Wmissing-declarations -Wshadow ++-Wmissing-declarations -Wshadow -Wno-defaulted-function-deleted -Wno-unused-private-field + CXX = @CXX@ + LIBS = @LIBS@ + +@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)) + $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h + + drbdmon: $(ls-obj) +- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) ++ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) + + # do not try to rebuild Makefile itself + Makefile: ; diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch deleted file mode 100644 index 6702f3bde4..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Aug 2020 12:59:38 -0700 -Subject: [PATCH] v84: Make setup_options definitions as extern - -This is already defined in drbdadm_main.c, therefore make this -declaration to be extern for other modules - -Fixes compatibility with gcc-10 which uses -fno-common by default - -Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - user/v84/drbdadm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h -index ed63d78c..8469f1c4 100644 ---- a/user/v84/drbdadm.h -+++ b/user/v84/drbdadm.h -@@ -251,7 +251,7 @@ struct setup_option { - bool explicit; - char *option; - }; --struct setup_option *setup_options; -+extern struct setup_option *setup_options; - - extern void add_setup_option(bool explicit, char *option); - --- -2.28.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb index a246464b29..640e4e7858 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb @@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ - file://0001-v84-Make-setup_options-definitions-as-extern.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ " -SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" -SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" +SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" +SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" SRCREV_FORMAT = "drbd-utils_drbd-headers" @@ -56,7 +56,10 @@ RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module FILES:${PN} += "/run" FILES:${PN} += "${nonarch_base_libdir}/drbd \ ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d" + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/drbdscripts/* \ + ${systemd_unitdir}/system/* \ +" FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.30.bb index 72479ce503..f97a1b899d 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.30.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA:armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "9b46661c289d01dbfe5182189a7abea9ce2f9e04" +SRCREV = "a3e48f483db27d20e02cbd81e3a8f18c6c5c50f5" SRC_URI = "git://git.kernel.dk/fio.git;branch=master \ " diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch new file mode 100644 index 0000000000..486d6c07be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch @@ -0,0 +1,60 @@ +From b06d16ec2d4aefc4cf1675e9dd6314956bc32d69 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Thu, 7 Apr 2022 14:36:58 +0800 +Subject: [PATCH] build: set HAVE_STATEMENT_EXPR var + +The v73 version tries to build and run a test program at compile +time to check whether compiler supports sizeof and expression statements +and sets HAVE_STATEMENT_EXPR accordingly. This requires EXEWRAPPER_ENABLED +in meson.bbclass to be True and qemu-usermode to be working. + +In cases when EXEWRAPPER_ENABLED is False, build fails with error: + +| ../git/meson.build:213:0: ERROR: Can not run test applications in +this cross environment. + +We don't really need to do this as these have been supported since gcc3 and can set the configs to 1. + +The autotools implementation also used to set it to 1 so this doesn't change anything: + +https://github.com/pmem/ndctl/blob/v72.1/configure.ac#L70 + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + meson.build | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/meson.build b/meson.build +index 42e11aa..e8d218b 100644 +--- a/meson.build ++++ b/meson.build +@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', get_option('destructive').enabled()) + conf.set('ENABLE_LOGGING', get_option('logging').enabled()) + conf.set('ENABLE_DEBUG', get_option('dbg').enabled()) + +-typeof = cc.run(''' +- int main() { +- struct { +- char a[16]; +- } x; +- typeof(x) y; +- +- return sizeof(x) == sizeof(y); +- } +- ''' +-) +- +-if typeof.compiled() and typeof.returncode() == 1 +- conf.set('HAVE_TYPEOF', 1) +- conf.set('HAVE_STATEMENT_EXPR', 1) +-endif ++conf.set('HAVE_TYPEOF', 1) ++conf.set('HAVE_STATEMENT_EXPR', 1) + + if target_machine.endian() == 'big' + conf.set('HAVE_BIG_ENDIAN', 1) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb index c88d392970..da649d578b 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb @@ -13,7 +13,8 @@ inherit meson pkgconfig bash-completion systemd SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5" SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ file://0001-util-Correct-path-to-iniparser.h.patch \ - file://0001-meson-Use-pkg-config-to-detect-iniparser.patch" + file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \ + file://0001-build-set-HAVE_STATEMENT_EXPR-var.patch" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)" 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 08d9e91704..bc3d4fefeb 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 @@ -948,8 +948,8 @@ RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl" RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools" RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "libcereal ssiapi tbb" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220410.0.bb index 504cc24325..96be4e3ffd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220410.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "a668cb155609d5a322963e1ed9a0c0147c8be597" +SRCREV = "c4e384715bfa95c7eaf0de99ce2498d54bed182e" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch new file mode 100644 index 0000000000..679bd38829 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch @@ -0,0 +1,93 @@ +From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001 +From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> +Date: Tue, 18 Feb 2020 14:17:07 +0100 +Subject: [PATCH] cmake: add separate export for plugin targets + +Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] + + +--- + CMakeLists.txt | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efdaf8936d..6608b1b00c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_node_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_php_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_python_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) + DESTINATION ${gRPC_INSTALL_CMAKEDIR} + NAMESPACE gRPC:: + ) ++ install(EXPORT gRPCPluginTargets ++ DESTINATION ${gRPC_INSTALL_CMAKEDIR} ++ NAMESPACE gRPC:: ++ ) + endif() + + include(CMakePackageConfigHelpers) +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch deleted file mode 100644 index d9cfa009f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 50d54458324c1a19eefb9968e4cb556dbd34b875 Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov <uvv.mail@gmail.com> -Date: Tue, 12 Oct 2021 19:11:40 +0200 -Subject: [PATCH] cmake: revert db88fb0ee826e73323e06ac6166ac038ee71f6a - (#27626) - -Fix regression introduced by previous commit. Original problem that -commit was trying to fix was solved by modification of grpc recipe in -meta-openembedded project repository - -Fixes #26857 - -Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com> ---- - CMakeLists.txt | 16 ++++++++-------- - templates/CMakeLists.txt.template | 2 -- - 2 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e8fbdee8b..02cd48bee4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3828,7 +3828,7 @@ foreach(_hdr - endforeach() - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_plugin_support EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11679,7 +11679,7 @@ target_link_libraries(grpc_cpp_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11718,7 +11718,7 @@ target_link_libraries(grpc_csharp_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11757,7 +11757,7 @@ target_link_libraries(grpc_node_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_node_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11796,7 +11796,7 @@ target_link_libraries(grpc_objective_c_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11835,7 +11835,7 @@ target_link_libraries(grpc_php_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_php_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11874,7 +11874,7 @@ target_link_libraries(grpc_python_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_python_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11913,7 +11913,7 @@ target_link_libraries(grpc_ruby_plugin - - - --if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) -+if(gRPC_INSTALL) - install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 0f0883e09c..b9a5bc4144 100644 ---- a/templates/CMakeLists.txt.template -+++ b/templates/CMakeLists.txt.template -@@ -695,8 +695,6 @@ - # grpcpp_channelz doesn't build with protobuf-lite, so no install required - # See https://github.com/grpc/grpc/issues/22826 - if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE) -- % elif tgt.build == 'protoc': -- if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING) - % else: - if(gRPC_INSTALL) - % endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch deleted file mode 100644 index faa18bb7f7..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9af185be6068d279736c0d2b2162a4e768444d3d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 29 May 2021 00:41:32 -0700 -Subject: [PATCH] gsec: Fix build on musl - -musl defines iovec struct in alltypes.h file which is included by many -system include files, therefore check for appropriate define from musl -before defining it again - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/core/tsi/alts/crypt/gsec.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h -index 4d65caa944..3c367b2895 100644 ---- a/src/core/tsi/alts/crypt/gsec.h -+++ b/src/core/tsi/alts/crypt/gsec.h -@@ -26,11 +26,14 @@ - #include <stdlib.h> - - #include <grpc/grpc.h> -+#include <sys/uio.h> - -+#if !defined(__DEFINED_struct_iovec) - struct iovec { - void* iov_base; - size_t iov_len; - }; -+#endif - - /** - * A gsec interface for AEAD encryption schemes. The API is thread-compatible. --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb index 872bc6afcb..48d0f58e20 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb @@ -20,10 +20,11 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806" +SRCREV_grpc = "b39ffcc425ea990a537f98ec6fe6a1dcb90470d7" BRANCH = "v1.45.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ + file://0001-cmake-add-separate-export-for-plugin-targets.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS:append:class-native = " -Wl,--no-as-needed" @@ -58,30 +59,8 @@ do_configure:prepend() { sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt } -do_configure:prepend:mipsarch() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:powerpc() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv64() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv32() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:toolchain-clang:x86() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - BBCLASSEXTEND = "native nativesdk" -SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" - FILES:${PN}-compiler += " \ ${bindir} \ ${libdir}/libgrpc_plugin_support${SOLIBS} \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb index a7ff84fad7..a5b00ece8a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb @@ -34,6 +34,10 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd" +# Note: Qt5Help is required for gui -> qttools(-native) must be build with +# clang in PACKAGECONFIG +PACKAGECONFIG[gui] = "--with-qt=yes,--with-qt=no,qttools-native qttools qtbase" + EXTRA_OECONF = " \ --disable-java \ --disable-docs \ diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb index 85e5072716..8aa8767d37 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb @@ -4,7 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=e13dd32663e3159031608d536530a080" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=62c37a10a2faf90235ee64280ad72737" require byacc.inc -SRC_URI[sha256sum] = "7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8" +SRC_URI[sha256sum] = "42c1805cc529314e6a76326fe1b33e80c70862a44b01474da362e2f7db2d749c" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index 087b69faae..7343a08c7d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -45,7 +45,8 @@ PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},-- EXTRA_OECONF = " \ --with-readline=${STAGING_LIBDIR}/.. \ - -disable-wxwidgets \ + --disable-wxwidgets \ + --without-libcerf \ " do_compile:prepend() { diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb index 25007c7773..069fdf7bc2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb @@ -8,7 +8,7 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.17 -SRCREV = "1ff76272aba9803501e6f473dd5083f0e09289ac" +SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2" SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb index 8f41769e02..2817be7c86 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb @@ -21,10 +21,9 @@ COMPATIBLE_HOST:armv5 = "null" COMPATIBLE_HOST:riscv64 = "null" # Main dependencies -inherit cmake pkgconfig lib_package binconfig-disabled ptest +inherit cmake pkgconfig lib_package ptest DEPENDS = "libpcre2" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" -BINCONFIG = "${bindir}/pcre2-config" # Ptest dependencies RDEPENDS:${PN}-ptest += "valgrind" diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch new file mode 100644 index 0000000000..7ce206d263 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch @@ -0,0 +1,56 @@ +It sets 'libdir' with path element 'lib' directly which is not suitable for +multilib. Add an option '--baselib' for wx-config to support multilib when +cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}". + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + build/cmake/config.cmake | 2 +- + wx-config.in | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 52ae69d3f6..28aa733eb0 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -86,7 +86,7 @@ function(wx_write_config) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(includedir "\${prefix}/include") +- set(libdir "\${exec_prefix}/lib") ++ set(libdir "\${exec_prefix}/\${baselib}") + set(bindir "\${exec_prefix}/bin") + + find_program(EGREP egrep) +diff --git a/wx-config.in b/wx-config.in +index e3f7d115bb..0e78af03c7 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -42,7 +42,8 @@ usage() + { + cat 1>&2 <<EOF + +- wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full] ++ wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]][--baselib=DIR] ++ [--release] [--version-full] + [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT] + [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]] + [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR] +@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix + + # Options that permit the user to supply hints that may affect the output. + # These options all accept arbitrary values, to interpret as they please. +-wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema" ++wxconfig_input_options="prefix exec_prefix baselib utility $wxconfig_schema" + + # Input options that accept only a yes or no argument. + # +@@ -404,6 +405,7 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + # Determine the base directories we require. + prefix=${input_option_prefix-${this_prefix:-@prefix@}} + exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} ++baselib=${input_option_baselib:-lib@wxPLATFORM_LIB_DIR@} + wxconfdir="@libdir@/wx/config" + + installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index e821430406..6b57cb54cb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -24,6 +24,7 @@ SRC_URI = " \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ file://not-append-system-name-to-lib-name.patch \ + file://wx-config-fix-libdir-for-multilib.patch \ " SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1" S = "${WORKDIR}/git" @@ -42,10 +43,11 @@ EXTRA_OECMAKE += " \ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " +EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +# OpenGL support currently seems tied to using libglu, which requires x11 +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ " PACKAGECONFIG:remove:class-native = "opengl" @@ -113,4 +115,6 @@ FILES:${PN}-dev += " \ ${libdir}/wx/config/ \ " +RDEPENDS:${PN}-dev += "grep" + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb index 88c6337613..12951e28c5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb @@ -10,7 +10,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8" +SRC_URI[sha256sum] = "7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb index e135b05c82..f45ea5e4a9 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb @@ -10,7 +10,7 @@ NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git;branch=master;protocol=https" -SRCREV = "1af1116f73782951bd7bbe2139928e497c3a634b" +SRCREV = "68a7a8a4f2c4bdd3425c23653a3b9b6609e41d0b" PE = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch deleted file mode 100644 index f3cd1015f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ce3ab6ba4b8176d100ac535a39e3d5b0c517989b Mon Sep 17 00:00:00 2001 -From: Jan Palus <atler@pld-linux.org> -Date: Fri, 15 Jan 2021 14:32:14 +0100 -Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR (#226) - -fixes build with autoconf 2.70 -Upstream-Status: Backport [https://github.com/libusb/hidapi/pull/226] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 220909a..77da67a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" - - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign -Wall -Werror]) --AC_CONFIG_MACRO_DIR([m4]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - LT_INIT --- -2.30.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index 1fef9789c5..1c57a1d83f 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -11,9 +11,7 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master \ - file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ -" -PV = "0.10.1" -SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef" +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" +PV = "0.11.2" +SRCREV = "31bde69a1f08c880ef1622f2586eea0daf3b0857" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.357.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.358.bb index 01ebf3c909..59513bbb9e 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.357.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.358.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "f9e7eed1b85760028a5157986b3313c99c4d0225" +SRCREV = "ae144d896eea90e527a57276accaf0da043c9f83" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index fb37de3c30..0bb06c1d1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -27,6 +27,7 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig ptest LIBATOMIC:mips:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," @@ -43,3 +44,7 @@ ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc64 only supports 128bit long double +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:powerpc = "null" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch new file mode 100644 index 0000000000..5b2e14b7b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch @@ -0,0 +1,31 @@ +From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Apr 2022 20:15:03 -0700 +Subject: [PATCH] tests: Include missing sys/socket.h header + +Helps define +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/regression/client/client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c +index e72b661..e0b3453 100644 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index d9e0e1caa2..115a6968eb 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -7,6 +7,7 @@ DEPENDS = "libgcrypt libgpg-error" SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://fix_qa-issue_include.patch \ file://sepbuild.patch \ + file://0001-tests-Include-missing-sys-socket.h-header.patch \ " SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index ff8191eff6..869c2c86b6 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -9,7 +9,7 @@ PV = "1.11.0+git${SRCPV}" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" +SRCREV = "9e712372214d75bb30ec2847a44bf124d48096f3" SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake @@ -26,5 +26,5 @@ do_configure:prepend() { # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 # there isn't python in HOSTTOOLS so "env python" fails - sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/scripts/*py ${S}/googlemock/scripts/generator/*py ${S}/googlemock/scripts/generator/cpp/*py ${S}/googlemock/test/*py ${S}/googletest/scripts/*py ${S}/googletest/test/*py + sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.11.1.bb index ba89e9db33..3037ea83c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.11.1.bb @@ -1,9 +1,9 @@ SUMMARY = "Screen-scraping library" HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=15a76c7c51ecfc5c094d04f3ccd41a09" -SRC_URI[sha256sum] = "c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891" +SRC_URI[sha256sum] = "ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.21.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.22.0.bb index a154bfba49..088931d148 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.21.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.22.0.bb @@ -2,9 +2,9 @@ SUMMARY = "The bidirectional mapping library for Python." DESCRIPTION = "The bidirectional mapping library for Python." HOMEPAGE = "https://bidict.readthedocs.io/" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=858e74278ef3830d46481172ae03c819" -SRC_URI[sha256sum] = "42c84ffbe6f8de898af6073b4be9ea7ccedcd78d3474aa844c54e49d5a079f6f" +SRC_URI[sha256sum] = "5c826b3e15e97cc6e615de295756847c282a79b79c5430d3bfc909b1ac9f5bd8" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb index 4fe7bcbff0..2cd2e624b9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_3.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb @@ -3,8 +3,7 @@ SECTION = "devel/python" LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI[md5sum] = "305075968c56bd85130b19d86e9e505d" -SRC_URI[sha256sum] = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449" +SRC_URI[sha256sum] = "59d92846ffb981e634e9e0f2d14a6b4967a875e3869bd2ba168c92c4db6b8b5d" PYPI_PACKAGE="python-can" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb index b84b46164c..f86f571938 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://cppy.readthedocs.io/en/latest/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371" -SRC_URI[sha256sum] = "83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b" +SRC_URI[sha256sum] = "95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc" RDEPENDS:${PN} += "python3-setuptools python3-distutils" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb index ed55077e3f..e882952ac2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "5b6801b3be94d48d213beb7b8ebad96addb35c95fc6a9c062c80e033b4a32fe8" +SRC_URI[sha256sum] = "3a27aaf3399929fccda013899cb76d3ff111734abf4281e5f9d3721ba0b9ffa3" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.0.bb index b03929104d..dd295cf2dd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.0.bb @@ -6,8 +6,7 @@ HOMEPAGE = " https://github.com/maxcountryman/flask-login" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8aa87a1cd9fa41d969ad32cfdac2c596" -SRC_URI[md5sum] = "a2d94aa6ae935345ebc68eb3cbb5fccd" -SRC_URI[sha256sum] = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b" +SRC_URI[sha256sum] = "aa84fcfb4c3cf09ca58c08e816b7bce73f1349ba1cf13d00d8dffc5872d5fcf6" PYPI_PACKAGE = "Flask-Login" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.1.1.bb index 4070fc0128..24a7047703 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.1.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d" +SRC_URI[sha256sum] = "a8c9bd3e558ec99646d177a9739c41df1ded0629480b4c8d2975412f3c9519c8" PYPI_PACKAGE = "Flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_5.1.bb index 27ae198139..995f3b779b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_5.1.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=08208c66520e8d69d5367483186d94ed" SRC_URI = "git://github.com/gcovr/gcovr.git;branch=master;protocol=https" -SRCREV = "2b50284e8a6792b4ddcba14e2050c5c05f15deb6" +SRCREV = "e71e883521b78122c49016eb4e510e6da06c6916" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.7.1.bb index c43fa4c58e..55884e99c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.7.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "c8889f45cf58deca522888ae1d39b2a25e93e7d1b019ae8cee6456d5c726a40c" +SRC_URI[sha256sum] = "b0fa577e512f0c8e063386b974718b8614586a798c5894ed34bedf256d9dae24" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.3.bb index 9d192c15ee..ee5311f4fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "2800f6dfad29c6ced5faf9ca0c38ea8ba1ebe2559b10c029bd021e3de3301627" +SRC_URI[sha256sum] = "d65bb0e3701eaaa64fd2aa85e1325580524b0bddc6dc5db3ab89c481b6a20141" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.44.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.45.0.bb index 1b219fc950..1e919dd3af 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.44.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.45.0.bb @@ -10,7 +10,7 @@ inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI[sha256sum] = "be37f458ea510c9a8f1caabbc2b258d12e55d189a567f5edcace90f27dc0efbf" +SRC_URI[sha256sum] = "a016cfc21e0d91b3b036d3d4f968d1fdea865dfa03524cb1fbeca84719fd45a2" RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.30.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.2.0.bb index 6b829811f8..35af7dd4d8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.30.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.2.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97" +SRC_URI[sha256sum] = "70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb index c395143cc9..f454d6462e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_0.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4" -SRC_URI[md5sum] = "65bdcb5fa5bcf1cc710ffa508e78e408" -SRC_URI[sha256sum] = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9" +SRC_URI[sha256sum] = "a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.910.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.942.bb index 5dd717ae7d..5b4b6d5ba3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.910.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.942.bb @@ -1,13 +1,13 @@ SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" HOMEPAGE = "https://github.com/python/mypy" LICENSE = "MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=17b7180fcfc43c4e70c07c71588604c4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba8ec528da02073b7e1f4124c0f836f" PYPI_PACKAGE = "mypy" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "704098302473cb31a218f1775a873b376b30b4c18229421e9e9dc8916fd16150" +SRC_URI[sha256sum] = "17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.19.1.bb index f555144f45..e1c471e064 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.19.1.bb @@ -10,7 +10,7 @@ PYPI_PACKAGE := "Pint" inherit pypi ptest python_setuptools_build_meta -SRC_URI[sha256sum] = "8c4bce884c269051feb7abc69dbfd18403c0c764abc83da132e8a7222f8ba801" +SRC_URI[sha256sum] = "3e5913e4ad125f672f72e19e06a8cb1f6d36a4922b6e5a49e04ff882511f82c8" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_22.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_22.3.2.bb index 9a5b9f948c..c13c677899 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_22.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_22.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[sha256sum] = "f28fe4b881dd2cc144d2d94f83ec60d8c59a52642a0ad3635cc4d0f8406f4858" +SRC_URI[sha256sum] = "cc174e1ceebd4e6222c5b78f4f415f12e80753c9ab75ab354159b4cb5950b084" RDEPENDS:${PN} += " \ libpulse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.1.bb index c9b3b71873..407c264845 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.1.bb @@ -9,10 +9,10 @@ HOMEPAGE = "http://pycurl.io/" LICENSE = "LGPL-2.0-only | MIT" LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING-MIT;md5=75f131c591546fd1277ca49c9a81ab1b \ + file://COPYING-MIT;md5=be42e1b1e58c8d59c2901fd747bfc55d \ " -SRC_URI[sha256sum] = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8" +SRC_URI[sha256sum] = "a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a" DEPENDS = "curl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.1.0.bb index 6189730b34..d47dfec50f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.1.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "3364b5c153b0de15c39cd13c5ee73a473f7337eb2d9610711f50f14a3a611413" +SRC_URI[sha256sum] = "dbba77bc0b706c7ee496fc75a6c6ed406d85f6091d5fec488a8944c3828e6462" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.1.bb index 7826d89ad0..724bbd7f73 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.1.bb @@ -9,7 +9,7 @@ LICENSE = "0BSD & MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "55f6532fd6d62b3b698d604257f7a7eda6a87557bbec22760f8c0d9549454802" +SRC_URI[sha256sum] = "c8cfa9983503f31b301f4b0bec0a8f41518f9a3a3853471ce94f9f9dc770a3e2" inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "PyScaffold" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb index 024650e9b3..00e73f5bd8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=440a4cdb311cd7ad181efb4cba06d562" -SRC_URI[sha256sum] = "183524e3db4e2a1fea92e0ca3662a624ba44c9f3568da15679d7535ba6838a6a" +SRC_URI[sha256sum] = "792038247e0021beb966a7ea6e3a70ff5fcfba77eb72c6ec8fd6287af871c35b" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.15.bb index c71394cb38..9633385f60 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.15.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b" +SRC_URI[sha256sum] = "0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.10.1.bb index 92018698e7..d8ac23dd5e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.10.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/sympy/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=42976c55ba05d15b32a7b4757dee5e64" -SRC_URI[sha256sum] = "c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc" +SRC_URI[sha256sum] = "5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.64.0.bb index 0fcd4d4575..3cb45f1a6e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.64.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" -SRC_URI[sha256sum] = "4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d" +SRC_URI[sha256sum] = "40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.8.0.bb index 2305e89afe..247b4e5840 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.8.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Python module to support twitter API" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[sha256sum] = "8d4b4520271b796fa7efc4c5d5ef3228af4d79f6a4d3ace3900b2778ed8f6f1c" +SRC_URI[sha256sum] = "8ba5774ac1663b09e5fce1b030daf076f2c9b3ddbf2e7e7ea0bae762e3b1fe3e" PYPI_PACKAGE = "tweepy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.10.0.bb index d720dd3341..84050dc329 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.10.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" -SRC_URI[sha256sum] = "fa4e22a708f08d15f605c9191e2500149ba1a848fff7fa4904c2f2c57dc1087f" +SRC_URI[sha256sum] = "be1eedce6a4b911fd3a7f4060d0811951820a13410e61f0454b30e9f4e7cf197" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.4.bb index bc06618c1e..d305f2b831 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3bb705b228ea4a14ea2728215b780d80" -SRC_URI[sha256sum] = "10c501b25d8881b656e56c34674d98fe6bc752240a572e74f918bc849c93ba9c" +SRC_URI[sha256sum] = "080c540ea4b8b9defa9f3ac05823c1725ea2c8aacda917bfc0193f6758b95aeb" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb index dcb373a1f3..3583acc9cd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.1.1.bb @@ -4,10 +4,6 @@ HOMEPAGE = "http://www.wxpython.org" LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce1d18e2d633d41786c0a8dfbc80917" -inherit features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'no_gui', '', 'x11', d)}" - DEPENDS = "wxwidgets-native wxwidgets" PYPI_PACKAGE = "wxPython" @@ -20,9 +16,11 @@ SRC_URI[sha256sum] = "00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b S = "${WORKDIR}/wxPython-${PV}" -inherit pypi setuptools3 pkgconfig +inherit pypi setuptools3 pkgconfig features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR}'" +export WX_CONFIG = "'${RECIPE_SYSROOT_NATIVE}${bindir}/wx-config --prefix=${STAGING_EXECPREFIXDIR} --baselib=${baselib}'" RDEPENDS:${PN} = "\ python3-difflib \ diff --git a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.4.0.bb index 2d23017c88..e3b55a7eab 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.4.0.bb @@ -4,8 +4,7 @@ LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9273424c73af966635d66eb53487e14" -SRC_URI[md5sum] = "bd4908d035464aa440dd7f262ef78345" -SRC_URI[sha256sum] = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f" +SRC_URI[sha256sum] = "a648ad761b8ea27370cb5915350122cd807b820d2193ed5c9cc28f163df637f4" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.4.1.bb index 676c654b52..210d64320e 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.4.1.bb @@ -16,7 +16,7 @@ HOMEPAGE = "http://pywbem.github.io" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SRC_URI[sha256sum] = "5df0af28f81891a3914a12f3a30b11b1981f7b30e09c5a42c011797e7fce9b6a" +SRC_URI[sha256sum] = "ad8bbbe4ab7e795722c0f27f2656c92fc673a7e06a14cd151a50f0306454d17e" inherit pypi setuptools3 update-alternatives diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.6.0.bb index e18621d813..0c796534ab 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.6.0.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "4db780178e529391d53da180e49386904e69a5a33b3bd5185835d0a7e6ff5ac5" +SRC_URI[sha256sum] = "ad0ff05d88ba393b7c8922f8233edd33fc0a4e8b000b61de1f8f3a10c5ae5324" FILES:${PN} += "${datadir}/xfce4/eyes" |