diff options
Diffstat (limited to 'meta-openembedded')
170 files changed, 1158 insertions, 626 deletions
diff --git a/meta-openembedded/contrib/oe-stylize.py b/meta-openembedded/contrib/oe-stylize.py index 30b460e12a..1fb0a5bcc0 100755 --- a/meta-openembedded/contrib/oe-stylize.py +++ b/meta-openembedded/contrib/oe-stylize.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """\ Sanitize a bitbake file following the OpenEmbedded style guidelines, @@ -436,8 +436,8 @@ if __name__ == "__main__": # -- dump the sanitized .bb file -- addEmptyLine = False # write comments that are not related to variables nor routines - for l in commentBloc: - olines.append(l) + for c in commentBloc: + olines.append(c) # write variables and routines previourVarPrefix = "unknown" for k in OE_vars: @@ -446,8 +446,8 @@ if __name__ == "__main__": if seen_vars[k] != []: if addEmptyLine and not k.startswith(previourVarPrefix): olines.append("") - for l in seen_vars[k]: - olines.append(l) + for s in seen_vars[k]: + olines.append(s) previourVarPrefix = k.split('_')[0] == '' and "unknown" or k.split('_')[0] for line in olines: print(line) diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch new file mode 100644 index 0000000000..f1cfab4daf --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch @@ -0,0 +1,46 @@ +From 1f9a5cb860b3509791e59a8cae9d5f265e832ed0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 28 May 2023 16:33:15 -0700 +Subject: [PATCH] fs-tests/cmd/readmmap: Replace uint_t with uint32_t + +Makes it portable across glibc and musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/zfs-tests/cmd/readmmap.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/zfs-tests/cmd/readmmap.c b/tests/zfs-tests/cmd/readmmap.c +index 704ffd55c8..a2590e0e8d 100644 +--- a/tests/zfs-tests/cmd/readmmap.c ++++ b/tests/zfs-tests/cmd/readmmap.c +@@ -38,6 +38,7 @@ + * 0 : no errors + * -------------------------------------------------------------- + */ ++#include <stdint.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> +@@ -55,7 +56,7 @@ main(int argc, char **argv) + char *buf = NULL; + char *map = NULL; + int fd = -1, bytes, retval = 0; +- uint_t seed; ++ uint32_t seed; + + if (argc < 2 || optind == argc) { + (void) fprintf(stderr, +@@ -92,7 +93,7 @@ main(int argc, char **argv) + retval = 1; + goto end; + } +- seed = (uint_t)time(NULL); ++ seed = (uint32_t)time(NULL); + srandom(seed); + + idx = random() % size; +-- +2.40.1 + diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch new file mode 100644 index 0000000000..bcca56347c --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs/aaf28a4630af60496c9d33db1d06a7d7d8983422.patch @@ -0,0 +1,67 @@ +From aaf28a4630af60496c9d33db1d06a7d7d8983422 Mon Sep 17 00:00:00 2001 +From: Sebastian Gottschall <s.gottschall@dd-wrt.com> +Date: Tue, 23 May 2023 13:50:24 +0600 +Subject: [PATCH] fixes broken aarch64 inline assembly for gcc 13.1 + +fixes the following error + +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:549:24: error: the register specified for 'w7' is not general enough to be used as a register variable + 549 | register unsigned char w7 asm("v7") __attribute__((vector_size(16))); + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:193:9: note: in expansion of macro 'GEN_X_DEFINE_6_7' + 193 | GEN_X_DEFINE_6_7() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + | ^~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:551:24: error: the register specified for 'w8' is not general enough to be used as a register variable + 551 | register unsigned char w8 asm("v8") __attribute__((vector_size(16))); \ + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:194:9: note: in expansion of macro 'GEN_X_DEFINE_8_9' + 194 | GEN_X_DEFINE_8_9() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + | ^~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neon_common.h:552:24: error: the register specified for 'w9' is not general enough to be used as a register variable + 552 | register unsigned char w9 asm("v9") __attribute__((vector_size(16))); + | ^~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_aarch64_neonx2.c:194:9: note: in expansion of macro 'GEN_X_DEFINE_8_9' + 194 | GEN_X_DEFINE_8_9() \ + | ^~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/imx8qm_var_som-yoe-linux/zfs/2.1.9-r0/build/../zfs-2.1.9/module/zfs/vdev_raidz_math_impl.h:1360:9: note: in expansion of macro 'REC_PQR_DEFINE' + 1360 | REC_PQR_DEFINE(); + +Upstream-Status: Pending [https://github.com/BrainSlayer/zfs/commit/aaf28a4630af60496c9d33db1d06a7d7d8983422] +Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + module/Kbuild.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/module/Kbuild.in ++++ b/module/Kbuild.in +@@ -57,9 +57,9 @@ asflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_ + ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) + + ifeq ($(CONFIG_ARM64),y) +-CFLAGS_REMOVE_zcommon/zfs_fletcher_aarch64_neon.o += -mgeneral-regs-only +-CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neon.o += -mgeneral-regs-only +-CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neonx2.o += -mgeneral-regs-only ++CFLAGS_REMOVE_zcommon/zfs_fletcher_aarch64_neon.o = -mgeneral-regs-only ++CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neon.o = -mgeneral-regs-only ++CFLAGS_REMOVE_zfs/vdev_raidz_math_aarch64_neonx2.o = -mgeneral-regs-only + endif + + # Suppress unused-value warnings in sparc64 architecture headers +--- a/META ++++ b/META +@@ -1,7 +1,7 @@ + Meta: 1 + Name: zfs + Branch: 1.0 +-Version: 2.1.99 ++Version: 2.1.11 + Release: 1 + Release-Tags: relext + License: CDDL diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.9.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.11.bb index 573561db25..bd463b8acc 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.9.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.1.11.bb @@ -4,10 +4,14 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE ="https://github.com/openzfs/zfs" -SRC_URI = "https://github.com/openzfs/zfs/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ +SRCREV = "0f03a411615a797425de488eecfaaf63fc41acfe" +SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=master \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ + file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ + file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \ " -SRC_URI[sha256sum] = "6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6" + +S = "${WORKDIR}/git" # Using both 'module' and 'autotools' classes seems a bit odd, they both # define a do_compile function. diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch deleted file mode 100644 index 26d75780b2..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d00edda1f57f904e1590828bea3cedb53d789c48 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 24 May 2023 20:33:59 -0700 -Subject: [PATCH] Replace filename with basename - -This avoids emitting absolute paths into generated sourcecode, it -improves reproducibility. See [1] - -[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/eog/-/merge_requests/154] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/eog-enum-types.c.template | 4 ++-- - src/eog-enum-types.h.template | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/eog-enum-types.c.template b/src/eog-enum-types.c.template -index 0249baf..1013dcf 100644 ---- a/src/eog-enum-types.c.template -+++ b/src/eog-enum-types.c.template -@@ -4,8 +4,8 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ --#include "@filename@" -+/* enumerations from "@basename@" */ -+#include "@basename@" - - /*** END file-production ***/ - -diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template -index bc3c195..8f4e916 100644 ---- a/src/eog-enum-types.h.template -+++ b/src/eog-enum-types.h.template -@@ -8,7 +8,7 @@ G_BEGIN_DECLS - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* Enumerations from "@filename@" */ -+/* Enumerations from "@basename@" */ - - /*** END file-production ***/ - --- -2.40.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_44.2.bb index 0b7cfca49b..110e73fd43 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_44.2.bb @@ -22,8 +22,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" -SRC_URI += "file://0001-Replace-filename-with-basename.patch" -SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab" +SRC_URI[archive.sha256sum] = "468f539f6b67ee46188170f244480cc311dd1efe4786fe1554bffe26a65c72c4" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 59d3b5a294..5452a2e793 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "5ce62c1e67f2789342a7f4a035b102f74e62ed85f60e81a5b7f3e04165404dff" -PV = "3.48.1" +SRC_URI[archive.sha256sum] = "b71e412e52f567c83394b5926df92b4f4f6d2cddebad384a517c720671fad996" +PV = "3.48.3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 11ad30eda6..5c0eee5764 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -28,10 +28,10 @@ index dbca723..af0f871 100644 option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 3634c47..459ccfe 100644 +index 69af0cfea..6edcaa5ff 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -25,7 +25,7 @@ common_sources = [] +@@ -19,7 +19,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( @@ -40,5 +40,18 @@ index 3634c47..459ccfe 100644 'cc-background-item.h' ) +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 3b6f5e197..30b207882 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -45,7 +45,7 @@ sources = files( + + enums = 'gdesktop-enums-types' + enums_header = files( +- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'cc-datetime-panel.h' + ) + -- 2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb index a64c2410a5..b2c04c2f68 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb @@ -37,7 +37,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "7abd365018e28679def60a5ecd3049db0fb85de6da49a96dadd21fba8db002e7" +SRC_URI[archive.sha256sum] = "0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..9bb1d6bb59 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch @@ -0,0 +1,104 @@ +From c4a2951f8a75c4151f009e42b26639e4f456d5a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 May 2023 14:41:28 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/125] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/goa/goaenumtypes.c.template | 2 +- + src/goa/goaenumtypes.h.template | 2 +- + src/goabackend/goabackendenumtypes.c.template | 2 +- + src/goabackend/goabackendenumtypes.h.template | 2 +- + src/goaidentity/goaidentityenumtypes.c.in | 4 ++-- + src/goaidentity/goaidentityenumtypes.h.in | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/goa/goaenumtypes.c.template b/src/goa/goaenumtypes.c.template +index 3150fa71..c2bc4b0a 100644 +--- a/src/goa/goaenumtypes.c.template ++++ b/src/goa/goaenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goa/goaenumtypes.h.template b/src/goa/goaenumtypes.h.template +index 040428c3..14548cb4 100644 +--- a/src/goa/goaenumtypes.h.template ++++ b/src/goa/goaenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.c.template b/src/goabackend/goabackendenumtypes.c.template +index 6d2651da..05156bdd 100644 +--- a/src/goabackend/goabackendenumtypes.c.template ++++ b/src/goabackend/goabackendenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.h.template b/src/goabackend/goabackendenumtypes.h.template +index 7321076e..51ce84bd 100644 +--- a/src/goabackend/goabackendenumtypes.h.template ++++ b/src/goabackend/goabackendenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.c.in b/src/goaidentity/goaidentityenumtypes.c.in +index c0286907..8aad7ae4 100644 +--- a/src/goaidentity/goaidentityenumtypes.c.in ++++ b/src/goaidentity/goaidentityenumtypes.c.in +@@ -5,8 +5,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.h.in b/src/goaidentity/goaidentityenumtypes.h.in +index 35d4d5c5..8719282a 100644 +--- a/src/goaidentity/goaidentityenumtypes.h.in ++++ b/src/goaidentity/goaidentityenumtypes.h.in +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.40.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb index 948a738881..ca78fa0119 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -8,6 +8,7 @@ inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_c DEPENDS = "gdk-pixbuf dbus glib-2.0" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf" PACKAGECONFIG ?= "goabackend kerberos owncloud lastfm google windows_live" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.2.bb index f8f500afeb..09995e51e4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_44.2.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "0bfbe4394d267625154d08d01467bdbd99e8157512fc8df45d5c02ddb7551ca6" +SRC_URI[archive.sha256sum] = "55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_44.2.bb index 1060e916a3..9c25eda6f7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_44.2.bb @@ -25,7 +25,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "973aeafab42f06f934a0994fc84878958cdb4d2766a4c867a5ccdc547dd57056" +SRC_URI[archive.sha256sum] = "37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.bb index 65bef45da7..43fe7cc0e1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.bb @@ -27,7 +27,7 @@ def gnome_verdir(v): return oe.utils.trim_version(v, 1) SRC_URI += "file://0001-Replace-filename-with-basename.patch" -SRC_URI[archive.sha256sum] = "360802a595e3edbad962c8cea353b62baa8be407513b5162c89c933ca5387aa9" +SRC_URI[archive.sha256sum] = "274a065927596d8a8f09537adc91bae98297201dd47ec6ccd878111e0781d3e5" REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb index 8efbd39f74..52157cf9a8 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb @@ -6,18 +6,18 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "\ - https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ file://firewalld.init \ file://run-ptest \ " -SRC_URI[sha256sum] = "28fd90e88bda0dfd460f370f353474811b2e295d7eb27f0d7d18ffa3d786eeb7" +SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native nftables" inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest features_check -REQUIRED_DISTRO_FEATURES = "gobject-introspection" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb index b636ad079a..f0ff24f376 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/git" inherit autotools gettext pkgconfig python3native features_check -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data gobject-introspection" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb index dc7f2b6f7f..0374d23f0c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check -REQUIRED_DISTRO_FEATURES = "gobject-introspection" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" SRC_URI = " \ git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.3.bb index 51b0ca751f..ee3665ca15 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.3.bb @@ -32,7 +32,7 @@ SRC_URI:append:libc-musl = " \ file://cmocka-uintptr_t.patch \ " -SRC_URI[sha256sum] = "5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106" +SRC_URI[sha256sum] = "c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541_1.3.3.bb b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541_1.3.6.bb index c7653bbbbb..75cf25c773 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541_1.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541_1.3.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "\ " SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" -SRCREV_opcua = "ff73268829359639531ff02905c889f73a77b408" +SRCREV_opcua = "1b7e2b5d669661c568fda5577ee92011a029cf75" SRCREV_mdnsd = "3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0" SRCREV_ua-nodeset = "f71b3f411d5cb16097c3ae0c744f67ad45535ffb" SRCREV_mqtt-c = "f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d" @@ -29,6 +29,7 @@ EXTRA_OECMAKE += "\ -DBUILD_SHARED_LIBS=ON \ -DUA_NAMESPACE_ZERO=FULL \ -DUA_LOGLEVEL=600 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ " PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth" diff --git a/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 4f8d4f6c6e..0b9e05b324 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -27,6 +27,8 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" +EXTRA_OEMAKE += "CPPFLAGS='${CFLAGS}'" + do_install () { install -d ${D}${sbindir} install -d ${D}${sysconfdir}/network/if-up.d diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb index effde16a9c..01e060e2f5 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.20.bb @@ -18,7 +18,7 @@ DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" -inherit autotools pkgconfig systemd useradd gettext +inherit autotools pkgconfig systemd useradd gettext multilib_header PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam systemd', d)}" @@ -56,6 +56,7 @@ do_install:append () { sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service fi + oe_multilib_header dovecot/config.h } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index 6c07223b31..723d7c8f78 100644 --- a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -32,6 +32,8 @@ EXTRA_OECMAKE = " \ -DBUNDLED_LIBS=ON \ -DENABLE_IPV6=ON \ -DENABLE_GTK=OFF \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch new file mode 100644 index 0000000000..a2923088e8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Add-CCFLAGS-to-cflags.patch @@ -0,0 +1,36 @@ +From 1bc180ec333d90e1a11deff46b5639ab5d40408d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:29:23 -0700 +Subject: [PATCH] Add CCFLAGS to cflags + +This is to append the flags from build environment. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 + + libipvs/Makefile | 3 +++ + 2 files changed, 4 insertions(+) + +--- a/Makefile ++++ b/Makefile +@@ -50,6 +50,7 @@ else + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g + endif + ++CFLAGS += $(CCFLAGS) + + ##################################### + # No servicable parts below this line +--- a/libipvs/Makefile ++++ b/libipvs/Makefile +@@ -1,6 +1,9 @@ + # Makefile for libipvs + + CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ++ ++CFLAGS += $(CCFLAGS) ++ + ifneq (0,$(HAVE_NL)) + CFLAGS += -DLIBIPVS_USE_NL + CFLAGS += $(shell \ diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..8b08482be7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-libipvs-Include-missing-sys-types.h.patch @@ -0,0 +1,28 @@ +From 4fc59f5733d187941e9a7ce5e9ea33714d85285c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 09:30:59 -0700 +Subject: [PATCH] libipvs: Include missing sys/types.h + +Its needed for u_intXX_t types + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libipvs/ip_vs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h +index 2670c23..625b6cd 100644 +--- a/libipvs/ip_vs.h ++++ b/libipvs/ip_vs.h +@@ -8,6 +8,7 @@ + + #include <netinet/in.h> + #include <sys/socket.h> ++#include <sys/types.h> + #include <arpa/inet.h> + #include <linux/types.h> /* For __beXX types in userland */ + +-- +2.40.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb index 01bde4a68d..442e231ad4 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb @@ -20,6 +20,8 @@ SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/${BP}. file://0001-Modify-the-Makefile-for-cross-compile.patch \ file://0003-ipvsadm-remove-dependency-on-bash.patch \ file://makefile-add-ldflags.patch \ + file://0001-Add-CCFLAGS-to-cflags.patch \ + file://0001-libipvs-Include-missing-sys-types.h.patch \ " SRC_URI[md5sum] = "f6d1707c5baf684b58fd33682d67871f" @@ -27,10 +29,10 @@ SRC_URI[sha256sum] = "1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3 UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/ipvsadm" +EXTRA_OEMAKE += "CCFLAGS='${CFLAGS}'" + do_compile() { - oe_runmake \ - CC="${CC} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3 -L${STAGING_LIBDIR}" \ - all + oe_runmake all } do_install() { diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch index 372938c6d6..d61a6e70b8 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch @@ -10,23 +10,24 @@ or 64Kb set by ntp should be good in glibc these days. Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- libntp/work_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libntp/work_thread.c b/libntp/work_thread.c -index 03a5647..3ddd751 100644 +index c1fe5c2..21db4a0 100644 --- a/libntp/work_thread.c +++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN +@@ -598,7 +598,7 @@ start_blocking_thread_internal( + /* now clamp on lower stack limit. */ + if (nstacksize < THREAD_MINSTACKSIZE) + nstacksize = THREAD_MINSTACKSIZE; +-# ifdef PTHREAD_STACK_MIN ++# ifdef PTHREAD_STACK_MIN && !defined(__GLIBC__) + if (nstacksize < PTHREAD_STACK_MIN) + nstacksize = PTHREAD_STACK_MIN; + # endif -- -2.32.0 +2.34.1 diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch index 42e1efd8be..24019e974b 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch @@ -5,12 +5,12 @@ Subject: [PATCH] test: Fix build with new compiler defaults to -fno-common Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- sntp/tests/run-packetHandling.c | 2 +- sntp/tests/run-t-log.c | 2 +- sntp/tests/run-utilities.c | 2 +- - tests/libntp/test-libntp.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c index 7790b20..c58380c 100644 @@ -51,16 +51,6 @@ index f717882..98d9bf1 100644 //=======MAIN===== -diff --git a/tests/libntp/test-libntp.h b/tests/libntp/test-libntp.h -index 93050b3..60461d8 100644 ---- a/tests/libntp/test-libntp.h -+++ b/tests/libntp/test-libntp.h -@@ -5,4 +5,4 @@ - - time_t timefunc(time_t *ptr); - void settime(int y, int m, int d, int H, int M, int S); --time_t nowtime; -+extern time_t nowtime; -- -2.32.0 +2.34.1 diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch index 571db75f7c..1961ada9b6 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/reproducibility-fixed-path-to-posix-shell.patch @@ -1,9 +1,17 @@ ---- ntp-4.2.8p12.original/sntp/libopts/m4/libopts.m4 2018-11-12 17:54:57.747220846 +1300 -+++ ntp-4.2.8p12/sntp/libopts/m4/libopts.m4 2018-11-12 18:00:50.626211641 +1300 -@@ -114,12 +114,6 @@ +reproducibility fixed path to posixshell +--- + sntp/libopts/m4/libopts.m4 | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4 +index 23738ca..4e18187 100644 +--- a/sntp/libopts/m4/libopts.m4 ++++ b/sntp/libopts/m4/libopts.m4 +@@ -107,13 +107,6 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ AC_PROG_SED [while : do +- test -x "$POSIX_SHELL" && break - POSIX_SHELL=`which bash` - test -x "$POSIX_SHELL" && break - POSIX_SHELL=`which dash` @@ -13,3 +21,6 @@ POSIX_SHELL=`/bin/sh -c ' exec 2>/dev/null if ! true ; then exit 1 ; fi +-- +2.34.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p16.bb index 5d2f05e925..8899f1254c 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p16.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" DEPENDS = "libevent" @@ -24,7 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" +SRC_URI[sha256sum] = "5225858bfd843b080fb9daa5b7370519130e5e49ac3eb0371e334bdc06c52dd7" # CVE-2016-9312 is only for windows. # CVE-2019-11331 is inherent to RFC 5905 and cannot be fixed without breaking compatibility diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch new file mode 100644 index 0000000000..03ba872616 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -0,0 +1,33 @@ +From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 May 2023 17:22:10 -0700 +Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment + +This allows to encode correct paths which are inside the target rootfs +for systemctl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b7462861..c4d82fb49 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,7 +226,10 @@ else() + set(CYTHON_EXECUTABLE "") + endif() + +-find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++if (NOT SYSTEMCTL_BIN) ++ find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++endif() ++ + if (NOT SYSTEMCTL_BIN) + set (SYSTEMCTL_BIN "/bin/systemctl") + endif() +-- +2.40.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb index c4c4387988..a6927f566d 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb @@ -5,7 +5,8 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ + file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" SRCREV = "f2789cbd394c5839e8942d585a494ab72fd97e39" S = "${WORKDIR}/git" @@ -16,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ -DNO_MAN_PAGES=1 \ " diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb index 9de4cc699a..178906b7b5 100644 --- a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -18,7 +18,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468" SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa" -EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ +EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ INSTALL_BASE_DIR="${D}${exec_prefix}" \ OOP_LIB_DIR=${STAGING_EXECPREFIXDIR}/${baselib} \ INSTALL_LIB_DIR=${D}${libdir}' diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch new file mode 100644 index 0000000000..0d51ce1b8f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch @@ -0,0 +1,66 @@ +From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt> +Date: Fri, 26 May 2023 13:29:23 +0100 +Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling + +Upstream-Status: Backport +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +--- + ConfigureChecks.cmake | 36 ++++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index dd8268e077..d8bca54115 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T) + # Check if the libc vsnprintf() conforms to C99. If this fails we may + # need to fall-back on GLib I/O. + # +-check_c_source_runs(" +- #include <stdio.h> +- int main(void) +- { +- /* Check that snprintf() and vsnprintf() don't return +- * -1 if the buffer is too small. C99 says this value +- * is the length that would be written not including +- * the nul byte. */ +- char buf[3]; +- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; +- }" +- HAVE_C99_VSNPRINTF +-) +-if (NOT HAVE_C99_VSNPRINTF) +- message(FATAL_ERROR ++# If cross-compiling we can't check so just assume this requirement is met. ++# ++if(NOT CMAKE_CROSSCOMPILING) ++ check_c_source_runs(" ++ #include <stdio.h> ++ int main(void) ++ { ++ /* Check that snprintf() and vsnprintf() don't return ++ * -1 if the buffer is too small. C99 says this value ++ * is the length that would be written not including ++ * the nul byte. */ ++ char buf[3]; ++ return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; ++ }" ++ HAVE_C99_VSNPRINTF ++ ) ++ if (NOT HAVE_C99_VSNPRINTF) ++ message(FATAL_ERROR + "Building Wireshark requires a C99 compliant vsnprintf() and this \ + target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ + using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ + developers at wireshark-dev@wireshark.org." +- ) ++ ) ++ endif() + endif() + + # +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch index 0b83ca4ae4..6ad8a62c28 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch @@ -13,24 +13,11 @@ Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> tools/ncp2222.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py -index 66b4656..c52b3fc 100755 ---- a/tools/make-plugin-reg.py -+++ b/tools/make-plugin-reg.py -@@ -28,7 +28,7 @@ preamble = """\ - * - * Generated automatically from %s. - */ --""" % (sys.argv[0]) -+""" % (os.path.basename(sys.argv[0])) - - # Create the proper list of filenames - filenames = [] -diff --git a/tools/ncp2222.py b/tools/ncp2222.py -index 1dea4ec..dc376e3 100755 ---- a/tools/ncp2222.py -+++ b/tools/ncp2222.py -@@ -5858,7 +5858,7 @@ def produce_code(): +Index: wireshark-4.0.6/tools/ncp2222.py +=================================================================== +--- wireshark-4.0.6.orig/tools/ncp2222.py ++++ wireshark-4.0.6/tools/ncp2222.py +@@ -5891,7 +5891,7 @@ def produce_code(): print("/*") print(" * Do not modify this file. Changes will be overwritten.") @@ -39,6 +26,3 @@ index 1dea4ec..dc376e3 100755 print(" */\n") print(""" --- -2.26.2.Cisco - diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch deleted file mode 100644 index 824761a3dc..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0003-bison-Remove-line-directives.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 42abf1d299fed8e00a189f6f9c55fb344e5bb775 Mon Sep 17 00:00:00 2001 -From: Oleksiy Obitotskyy <oobitots@cisco.com> -Date: Wed, 27 Jan 2021 04:01:34 -0800 -Subject: [PATCH] bison: Remove #line directives - -Append --no-lines option to bison to not -generate #line directives with absolute file path. - -Upstream-Status: Pending -Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> ---- - cmake/modules/FindYACC.cmake | 31 ++++++++++++++++++++++--------- - 1 file changed, 22 insertions(+), 9 deletions(-) - -diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake -index c96f87b..54a73cb 100644 ---- a/cmake/modules/FindYACC.cmake -+++ b/cmake/modules/FindYACC.cmake -@@ -29,15 +29,28 @@ MACRO(ADD_YACC_FILES _source _generated) - - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) - -- ADD_CUSTOM_COMMAND( -- OUTPUT ${_out} -- COMMAND ${YACC_EXECUTABLE} -- -d -- -p ${_basename} -- -o${_out} -- ${_in} -- DEPENDS ${_in} -- ) -+ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${_out} -+ COMMAND ${YACC_EXECUTABLE} -+ --no-lines -+ -d -+ -p ${_basename} -+ -o${_out} -+ ${_in} -+ DEPENDS ${_in} -+ ) -+ ELSE () -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${_out} -+ COMMAND ${YACC_EXECUTABLE} -+ -d -+ -p ${_basename} -+ -o${_out} -+ ${_in} -+ DEPENDS ${_in} -+ ) -+ ENDIF () - LIST(APPEND ${_source} ${_in}) - LIST(APPEND ${_generated} ${_out}) - ENDFOREACH (_current_FILE) --- -2.26.2.Cisco - diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch deleted file mode 100644 index 0b987700f5..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/CVE-2022-3190.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 4585d515b962f3b3a5e81caa64e13e8d9ed2e431 Mon Sep 17 00:00:00 2001 -From: Hitendra Prajapati <hprajapati@mvista.com> -Date: Mon, 26 Sep 2022 12:47:00 +0530 -Subject: [PATCH] CVE-2022-3190 - -Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/67326401a595fffbc67eeed48eb6c55d66a55f67] -CVE : CVE-2022-3190 -Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> ---- - epan/dissectors/packet-f5ethtrailer.c | 108 +++++++++++++------------- - 1 file changed, 56 insertions(+), 52 deletions(-) - -diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c -index ed77dfd..b15b0d4 100644 ---- a/epan/dissectors/packet-f5ethtrailer.c -+++ b/epan/dissectors/packet-f5ethtrailer.c -@@ -2741,69 +2741,73 @@ dissect_dpt_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d - static gint - dissect_old_trailer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) - { -- proto_tree *type_tree = NULL; -- proto_item *ti = NULL; - guint offset = 0; -- guint processed = 0; -- f5eth_tap_data_t *tdata = (f5eth_tap_data_t *)data; -- guint8 type; -- guint8 len; -- guint8 ver; - - /* While we still have data in the trailer. For old format trailers, this needs - * type, length, version (3 bytes) and for new format trailers, the magic header (4 bytes). - * All old format trailers are at least 4 bytes long, so just check for length of magic. - */ -- while (tvb_reported_length_remaining(tvb, offset)) { -- type = tvb_get_guint8(tvb, offset); -- len = tvb_get_guint8(tvb, offset + F5_OFF_LENGTH) + F5_OFF_VERSION; -- ver = tvb_get_guint8(tvb, offset + F5_OFF_VERSION); -- -- if (len <= tvb_reported_length_remaining(tvb, offset) && type >= F5TYPE_LOW -- && type <= F5TYPE_HIGH && len >= F5_MIN_SANE && len <= F5_MAX_SANE -- && ver <= F5TRAILER_VER_MAX) { -- /* Parse out the specified trailer. */ -- switch (type) { -- case F5TYPE_LOW: -- ti = proto_tree_add_item(tree, hf_low_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_low); -- -- processed = dissect_low_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_low = 1; -- } -- break; -- case F5TYPE_MED: -- ti = proto_tree_add_item(tree, hf_med_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_med); -- -- processed = dissect_med_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_med = 1; -- } -- break; -- case F5TYPE_HIGH: -- ti = proto_tree_add_item(tree, hf_high_id, tvb, offset, len, ENC_NA); -- type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_high); -- -- processed = -- dissect_high_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -- if (processed > 0) { -- tdata->trailer_len += processed; -- tdata->noise_high = 1; -- } -- break; -+ while (tvb_reported_length_remaining(tvb, offset) >= F5_MIN_SANE) { -+ /* length field does not include the type and length bytes. Add them back in */ -+ guint8 len = tvb_get_guint8(tvb, offset + F5_OFF_LENGTH) + F5_OFF_VERSION; -+ if (len > tvb_reported_length_remaining(tvb, offset) -+ || len < F5_MIN_SANE || len > F5_MAX_SANE) { -+ /* Invalid length - either a malformed trailer, corrupt packet, or not f5ethtrailer */ -+ return offset; -+ } -+ guint8 type = tvb_get_guint8(tvb, offset); -+ guint8 ver = tvb_get_guint8(tvb, offset + F5_OFF_VERSION); -+ -+ /* Parse out the specified trailer. */ -+ proto_tree *type_tree = NULL; -+ proto_item *ti = NULL; -+ f5eth_tap_data_t *tdata = (f5eth_tap_data_t *)data; -+ guint processed = 0; -+ -+ switch (type) { -+ case F5TYPE_LOW: -+ ti = proto_tree_add_item(tree, hf_low_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_low); -+ -+ processed = dissect_low_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_low = 1; - } -- if (processed == 0) { -- proto_item_set_len(ti, 1); -- return offset; -+ break; -+ case F5TYPE_MED: -+ ti = proto_tree_add_item(tree, hf_med_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_med); -+ -+ processed = dissect_med_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_med = 1; -+ } -+ break; -+ case F5TYPE_HIGH: -+ ti = proto_tree_add_item(tree, hf_high_id, tvb, offset, len, ENC_NA); -+ type_tree = proto_item_add_subtree(ti, ett_f5ethtrailer_high); -+ -+ processed = -+ dissect_high_trailer(tvb, pinfo, type_tree, offset, len, ver, tdata); -+ if (processed > 0) { -+ tdata->trailer_len += processed; -+ tdata->noise_high = 1; - } -+ break; -+ default: -+ /* Unknown type - malformed trailer, corrupt packet, or not f5ethtrailer - bali out*/ -+ return offset; -+ } -+ if (processed == 0) { -+ /* couldn't process trailer - bali out */ -+ proto_item_set_len(ti, 1); -+ return offset; - } - offset += processed; - } --return offset; -+ return offset; - } /* dissect_old_trailer() */ - - /*---------------------------------------------------------------------------*/ --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.6.bb index 693a167938..f822dce672 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.6.bb @@ -2,25 +2,22 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer" HOMEPAGE = "http://www.wireshark.org" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" +DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -SRC_URI += " \ - file://0001-wireshark-src-improve-reproducibility.patch \ - file://0002-flex-Remove-line-directives.patch \ - file://0003-bison-Remove-line-directives.patch \ - file://0004-lemon-Remove-line-directives.patch \ - file://CVE-2022-3190.patch \ -" +SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ + file://0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ + " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca" +SRC_URI[sha256sum] = "0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884" PE = "1" @@ -43,13 +40,12 @@ PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" PACKAGECONFIG[geoip] = ",, geoip" PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} @@ -64,6 +60,16 @@ EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ " CFLAGS:append = " -lm" +do_compile:append:class-target() { + # Fix TMPDIR, these are in the comments section + sed -i -e "s:** source file.*::g" ${B}/wiretap/ascend_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/candump_parser.c + sed -i -e "s:** source file.*::g" ${B}/wiretap/busmaster_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/protobuf_lang_parser.c + sed -i -e "s:** source file.*::g" ${B}/epan/dtd_grammar.c + sed -i -e "s:** source file.*::g" ${B}/epan/dfilter/grammar.c +} + do_install:append:class-native() { install -d ${D}${bindir} for f in lemon @@ -77,6 +83,9 @@ do_install:append:class-target() { do chrpath --delete $f done + + # We don't need the cmake files installed + rm -fr ${D}${usrlib}/${BPN}/cmake } PACKAGE_BEFORE_PN += "tshark" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 1ba7dd4afc..aec41edf7a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" LICENSE = "GPL-2.0-or-later | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005a6f035b8b34ac2191f3b" DEPENDS = "bluez5 glib-2.0" DEPENDS += "glib-2.0-native" @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ " SRCBRANCH = "master" -SRCREV = "fa54ae42ccb3d8f911e00b02ed1e581537e47f79" +SRCREV = "33a8a275928b186381bb0aea0f9778e330e57ec3" S = "${WORKDIR}/git" @@ -28,5 +28,12 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" inherit pkgconfig cmake +do_compile:append() { + for f in org-bluez-gattdescriptor1.c org-bluez-battery1.c org-bluez-adaptater1.c \ + org-bluez-device1.c org-bluez-gattservice1.c org-bluez-gattcharacteristic1.c; do + sed -i -e 's|${B}/dbus/||g' ${B}/dbus/$f + done +} + FILES:${PN} = "${libdir}/*" FILES:${PN}-dev = "${includedir}/* ${libdir}/pkgconfig" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.5.bb index e405ed77d5..e1f21c3bab 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.5.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "3a9c5e7ade45162e5c78b3d7035a2f4a6e20ba6b5974097c35a8f615493012f9" +SRC_URI[sha256sum] = "3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230521.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230604.0.bb index 8949380f3d..1b869a8622 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230521.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230604.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "dfabddcc12549abefa92e5ff628be25ddb112eca" +SRCREV = "4ab3954a07dd1c598791d98b8e98aa64c13ff8e9" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index ca2b20108a..94023922a2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" -SRCREV = "8d21f52577aa03958732a5a346a678c699e98cb6" +SRCREV = "83917a3935ac7ce1d8d96e914d96a6679319a336" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index 92fea981e1..8bd0992bd6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb @@ -14,4 +14,8 @@ SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449 inherit cmake python3native +EXTRA_OECMAKE += "\ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb index f4a8b020a8..6573916362 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb @@ -2,7 +2,7 @@ SUMMARY = "Memory Efficient Serialization Library" HOMEPAGE = "https://github.com/google/flatbuffers" SECTION = "console/tools" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" require flatbuffers.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc index a85c74c128..7533f7c758 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc @@ -1,3 +1,3 @@ -PV = "23.1.4" -SRCREV = "af9ceabeef1a10c1004e2741f8c0c090ca59e5af" +PV = "23.5.26" +SRCREV = "0100f6a5779831fa7a651e4b67ef389a8752bd9b" SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb index fb5b86ddea..5d3c73fd9a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb @@ -2,7 +2,7 @@ SUMMARY = "Memory Efficient Serialization Library - Python3 Modules" HOMEPAGE = "https://github.com/google/flatbuffers" SECTION = "console/tools" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://../LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" require flatbuffers.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb index f2de593cf1..6420c7e325 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb @@ -29,7 +29,7 @@ PACKAGECONFIG[sqlite] = "SQLITE=1,SQLITE=0,sqlite3" PACKAGECONFIG[zlib] = "ZLIB=1,ZLIB=0,zlib gzip-native" # use the PACKAGECONFIG configurations arguments -EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" +EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} RPM_OPT_FLAGS='${CFLAGS}'" do_compile() { # build core only - don't ship gui diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb index 6b049df6cf..9a7b38b495 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb @@ -1,20 +1,20 @@ SUMMARY = "Diagnostic Log and Trace" DESCRIPTION = "This component provides a standardised log and trace interface, \ based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ +This component can be used by COVESA components and other applications as \ logging facility providing: \ - the DLT shared library \ - the DLT daemon, including startup scripts \ - the DLT daemon adaptors- the DLT client console utilities \ - the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" +HOMEPAGE = "https://www.covesa.global/" SECTION = "console/utils" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" DEPENDS = "zlib gzip-native json-c" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ file://481.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch index bbdfa3c960..979fd323ae 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak/0001-respect-environment-variables.patch @@ -8,18 +8,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 1d70f17..c7e726e 100644 --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,8 +1,8 @@ -CFLAGS = -g -O2 -Wall -fPIC -Ilibwuya -LDFLAGS = -Llibwuya +CFLAGS += -g -O2 -Wall -fPIC -Ilibwuya +LDFLAGS += -Llibwuya libleak.so: libleak.o - CFLAGS='-fPIC' make -C libwuya --- -2.30.1 - +- CFLAGS='-fPIC' make -C libwuya ++ make -C libwuya + $(CC) -shared -o $@ $^ $(LDFLAGS) -lwuya -lpthread -ldl -lbacktrace + + clean: diff --git a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb index a83a11c684..e3e4c01acb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=18;endline=21;md5=de4f705f12cdedb DEPENDS += "libbacktrace" +PE = "1" +SRCREV = "1c56b0a2ba643db976f589ec04b246e693b6c0ce" SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \ file://0001-respect-environment-variables.patch \ " -PV = "1.0+git${SRCPV}" -SRCREV = "ea2bb608ae25701692269a37d39d77e966b887ac" - S = "${WORKDIR}/git" do_configure () { diff --git a/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb b/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb index 94986089c7..bfd313ddfe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb @@ -26,6 +26,9 @@ inherit goarch # | ./github.com/minio/mc/main.go:27:(.text+0xd258b8): relocation R_MIPS_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC COMPATIBLE_HOST:mips = "null" +# ERROR: QA Issue: minio: ELF binary /usr/sbin/mc has relocations in .text [textrel] +# Needs fixing with go >= 1.20.4" +EXCLUDE_FROM_WORLD = "1" DEPENDS += "rsync-native" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.3.bb index 3129dc1140..dc771ce28a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.3.bb @@ -42,7 +42,7 @@ BUILD_OPTIMIZATION:append = " -O2" # Package configuration - match ostree defaults, but without rofiles-fuse # otherwise we introduce a dependendency on meta-filesystems and swap # soup for curl to avoid bringing in deprecated libsoup2 (though -# to run ptest requires that you have soup). +# to run ptest requires that you have soup2 or soup3). PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ @@ -85,7 +85,8 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls" PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse3" PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux, bubblewrap" PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" +PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" PACKAGECONFIG[static] = "" PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" @@ -188,7 +189,7 @@ RDEPENDS:${PN}:class-target = " \ # # Something like this in your local.conf: # -# PACKAGECONFIG:append:pn-ostree = " static soup" +# PACKAGECONFIG:append:pn-ostree = " static soup3" # KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" # TARGET_CFLAGS:append:pn-busybox = " -static" # diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb index 20fdea1a54..53214c8fe8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" DEPENDS += "libxmu" -SRC_URI[sha256sum] = "4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4" EXTRA_OECONF += "--with-cpp=${bindir}/cpp" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_380.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_382.bb index 377c2758b0..3bae13658c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_380.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_382.bb @@ -8,7 +8,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "0c1dc1fa800fa64b5c58d16ddb905e700b27ca538a65be8c03b2ba5761106c38" +SRC_URI[sha256sum] = "0cd0bcf3d0aa746a840ea3f1366ea29a74263694d535b5c777f27eb65d7fceed" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb index 44b9c80d73..4a05a4437a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb @@ -7,4 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0cdb783e9a0198237371fdaa26a18bf" DEPENDS = "libxmu libxkbfile" -SRC_URI[sha256sum] = "fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb index 21a080221c..c02645a6b8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb @@ -26,14 +26,14 @@ PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=master \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ file://0002-original-patch-mediactl-pkgconfig.patch \ file://0003-original-patch-export-mediactl-headers.patch \ file://0004-Do-not-use-getsubopt.patch \ " -SRCREV = "9431e4b26b4842d1401e80ada9f14593dca3a94c" +SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848" PV .= "+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch new file mode 100644 index 0000000000..829ace09b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch @@ -0,0 +1,28 @@ +From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 May 2023 10:32:53 -0700 +Subject: [PATCH] Append cflags instead of overriding in Makefile.am + +Fixes +WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b64449f..23637b3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-CFLAGS = -g -O3 -Wall ++CFLAGS += -g -O3 -Wall + + bin_PROGRAMS = orrery + orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h +-- +2.40.1 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 100ecb1331..96a7018de2 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -13,6 +13,7 @@ SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.ta file://orrery.png \ file://use.GdkPixbuf.patch \ file://0001-orrery-Fix-sprintf-format.patch \ + file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ " SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" @@ -22,7 +23,7 @@ S = "${WORKDIR}/${BPN}" do_configure:prepend() { # fix DSO issue with binutils-2.22 - sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am + sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am } do_install:append() { install -d ${D}${datadir}/orrery @@ -30,6 +31,7 @@ do_install:append() { chown -R root:root ${D}${datadir}/orrery install -d ${D}${datadir}/icons install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons + rm -rf ${D}${datadir}/orrery/Makefile* } FILES:${PN} += "${datadir}/icons/orrery.png" diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb index 030f033485..52c62cde30 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -59,4 +59,8 @@ do_install:append() { FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" -RDEPENDS:${PN} += "python3-core" +RDEPENDS:${PN} += " \ + python3-difflib \ + python3-asyncio \ + python3-xml \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.2.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb index d980eccc3c..f02c457284 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb @@ -16,14 +16,14 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ calls, and removing free calls." -HOMEPAGE = "http://www.hboehm.info/gc/" +HOMEPAGE = "https://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" DEPENDS = "libatomic-ops" -SRCREV = "cd1fbc1dbfd2cc888436944dd2784f39820698d7" +SRCREV = "d1ff06cc503a74dca0150d5e988f2c93158b0cdf" SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index b7a9d3e936..0e994d8b09 100644 --- a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -4,9 +4,9 @@ SECTION = "System Environment/Libraries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" -SRC_URI = "https://distrib-coffee.ipsl.jussieu.fr/pub/linux/altlinux/autoimports/Sisyphus/x86_64/SRPMS.autoimports/ctapi-common-1.1-alt1_14.src.rpm;extract=ctapi-common.LICENSE \ - https://distrib-coffee.ipsl.jussieu.fr/pub/linux/altlinux/autoimports/Sisyphus/x86_64/SRPMS.autoimports/ctapi-common-1.1-alt1_14.src.rpm;extract=ctapi-common.README" -SRC_URI[sha256sum] = "0531a6db39271166f1e9060f81a0b2d47f878210dfb4f465c703fe205cc3a8ce" +SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" +SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" do_compile() { install -pm 644 ${WORKDIR}/ctapi-common.LICENSE LICENSE diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index 0cb33fcd50..fd57e4e283 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -21,4 +21,5 @@ S = "${WORKDIR}/git" do_install:append(){ chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1 + sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc } diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-ptest-modify-delays-in-toggle-tests.patch b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-ptest-modify-delays-in-toggle-tests.patch deleted file mode 100644 index 11f2d5c4a9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-ptest-modify-delays-in-toggle-tests.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b73a79245ac0fa36b15bf3308e4ed008793ff15c Mon Sep 17 00:00:00 2001 -From: Joe Slater <joe.slater@windriver.com> -Date: Fri, 19 May 2023 08:46:47 -0700 -Subject: [PATCH] ptest: modify delays in toggle test - -The test "gpioset: toggle (continuous)" uses fixed delays to test -toggling values. This is not reliable, so we switch to looking -for transitions from one value to another. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> ---- - tools/gpio-tools-test.bats | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libgpiod-2.0.orig/tools/gpio-tools-test.bats -+++ libgpiod-2.0/tools/gpio-tools-test.bats -@@ -141,6 +141,20 @@ gpiosim_check_value() { - [ "$VAL" = "$EXPECTED" ] - } - -+gpiosim_wait_value() { -+ local OFFSET=$2 -+ local EXPECTED=$3 -+ local DEVNAME=${GPIOSIM_DEV_NAME[$1]} -+ local CHIPNAME=${GPIOSIM_CHIP_NAME[$1]} -+ -+ for i in {1..10} ; do -+ VAL=$(<$GPIOSIM_SYSFS/$DEVNAME/$CHIPNAME/sim_gpio$OFFSET/value) -+ [ "$VAL" = "$EXPECTED" ] && return -+ sleep 0.1 -+ done -+ return 1 -+} -+ - gpiosim_cleanup() { - for CHIP in ${!GPIOSIM_CHIP_NAME[@]} - do -@@ -1567,15 +1581,15 @@ request_release_line() { - gpiosim_check_value sim0 4 0 - gpiosim_check_value sim0 7 0 - -- sleep 1 -- -- gpiosim_check_value sim0 1 0 -+ # sleeping fixed amounts can be unreliable, so we -+ # sync to the toggles -+ # -+ gpiosim_wait_value sim0 1 0 - gpiosim_check_value sim0 4 1 - gpiosim_check_value sim0 7 1 - -- sleep 1 - -- gpiosim_check_value sim0 1 1 -+ gpiosim_wait_value sim0 1 1 - gpiosim_check_value sim0 4 0 - gpiosim_check_value sim0 7 0 - } diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc index 0329caafdf..a2d1f57a8b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -1,5 +1,6 @@ SUMMARY = "C library and tools for interacting with the linux GPIO character device" AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" +RECIPE_MAINTAINER = "Bartosz Golaszewski <brgl@bgdev.pl>" inherit autotools pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb index 91c4d27692..337554cd89 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = " \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" -SRC_URI += "file://0001-ptest-modify-delays-in-toggle-tests.patch" - SRC_URI[sha256sum] = "b5367d28d045b36007a4ffd42cceda4c358737ef4f2ce22b0c1d05ec57a38392" # Enable all project features for ptest diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.74.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.74.bb index a7048f0fe8..38407a7c42 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.74.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.74.bb @@ -289,3 +289,6 @@ CVE_CHECK_IGNORE += "CVE-2006-5201" # CVES CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698 only affect # the legacy db (libnssdbm), only compiled with --enable-legacy-db. CVE_CHECK_IGNORE += "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" + +# vulnerability was introduced in 3.77 and fixed in 3.87 +CVE_CHECK_IGNORE += "CVE-2022-3479" diff --git a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch new file mode 100644 index 0000000000..ff2743eb68 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch @@ -0,0 +1,27 @@ +From 2d61587f85d1bf57287d12b470afb94c0bf9249d Mon Sep 17 00:00:00 2001 +From: Davide Cavalca <dcavalca@fedoraproject.org> +Date: Mon, 27 Jun 2022 16:54:35 -0700 +Subject: [PATCH] cli: Fix format security warning + +Upstream-Status: Submitted [https://github.com/Microsemi/switchtec-user/pull/316] + +--- + cli/graph.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cli/graph.c b/cli/graph.c +index 5748914..95609de 100644 +--- a/cli/graph.c ++++ b/cli/graph.c +@@ -134,7 +134,7 @@ static void draw_status(WINDOW *win, int x_off, int x_cnt, const char *status) + mvwprintw(win, 0, 0, " "); + for (i = 0; i < x_cnt * 2 + x_off; i++) + mvwaddch(win, 1, i, ' '); +- mvwprintw(win, 1, x_off, status); ++ mvwprintw(win, 1, x_off, "%s", status); + wrefresh(win); + } + +-- +2.39.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb new file mode 100644 index 0000000000..443e5bc493 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Easy to use CLI and C library for communicating with Microsemi's Switchtec management interface" +HOMEPAGE = "https://github.com/Microsemi/switchtec-user" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + +DEPENDS = "ncurses openssl" + +SRCREV = "762ba441d2c02685f98e5f56e984db033bab279a" +SRC_URI = " \ + git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master \ + file://0001-cli-Fix-format-security-warning.patch \ +" +SRC_URI[sha256sum] = "f98c1fe23e1d7a11fb23e8bcf9b563929fc805ea669191a7fd525ad16519f655" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" + +do_install () { + oe_runmake install +} diff --git a/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.1.bb index c867a3a7d8..0b61149609 100644 --- a/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[sha256sum] = "0160c535bff2b0dc6a830b9944e981e3427380f63e748da96ced7071faebabf6" +SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.38.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.39.bb index fcba788fbc..7e57be35cc 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.38.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.39.bb @@ -9,7 +9,7 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[sha256sum] = "d8a34341649882d6e2bdf95d046e74c83a150b5e5d818941c1e341f48fba88e0" +SRC_URI[sha256sum] = "e99cdedf9f0d60dca16f613e488c5b7f123c2fb24b3346d580cfe7da40851ac6" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc index 9dc592720e..c4a752ae61 100644 --- a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -32,7 +32,6 @@ PTESTS_FAST_META_PYTHON = "\ python3-pyasn1-modules \ python3-pyroute2 \ python3-pyserial \ - python3-pytest-mock \ python3-pytoml \ python3-requests-file \ python3-requests-toolbelt \ @@ -73,6 +72,7 @@ PTESTS_PROBLEMS_META_PYTHON ="\ python3-pint \ python3-py-cpuinfo \ python3-pytest-lazy-fixture \ + python3-pytest-mock \ python3-pyzmq \ python3-scrypt \ python3-service-identity \ diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb index 6eb896d1d2..9bb3053885 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb @@ -10,10 +10,11 @@ inherit pypi setuptools3 PYPI_SRC_URI:append = ";downloadfilename=${BP}.${PYPI_PACKAGE_EXT}" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ + python3-logging \ + python3-scons \ + python3-six \ + python3-stringold \ + python3-threading \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb index c075e42700..ef6375546e 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-txws/python3-txws_0.9.1.bb @@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=76699830db7fa9e897f6a1ad05f98ec8" DEPENDS = "python3-twisted python3-six python3-vcversioner python3-six-native python3-vcversioner-native" +RDEPENDS:${PN} += " \ + python3-six \ + python3-twisted \ +" + SRC_URI = "git://github.com/MostAwesomeDude/txWS.git;branch=master;protocol=https" SRCREV= "88cf6d9b9b685ffa1720644bd53c742afb10a414" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.0.0.bb deleted file mode 100644 index 369ed78ca7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Pamela: yet another Python wrapper for PAM" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=3f9b78307cdde4e6a4976bfd82a0e7f3" - -SRC_URI[md5sum] = "5fc14f5275383ed8bdd509007af0323d" -SRC_URI[sha256sum] = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c" - -PYPI_PACKAGE = "pamela" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "libpam" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.1.0.bb new file mode 100644 index 0000000000..3573de551d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Pamela: yet another Python wrapper for PAM" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b706db92112b8384848de3e5c6adaa3" + +SRC_URI[sha256sum] = "d4b139fe600e192e176a2a368059207a6bffa0e7879879b13f4fcba0163481be" + +PYPI_PACKAGE = "pamela" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "libpam" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb index 8eecd2d265..c9081c8cbb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" SRC_URI += "file://run-ptest \ " -SRC_URI[sha256sum] = "8de379fcc383bcfe4507e229fc31209ea23d4831c850f74063b2c11639474dd2" +SRC_URI[sha256sum] = "9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed" export BUILD_SYS export HOST_SYS diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.12.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.0.bb index 8f7185b8f5..e4e3c49988 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.12.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.0.bb @@ -1,13 +1,13 @@ SUMMARY = "httplib2 caching for requests" HOMEPAGE = "https://pypi.org/project/CacheControl/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=12;endline=12;md5=942a721dac34d073453642ffe5fcf546" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=12;endline=12;md5=e2fd6ddcf506e08972d5ba4b93c0022e" # On PyPi, this is "CacheControl", rather than "cachecontrol", so we need to # override PYPI_PACKAGE so fetch succeeds. PYPI_PACKAGE = "CacheControl" -SRC_URI[sha256sum] = "9c2e5208ea76ebd9921176569743ddf6d7f3bb4188dbf61806f0f8fc48ecad38" +SRC_URI[sha256sum] = "fd3fd2cb0ca66b9a6c1d56cc9709e7e49c63dbd19b1b1bcbd8d3f94cedfe8ce5" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.1.bb index 21bb518719..739e5a8264 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.1.bb @@ -27,6 +27,6 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -SRC_URI[sha256sum] = "13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14" +SRC_URI[sha256sum] = "dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb new file mode 100644 index 0000000000..d9240e1383 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Smart, pythonic, ad-hoc, typed polymorphism for Python." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=155fbcc756c8ae5265d252d23e20908f" + +SRC_URI[sha256sum] = "4de4fdd6c5c38607bbd8ad76703d7cc4dbe007cfa78e8ef1f62fc6ac55303e23" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-typing-extensions" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.7.bb index b13384cd21..f625996ba2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.2.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "2025f913f2edb0272ef15d00b1f335ff8908c921c8eb2013536fcaf61f5a683d" +SRC_URI[sha256sum] = "924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.3.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.3.15.bb index af8892eb73..b00ab26152 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.3.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.3.15.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "d067b1f95b553c6e82d95a983c465695913dcd12f47a8b9aa938a0450d94dd5e" +SRC_URI[sha256sum] = "924a38fda88f675ec6835667e1d32ac37ff0d65509c2152729d16ff205e32a65" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb index 6ea47f4292..4b5c78fb03 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=44288e26f4896bdab14072d4fa35ff01" PYPI_PACKAGE = "Deprecated" -SRC_URI[sha256sum] = "43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d" +SRC_URI[sha256sum] = "e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb index dffc36169e..335461c435 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb @@ -10,3 +10,8 @@ PYPI_PACKAGE = "python-editor" inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-io \ + python3-setuptools \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.86.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.88.0.bb index 119ed0fd2b..6ea78ee812 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.86.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.88.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "3ca4e93821f4e9ac29b91ab0d9df168b42c8ad0fb8bff65b8c2ccb2d462b0464" +SRC_URI[sha256sum] = "37068453f79ea28e5394a8fe20a4ba620594e7f8541068bea2e844dacdcc9d33" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.18.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.19.1.bb index 70a5dfbb1e..05757adfee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.18.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.19.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "d7a3249027e7f464fbbfd7ee8319a08ad09d2eea51578575c4bd360ffa049ccb" +SRC_URI[sha256sum] = "a9cfa88b3e16196845e64a3658eb953992129d13ac7337b064c6546f77c17183" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb index 64873d2464..5b6d040368 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb @@ -17,6 +17,8 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " +RDEPENDS:${PN} += "python3-cgitb" + do_install_ptest() { install -d ${D}${PTEST_PATH}/test cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.29.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.30.0.bb index 3ca9e3c1e2..6bcba2ca7a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.29.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.30.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "5aa207ab61aca233a7a312951ac603d618b78418eac749e3dc5035010531e25b" +SRC_URI[sha256sum] = "7fc6ad5b5677cb1e58077875a72512aa8c392b6d40885eca0a6ab250efb4b8f4" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb index 36d6463051..9a8e6f7daf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb @@ -9,3 +9,9 @@ PYPI_PACKAGE = "iperf3" SRC_URI[sha256sum] = "d50eebbf2dcf445a173f98a82f9c433e0302d3dfb7987e1f21b86b35ef63ce26" inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-json \ + python3-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb index eb93e71733..5555a12563 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.3.bb @@ -12,3 +12,8 @@ SRC_URI[sha256sum] = "38f74db3a57e9998a9774e3614afb95cb396f139f29b3fdb130c5af554 inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-compression \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb index b1af0f0336..4cc39a286a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpath-rw_1.4.0.bb @@ -8,4 +8,9 @@ SRC_URI[sha256sum] = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fa inherit pypi setuptools3 -RDEPENDS:${PN} += " python3-decorator" +RDEPENDS:${PN} += " \ + python3-decorator \ + python3-logging \ + python3-ply \ + python3-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb index 26ee3786b4..08ee15a920 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb @@ -8,7 +8,9 @@ SRC_URI[sha256sum] = "c0d475494b3e1b591ecdee7883739accaf5695edb673f16b7383b8c6bb inherit pypi setuptools3 RDEPENDS:${PN} += "\ - python3-core \ + python3-json \ + python3-math \ + python3-netclient \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb index e70ce33efc..237713bf12 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb @@ -13,3 +13,5 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "680003f3b15a2959e4e6a351f3b858e3c07dd3e073a0d54954e34d8ea5e1308e" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "python3-json" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb index ec09cfc58e..b9c1c4e384 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb @@ -8,3 +8,9 @@ SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e6 inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-curses \ + python3-shell \ + python3-tkinter \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.5.bb new file mode 100644 index 0000000000..cdff28c295 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.5.bb @@ -0,0 +1,8 @@ +SUMMARY = "Lazy attributes are computed attributes that are evaluated only once, the first time they are used." + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84689cccb68e3c397d0856e8ad5a73b2" + +SRC_URI[sha256sum] = "cb3d8612aa895a48afe8f08860573ba8ef5ee4fdbe1b3cd606c5f50a16152186" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb index c728cd0ff1..27e336710c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb @@ -11,3 +11,8 @@ SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e56016950 inherit pypi setuptools3 PYPI_PACKAGE = "libevdev" + +RDEPENDS:${PN} += " \ + libevdev \ + python3-ctypes \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb index 5dfd02be4a..31fb88d6e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/nexB/license-expression" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "943b1d2cde251bd30a166b509f78990fdd060be9750f3f1a324571e804857a53" +SRC_URI[sha256sum] = "42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c" inherit pypi ptest python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb index 9395a792fc..d51eecf978 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-linux-procfs_0.7.1.bb @@ -10,3 +10,5 @@ SRCREV = "7f43598387e44e2da93ead2e075b7232429e4cc4" S = "${WORKDIR}/git" inherit setuptools3 + +RDEPENDS:${PN} += "python3-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb index b9dc4722af..af738e08ec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb @@ -12,6 +12,9 @@ SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361 inherit pypi setuptools3 DEPENDS += "python3-distutils-extra-native python3-pbr-native" -RDEPENDS:${PN} += "python3-sqlite3" +RDEPENDS:${PN} += " \ + python3-io \ + python3-sqlite3 \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch deleted file mode 100644 index b93d1594da..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5013406c409a0a143a315146df388281bfb2172d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 1 Mar 2023 19:53:36 -0800 -Subject: [PATCH] lru: Use PyCFunction instead of PyCFunctionWithKeywords - -PyMethodDef uses PyMethodDef and not PyCFunctionWithKeywords and when -callback is specified as PyCFunctionWithKeywords, clang 16+ is able to -detect function signature mismatch in function pointers now. - -Fixes -lru.c:629:17: error: incompatible function pointer types initializing 'PyCFunction' (aka 'struct _object *(*)(struct _object *, struct _object *)') with an expression of type 'PyCFunctionWithKeywords' (aka 'struct _object *(*)(struct _object *, struct _object *, struct _object *)') [-Wincompatible-function-pointer-types] - {"popitem", (PyCFunctionWithKeywords)LRU_popitem, METH_VARARGS | METH_KEYWORDS, - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1 error generated. - -Upstream-Status: Submitted [https://github.com/amitdev/lru-dict/pull/45] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lru.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lru.c b/lru.c -index 8adcb4b..33c18ab 100644 ---- a/lru.c -+++ b/lru.c -@@ -626,7 +626,7 @@ static PyMethodDef LRU_methods[] = { - PyDoc_STR("L.setdefault(key, default=None) -> If L has key return its value, otherwise insert key with a value of default and return default")}, - {"pop", (PyCFunction)LRU_pop, METH_VARARGS, - PyDoc_STR("L.pop(key[, default]) -> If L has key return its value and remove it from L, otherwise return default. If default is not given and key is not in L, a KeyError is raised.")}, -- {"popitem", (PyCFunctionWithKeywords)LRU_popitem, METH_VARARGS | METH_KEYWORDS, -+ {"popitem", (PyCFunction)LRU_popitem, METH_VARARGS | METH_KEYWORDS, - PyDoc_STR("L.popitem([least_recent=True]) -> Returns and removes a (key, value) pair. The pair returned is the least-recently used if least_recent is true, or the most-recently used if false.")}, - {"set_size", (PyCFunction)LRU_set_size, METH_VARARGS, - PyDoc_STR("L.set_size() -> set size of LRU")}, --- -2.39.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb index e825e43dfe..7a3a172746 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" -SRC_URI[sha256sum] = "878bc8ef4073e5cfb953dfc1cf4585db41e8b814c0106abde34d00ee0d0b3115" +SRC_URI[sha256sum] = "13c56782f19d68ddf4d8db0170041192859616514c706b126d0df2ec72a11bd7" inherit pypi setuptools3 -SRC_URI += "file://0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch" +SRC_URI += "${PYPI_SRC_URI}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb index 1223ae9532..1be3fa5ada 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb @@ -12,3 +12,9 @@ SRC_URI[md5sum] = "1add16caefc9e6b82ef4f40532cb4918" SRC_URI[sha256sum] = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-cgitb \ + python3-smtpd \ + python3-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.2.bb index 633b6f2776..6b511d82f7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.0.2.bb @@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-pep8 \ - ${PYTHON_PN}-pyflakes" +RDEPENDS:${PN} += " \ + python3-cmd2 \ + python3-mccabe \ + python3-pep8 \ + python3-prettytable \ + python3-pyflakes \ + python3-pyparsing \ + python3-unittest \ +" SRC_URI[sha256sum] = "06f18d7d65b44428202b145a9a36e99c2ee00d1eb992df0caf881d4664377891" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb index 4ac9e21924..01dd8bfb44 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb @@ -11,6 +11,9 @@ SRC_URI[sha256sum] = "7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS:${PN} += "python3-image" +RDEPENDS:${PN} += " \ + python3-image \ + python3-math \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb index 848b25dae8..966ff86dee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb @@ -8,10 +8,18 @@ SRC_URI[sha256sum] = "a502aee54917cd394217b31c977a1ba3d9541a0120e0a045c49fd77b32 inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - python3-pako \ - python3-monotonic \ +RDEPENDS:${PN} += " \ python3-appdirs \ + python3-git \ + python3-fasteners \ + python3-io \ + python3-json \ + python3-lazy \ + python3-monotonic \ + python3-multiprocessing \ + python3-pako \ + python3-pyyaml \ + python3-requests \ " do_install:append() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb index ad03eec851..5ba006691a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ + python3-io \ + python3-pprint \ + python3-xml \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb new file mode 100644 index 0000000000..9a6326f37d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Python module for generating .ninja files." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://setup.py;beginline=38;endline=38;md5=f5441d6119564d4094cf77bee7cf7b0a" + +SRC_URI[sha256sum] = "342dc97b9e88a6495bae22953ee6063f91d2f03db6f727b62ba5c3092a18ef1f" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "ninja_syntax" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb index 47a70aa38a..3b9077f326 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb @@ -15,6 +15,11 @@ do_install:append () { rm -rf ${D}${bindir} } -RDEPENDS:${PN} = "ninja" +RDEPENDS:${PN} = " \ + ninja \ + python3-io \ + python3-json \ + python3-ninja-syntax \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb index 89a44ea53e..29a3c86067 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "5272b232e08246696ab26fe0ebbd28b8989dac9ee5732b50264950323b513d23" +SRC_URI[sha256sum] = "456aa000c6777c5d21b029c52e532f94328d4fb4f15ad2a4dd3dd62db30b3892" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb index d9d977b705..b926484db0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb @@ -14,8 +14,9 @@ PYPI_PACKAGE = "OSlash" inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - python3-core \ +RDEPENDS:${PN} += " \ + python3-json \ + python3-typing-extensions \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb index f506a78636..3af9349d44 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb @@ -7,3 +7,5 @@ SRC_URI[md5sum] = "dbf852015ef87a6694549779fb475b52" SRC_URI[sha256sum] = "2ac05fcbc826873c574568aa5ce09945d6ea987bee10399e766eb8f7c6356d72" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.2.0.bb index 70cee849a6..f2d8bfe44b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" -SRC_URI[sha256sum] = "6950faca6819acd3219d4ae694a23c7a87ee38d084f70c1724b0c0dbb8b75769" +SRC_URI[sha256sum] = "93cdce625a8a1dc12204439d45033f3261bdb2c201648cfcdc06f9fd0f94ec29" PYPI_PACKAGE = "paramiko" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb index 2bf55cbaff..94c1b53c94 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.19.0.bb @@ -8,18 +8,19 @@ SRC_URI[sha256sum] = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb6 inherit pypi setuptools3 ptest RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - " + python3-datetime \ + python3-logging \ + python3-numbers \ +" SRC_URI += " \ - file://run-ptest \ + file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " do_install_ptest() { - cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ + cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb index 580b17413b..f3e0711087 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pefile_2023.2.7.bb @@ -11,3 +11,9 @@ PIP_INSTALL_PACKAGE = "pefile" PIP_INSTALL_DIST_PATH = "${S}/dist" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-mmap \ + python3-netclient \ + python3-stringold \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb index 58cd05e222..b7fa69ffa8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb @@ -7,3 +7,9 @@ SRC_URI[md5sum] = "47e9a6abc91b4022953e4007ddae9e68" SRC_URI[sha256sum] = "5dcb0d44f86a601e41a2def9770993cd0ea45c76d37eb3f35e3dd61aa50350e6" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-compression \ + python3-crypt \ + python3-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb index 9d67e4f338..8260913087 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb @@ -10,3 +10,5 @@ SRC_URI[md5sum] = "44ab782615894a812ab96669a122a634" SRC_URI[sha256sum] = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca" inherit setuptools3 pypi + +RDEPENDS:${PN} += "python3-pickle" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.22.bb index 13944ec780..0eed33f799 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.21.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.22.bb @@ -10,7 +10,7 @@ PYPI_PACKAGE := "Pint" inherit pypi ptest python_setuptools_build_meta -SRC_URI[sha256sum] = "3e98bdf01f4dcf840cc0207c0b6f7510d4e0c6288efc1bf470626e875c831172" +SRC_URI[sha256sum] = "2d139f6abbcf3016cad7d3cec05707fe908ac4f99cf59aedfd6ee667b7a64433" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb index 4fefe565f1..c5c3d9fe6c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.5.1.bb @@ -32,4 +32,4 @@ do_install_ptest() { cp -rf ${S}/tests ${D}${PTEST_PATH}/ } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb index 24ab0399f9..eb01504f61 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb @@ -13,3 +13,9 @@ inherit pypi setuptools3 RDEPENDS:${PN} += "python3-core" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-io \ + python3-logging \ + python3-unittest \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.23.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.23.2.bb index e0c9ef9677..6aa4f636eb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.23.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.23.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a inherit pypi setuptools3 -SRC_URI[sha256sum] = "95789b569418a3e32a53f43d7763be3d490a831e9c08042539462b6d972c2d7e" +SRC_URI[sha256sum] = "20874e7ca4436f683b64ebdbee2129a5a2c301579a67d1a7dda2cdf62fb7f5f7" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb index d2aaa3db41..66e4673a70 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb @@ -9,3 +9,8 @@ PYPI_PACKAGE = "pure_eval" inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3" + +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-numbers \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb index aa3000bf6b..cd0e12ec8e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb @@ -20,3 +20,5 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" inherit pkgconfig autotools python3native FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyatspi/*" + +RDEPENDS:${PN} += "python3-pygobject" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb index 70f6834f5f..9d59cf8598 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb @@ -8,13 +8,14 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-image \ - ${PYTHON_PN}-logging \ + python3-core \ + python3-datetime \ + python3-image \ + python3-io \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-profile \ + python3-typing-extensions \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb index 7d22266f88..1cbd2384a3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.22.bb @@ -8,3 +8,5 @@ LIC_FILES_CHKSUM = "file://README.md;md5=a6aa1e7097aca5955f9a2e1c8b0ce158" inherit pypi setuptools3 SRC_URI[sha256sum] = "659351e7ee8923b42de8a774fabfc806acf07377d7fd19f2ea4412ef8f619c6a" + +RDEPENDS:${PN} += "python3-numbers" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb index 5e0d2de916..29a0bc86c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb @@ -7,6 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" DEPENDS += "python3-setuptools-scm-native" +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-fcntl \ + python3-io \ +" + inherit setuptools3 SRC_URI = "git://github.com/bat-serjo/PyIface.git;protocol=https;branch=master" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb index 87e212d9dc..c0cca98ff6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb @@ -11,12 +11,12 @@ SRC_URI[sha256sum] = "0378cec15fb11b2ed27ba54dad9fd987d48e6f62f49fcff138f5f7a8b3 inherit pypi setuptools3 -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-javaobj-py3 \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ - ${PYTHON_PN}-pycryptodome \ - ${PYTHON_PN}-twofish\ +RDEPENDS:${PN} = " \ + python3-javaobj-py3 \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-pycryptodomex \ + python3-twofish \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb index e1e3358695..3aa9b479a5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.7.0.bb @@ -10,6 +10,9 @@ SRC_URI[sha256sum] = "bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9c PYPI_PACKAGE = "PyJWT" inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-cryptography" +RDEPENDS:${PN} = " \ + python3-json \ + python3-cryptography \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb index 6d93f384e0..d94051df89 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.8.0.bb @@ -11,9 +11,10 @@ PYPI_PACKAGE = "pykwalify" inherit setuptools3 pypi RDEPENDS:${PN} = "\ - ${PYTHON_PN}-docopt \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-ruamel-yaml \ + python3-dateutil \ + python3-docopt \ + python3-logging \ + python3-ruamel-yaml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb index 207751c451..1ac95e8be3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb @@ -9,4 +9,10 @@ SRC_URI[sha256sum] = "c5f36e8ef0ed3b487a9242ce34c19f9684e418a5bbffd5d367dc1d1604 PYPI_PACKAGE = "PyLyrics" PYPI_PACKAGE_EXT = "zip" -inherit pypi setuptools3
\ No newline at end of file +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-beautifulsoup4 \ + python3-classes \ + python3-requests \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.3.0.bb index 783bed8212..9b84c4f881 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.3.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=430604f78bee72425da231d42eac9cee" DEPENDS += "python3-six-native" -SRC_URI[sha256sum] = "6f46f55b41875e5ac41ba660f514f4bb7a732811e303f671b76f310906355089" +SRC_URI[sha256sum] = "0816a644d0ecc74b488ba9f46f8d6662c4a7272a493f184d2c81c6717fb62355" S = "${WORKDIR}/pymodbus-${PV}" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch new file mode 100644 index 0000000000..9b5d9d6364 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch @@ -0,0 +1,60 @@ +From afb778669efbc658a29e6bdb1c4834fee42931aa Mon Sep 17 00:00:00 2001 +From: Robert Grant <rgrant@mdi.us.com> +Date: Wed, 10 Sep 2014 14:56:33 -0400 +Subject: [PATCH] Fixed relative imports + +Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> + +--- +Upstream-Status: Accepted + + pynetlinux/__init__.py | 8 ++++---- + pynetlinux/brctl.py | 2 +- + pynetlinux/tap.py | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/pynetlinux/__init__.py b/pynetlinux/__init__.py +index dbbf392..b6e1b8e 100644 +--- a/pynetlinux/__init__.py ++++ b/pynetlinux/__init__.py +@@ -2,7 +2,7 @@ + # import pylinux + # does a reasonable thing. + +-import brctl +-import ifconfig +-import tap +-import route ++from . import brctl ++from . import ifconfig ++from . import tap ++from . import route +diff --git a/pynetlinux/brctl.py b/pynetlinux/brctl.py +index f54d176..a8b926e 100644 +--- a/pynetlinux/brctl.py ++++ b/pynetlinux/brctl.py +@@ -3,7 +3,7 @@ import fcntl + import os + import struct + +-import ifconfig ++from . import ifconfig + + SYSFS_NET_PATH = "/sys/class/net" + +diff --git a/pynetlinux/tap.py b/pynetlinux/tap.py +index 0a0d59c..3f8ad3a 100644 +--- a/pynetlinux/tap.py ++++ b/pynetlinux/tap.py +@@ -2,7 +2,7 @@ import fcntl + import os + import struct + +-import ifconfig ++from . import ifconfig + + # From linux/if_tun.h + +-- +2.39.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb index a5ac74fd68..b1abac17aa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb @@ -7,6 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=74e1861736ee959824fe7542323c12e9" SRC_URI[sha256sum] = "4ad08298c9f5ba15a11cddc639ba8778cabdfc402b51066d9e0a325e5a5b391c" -SRC_URI += "file://0001-setup.py-switch-to-setuptools.patch" +SRC_URI += " \ + file://0001-setup.py-switch-to-setuptools.patch \ + file://0002-Fixed-relative-imports.patch \ +" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-fcntl \ + python3-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb new file mode 100644 index 0000000000..9e30f67dc6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pypng_0.20220715.0.bb @@ -0,0 +1,8 @@ +SUMMARY = "PNG module for Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=5b60f319c8cf51f825b4f40aadee3243" + +SRC_URI[sha256sum] = "739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1" + +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.5.0.bb index f67090da74..918911b663 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.5.0.bb @@ -10,7 +10,13 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "9859d1591c1863414d875ae0759e72c2cffc01ab989dc64137fbac572cc81bf6" -RDEPENDS:${PN} = "${PYTHON_PN}-certifi proj" +RDEPENDS:${PN} = " \ + python3-certifi \ + python3-compression \ + python3-json \ + python3-logging \ + python3-profile \ +" export PROJ_INCDIR = "${STAGING_INCDIR}" export PROJ_LIBDIR = "${STAGING_LIBDIR}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb index 32938421d9..9887af78d0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb @@ -8,3 +8,9 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-logging \ + python3-packaging \ + python3-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb index bce1e2fd14..801233a026 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrad_2.4.bb @@ -9,3 +9,11 @@ SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c4 SRC_URI += "file://use-poetry-core.patch" inherit pypi python_poetry_core + +RDEPENDS:${PN} += " \ + python3-crypt \ + python3-io \ + python3-logging \ + python3-netaddr \ + python3-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb index fa5b3a522a..8c192d296c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.19.bb @@ -8,29 +8,30 @@ SRC_URI[sha256sum] = "45460d12ed2a5caf272a357a3360b36d1e346f17afe1425b66fc21d70f inherit setuptools3 pypi ptest RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-unixadmin \ + python3-ctypes \ + python3-distutils \ + python3-io \ + python3-json \ + python3-fcntl \ + python3-logging \ + python3-multiprocessing \ + python3-pickle \ + python3-pkgutil \ + python3-pprint \ + python3-shell \ + python3-unixadmin \ " SRC_URI += " \ - file://run-ptest \ + file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ + python3-pytest \ + python3-fcntl \ " do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.10.0.bb index c4e672f333..bf5bc250a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.10.0.bb @@ -18,6 +18,12 @@ inherit setuptools3 ptest DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-pytest \ + python3-unittest \ +" + S = "${WORKDIR}/git" do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb index 9dd9b14809..e67e792f7e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.18122.bb @@ -6,3 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI[sha256sum] = "1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb index 286e9672b1..abe3529119 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb @@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d inherit pypi setuptools3 -RDEPENDS:${PN} += "libusb1" +RDEPENDS:${PN} += "python3-ctypes" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb index 8c0429bbb1..204f4eceec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb @@ -8,4 +8,9 @@ SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b3 inherit pypi setuptools3 -RDEPENDS:${PN} = "python3-six python3-pillow" +RDEPENDS:${PN} = " \ + python3-six \ + python3-pillow \ + python3-pypng \ + python3-typing-extensions \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb index b0d19c31ad..79a38983de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb @@ -11,3 +11,8 @@ SRC_URI[sha256sum] = "3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c PYPI_PACKAGE = "raven" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-json \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.5.bb index 40210b5e25..eb407a2a15 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.5.5.bb @@ -8,9 +8,11 @@ SRC_URI[sha256sum] = "dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443 inherit pypi setuptools3 -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-asyncio \ +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-compression \ + python3-cryptography \ + python3-datetime \ + python3-json \ + python3-packaging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.5.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.6.3.bb index ddd8402465..f653f32fe2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.5.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.6.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "7d76a8a1fc9da08296462a18f16620ba73bcbf5909e42383b253ef34d9d5141e" +SRC_URI[sha256sum] = "72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb index dc1961ac30..ebf000135a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb @@ -17,3 +17,5 @@ SRC_URI[sha256sum] = "73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c5 SRC_URI += "file://0001-setup.py-switch-to-setuptools.patch" inherit setuptools3 pypi + +RDEPENDS:${PN} += "python3-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.25.0.bb index 9e4b87da99..10e77ae60a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.24.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.25.0.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ " -SRC_URI[sha256sum] = "0bbcecda9f51936904c1030e7fef0fe693e633888f02a14d1cb68646a50e83b3" +SRC_URI[sha256sum] = "5be3296fc574fa8a4d9b213b4dcf8c8d0246c08f8bd78315c6286f386c37555a" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb index 0210a5de22..2d4145ef12 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb @@ -14,6 +14,12 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-attr \ + python3-cryptography \ + python3-pyasn1-modules \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snagboot_1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snagboot_1.0.bb new file mode 100644 index 0000000000..1853596b46 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-snagboot_1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Snagboot intends to be an open-source replacement vendor-specific tools used to recover and/or reflash embedded platforms." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI[sha256sum] = "c2d21cadddecfd97dd62a8b66b6f88bd56272627b9b71272e9dda6f868ee8715" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += " \ + bash \ + python3-fcntl \ + python3-pyusb \ + python3-pyyaml \ + python3-setuptools \ + python3-six \ +" + +do_install:append() { + install -D -m 0644 ${S}/src/snagrecover/80-snagboot.rules ${D}${sysconfdir}/udev/rules.d/80-snagboot.rules +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.15.bb index 3af41bed29..e6f0d64293 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.15.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.15.bb @@ -10,14 +10,16 @@ PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-profile \ + python3-asyncio \ + python3-compression \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-pickle \ + python3-profile \ + python3-threading \ + python3-typing-extensions \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb index 592ba72043..e7f329e9bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlsoup_0.9.1.bb @@ -7,3 +7,5 @@ PYPI_PACKAGE = "sqlsoup" SRC_URI[sha256sum] = "2fafb7732a663dcd59b37e64d1c94d5fb20d4fad32cd8ee260aa1cd9a10340d6" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-sqlalchemy" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb index 4d62471ed7..21e4b77378 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb @@ -11,7 +11,9 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815" RDEPENDS:${PN} = " \ - python3-executing \ - python3-asttokens \ - python3-pure-eval \ + python3-asttokens \ + python3-executing \ + python3-html \ + python3-logging \ + python3-pure-eval \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.bb index bfb0985ef6..088dda3a2a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.bb @@ -7,6 +7,9 @@ SRC_URI[sha256sum] = "ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49 inherit pypi setuptools3 -RDEPENDS:${PN} += "python3-mpmath" +RDEPENDS:${PN} += " \ + python3-misc \ + python3-mpmath \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb index 71a43c4551..5ec7e6e9af 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.11.8.bb @@ -11,6 +11,12 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-profile \ + python3-stringold \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-poetry-core \ ${PYTHON_PN}-pytest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.3.bb index 1535214b7c..af5009b6ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.3.bb @@ -11,11 +11,24 @@ SRC_URI[sha256sum] = "d68f3192936ff2c4add04dc21a436a43b4408d466746b78bb2b9d0a53a inherit pypi setuptools3 # Requires _compression which is currently located in misc -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ - ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ - ${PYTHON_PN}-ctypes ${PYTHON_PN}-misc" +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-certifi \ + python3-compression \ + python3-ctypes \ + python3-email \ + python3-html \ + python3-json \ + python3-misc \ + python3-multiprocessing \ + python3-numbers \ + python3-pkgutil \ + python3-pycurl \ + python3-threading \ + python3-unittest \ +" -RDEPENDS:${PN}-test += "${PN} ${PYTHON_PN}-unittest" +RDEPENDS:${PN}-test += "python3-unittest" PACKAGES =+ "\ ${PN}-test \ @@ -23,5 +36,4 @@ PACKAGES =+ "\ FILES:${PN}-test = " \ ${libdir}/${PYTHON_DIR}/site-packages/*/test \ - ${libdir}/${PYTHON_DIR}/site-packages/*/testing.py* \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb index 641512c46c..6f31aea0e0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_0.9.0.bb @@ -14,6 +14,13 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-cryptography \ + python3-datetime \ + python3-idna \ + python3-io \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-service-identity \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb index f45772d507..a8ad4bbdfb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb @@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "b09d8bb50d33b23ff34cafb1f9209f858f752935c6a5c901efb92a41ac inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "python3-ctypes" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb index 54ba6120a8..ca17e2b135 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.0.0.bb @@ -11,6 +11,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-compression \ + python3-unittest \ +" + RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ ${PYTHON_PN}-typing-extensions \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb index 49955c97e6..7db7c8059a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-uefi-firmware_1.10.bb @@ -15,3 +15,8 @@ SRCREV = "dfb15b068960b771e2e1536d34790dac9b5bfe32" S = "${WORKDIR}/git" inherit setuptools3 + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-uswid_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-uswid_git.bb index 6b2089893f..40adc34c10 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-uswid_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-uswid_git.bb @@ -4,6 +4,12 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-or-later" DEPENDS += " python3-cbor2 python3-lxml python3-pefile" +RDEPENDS:${PN} += " \ + python3-cbor2 \ + python3-json \ + python3-lxml \ + python3-netclient \ +" LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" SRC_URI = "git://github.com/hughsie/python-uswid.git;branch=main;protocol=https" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb index ea40d5f6bb..02639b5900 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb @@ -8,3 +8,5 @@ SRC_URI[md5sum] = "602b7db8eea30dd29a1d451997adf251" SRC_URI[sha256sum] = "a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-setuptools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb index 3c617b2163..088bfd504e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.3.0.bb @@ -13,6 +13,8 @@ RDEPENDS:${PN} += " \ python3-distutils \ python3-eth-account \ python3-idna \ + python3-jsonschema \ + python3-google-api-core \ python3-lru-dict \ python3-requests \ python3-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb index 92dbd20ca1..e6971c8297 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_11.0.3.bb @@ -10,6 +10,7 @@ SRC_URI[sha256sum] = "88fc51d9a26b10fc331be344f1781224a375b78488fc343620184e95a4 BBCLASSEXTEND = "native nativesdk" -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ +RDEPENDS:${PN} = " \ + python3-asyncio \ + python3-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index da0dc26715..5e63d3c307 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -20,10 +20,16 @@ inherit ptest setuptools3 PIP_INSTALL_PACKAGE = "xlrd" PIP_INSTALL_DIST_PATH = "${S}/dist" -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" +RDEPENDS:${PN} += " \ + python3-compression \ + python3-io \ + python3-mmap \ + python3-pprint \ + python3-shell \ +" RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.2.bb index ff3a622810..805a3b7dd1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.2.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "03459ee76f664470c4c63a8977cab624fb259d0fc1faac64dc9cc6f3cc08f945" +SRC_URI[sha256sum] = "78751099a770273f1c98b8d6643351f68f98ae8e6acf9d09d37dc6798f8cd3de" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb index e81e4dabee..7259c3fad3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb @@ -7,3 +7,5 @@ SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-unittest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.62.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.63.0.bb index 6e82c6831b..6f3dbd5220 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.62.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.63.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" -SRC_URI[sha256sum] = "c51340a8a7f13d7265dcc582c4a97907c11e4f3d23d5234d3c2c0e44fb446717" +SRC_URI[sha256sum] = "2643b1c9c6ffdfaa1313cf3d12ea0099482fcb3da77929a08be87fc8354d0b3d" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb index f9b4b64a50..aba1d8fff3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb @@ -14,8 +14,7 @@ SRC_URI = "git://github.com/gt3389b/python-cson.git;branch=master;protocol=https S = "${WORKDIR}/git" -RDEPENDS:${PN}:class-native = "" -DEPENDS:append:class-native = " python-native " +RDEPENDS:${PN} = "python3-json" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb index 9dd362766d..7a0d3987d2 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.12.0.bb @@ -17,7 +17,10 @@ DEPENDS += "parted" RDEPENDS:${PN}:class-target += " \ parted (>= 2.3) \ - python3-stringold python3-codecs python3-math \ + python3-codecs \ + python3-math \ + python3-numbers \ + python3-stringold \ " RDEPENDS:${PN}:class-native = "" diff --git a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.3.5.bb b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.4.1.bb index cedbed3ca8..09882e6290 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.3.5.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.4.1.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" -SRC_URI[sha256sum] = "2d11b9b8dd03868f09b4fffadc84a6a8cda574e40dc90821bd845720ebb8e89c" +SRC_URI[sha256sum] = "76f6b65ea7e5c5d924ba80e322231d7cb5b5981aa60bfc1e694f1bc097fe6fe1" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb index 963351a2e2..a20b0194f8 100644 --- a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.8.0.bb @@ -7,3 +7,5 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d" PYPI_PACKAGE = "Send2Trash" + +RDEPENDS:${PN} += "python3-datetime" diff --git a/meta-openembedded/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb b/meta-openembedded/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb index f2c0d2ee13..0bf1ff14a8 100644 --- a/meta-openembedded/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb +++ b/meta-openembedded/meta-python/recipes-networking/python/python3-ldap_3.4.3.bb @@ -22,8 +22,9 @@ do_configure:prepend() { } RDEPENDS:${PN} = " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ + python3-pprint \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-threading \ + python3-unittest \ " diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index d3e22757c4..ee5dc16198 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -39,6 +39,10 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" +do_configure:append() { + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h +} + do_install:append() { rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log rmdir --ignore-fail-on-non-empty ${D}${localstatedir} |