diff options
Diffstat (limited to 'meta-openembedded')
227 files changed, 2376 insertions, 1478 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.5.bb index 3a655f6509..00e5bec329 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.5.bb @@ -7,9 +7,9 @@ DEPENDS = "glib-2.0 gtk+3 libxml2" inherit meson pkgconfig gobject-introspection features_check gtk-doc -SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=libgedit-gtksourceview-299-0" S = "${WORKDIR}/git" -SRCREV = "7062264d635f6efe04d88217a893a97ff385b873" +SRCREV = "7e2179a8ff3022edad27e2d57744876d125cb040" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch deleted file mode 100644 index 61cd3b1809..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex/0001-gtkhex-Local-variables-in-switch-statement-should-be.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b00b8332ab19e41c75ce143f45ab4585502c020b Mon Sep 17 00:00:00 2001 -From: Logan Rathbone <poprocks@gmail.com> -Date: Tue, 24 Oct 2023 14:06:04 -0400 -Subject: [PATCH] gtkhex: Local variables in switch statement should be in own - scope - -Fixes: #74 - -Thanks to: David C. Manuelda - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/ghex/-/commit/b00b8332ab19e41c75ce143f45ab4585502c020b] ---- - src/gtkhex.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gtkhex.c b/src/gtkhex.c -index b401cd9..18e0433 100644 ---- a/src/gtkhex.c -+++ b/src/gtkhex.c -@@ -1941,6 +1941,7 @@ key_press_cb (GtkEventControllerKey *controller, - break; - - case GDK_KEY_Home: -+ { - gint64 line_beg = self->cursor_pos; - - while (line_beg % self->cpl != 0) -@@ -1948,9 +1949,11 @@ key_press_cb (GtkEventControllerKey *controller, - - hex_widget_set_cursor (self, line_beg); - ret = GDK_EVENT_STOP; -+ } - break; - - case GDK_KEY_End: -+ { - gint64 line_end = self->cursor_pos; - - while (line_end % self->cpl != self->cpl - 1) -@@ -1958,6 +1961,7 @@ key_press_cb (GtkEventControllerKey *controller, - - hex_widget_set_cursor (self, MIN (line_end, payload_size)); - ret = GDK_EVENT_STOP; -+ } - break; - - default: --- -2.42.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb index 42c53471bb..2b6adaf91c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb @@ -15,7 +15,6 @@ GIR_MESON_DISABLE_FLAG = 'disabled' inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen -SRC_URI += "file://0001-gtkhex-Local-variables-in-switch-statement-should-be.patch" -SRC_URI[archive.sha256sum] = "05cecc4561ca40b257c5db31da9f68d696133efc0ae427ed82fb985a986e840e" +SRC_URI[archive.sha256sum] = "fb2b0823cd16249edbeaee8302f9bd5005e0150368b35f1e47c26680cacac2fa" FILES:${PN} += "${libdir} ${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.2.bb index 8402fcea91..d146bc4bd7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.2.bb @@ -38,7 +38,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] = "d286c7627150e112aacbb4b7b91717fad8e89076061479dfc610b2dd744b577a" +SRC_URI[archive.sha256sum] = "0cfa3c332d6edacb73d06c6b26ffca1078e86ff59eac819b2931e0967753df70" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_45.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_45.2.bb index cfc01c7daf..49cd6b8106 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_45.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_45.2.bb @@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "242e15a0c06e820c3fd8dd6aeac1a8ef865ce58882e5975af1d65934bb4d4261" +SRC_URI[archive.sha256sum] = "ee32f6387a2d18adbff7a956689bc747866b4a8712d73790c002abeae4ccaaaf" EXTRA_OEMESON += " \ -Dextension_set=all \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.3.bb index d35437cb51..1dd043ec82 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.3.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] = "15fca4bd6129a8b3f990197fbd1ee58d74b641510afaaf0882a7fa36634fc5f2" +SRC_URI[archive.sha256sum] = "3a19724720d8274dc6bced68e0dd5fc7668a04cd79978cbbb8223474ccdda9ab" 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/gnome-software/gnome-software_45.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.3.bb index fc2b696aa0..4beb79f1b9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.3.bb @@ -32,7 +32,7 @@ SRC_URI += " \ file://0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch \ file://e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch \ " -SRC_URI[archive.sha256sum] = "0bdd8fc0caecd6eb013c6010dbca93077397118a6ef5eaf264e2a820a292f5b7" +SRC_URI[archive.sha256sum] = "d6b9245b22237da7bd1739dd28c23cc8f3835f99fa10c1037d9dd7635335251c" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch new file mode 100644 index 0000000000..9f8475bdd2 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch @@ -0,0 +1,63 @@ +From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 7 Jan 2024 10:40:31 +0100 +Subject: [PATCH] meson: add an option to set dbus_interface_dir + +Add an option that allows to set the dbus_interface_dir path manually. +This will help to cross-compile gnome-terminal on host systems that +don't have gnome-shell installed. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8046] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson_options.txt | 7 +++++++ + src/meson.build | 7 ++++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/meson_options.txt b/meson_options.txt +index b555ab66..8fece058 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -13,6 +13,13 @@ + # You should have received a copy of the GNU General Public License + # along with this programme. If not, see <https://www.gnu.org/licenses/>. + ++option( ++ 'dbus_interface_dir', ++ type: 'string', ++ value: '', ++ description: 'directory for D-Bus session interface files [$datadir/dbus-1/interfaces]', ++) ++ + option( + 'dbg', + type: 'boolean', +diff --git a/src/meson.build b/src/meson.build +index 27ecd893..420ad45c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,6 +185,11 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source + + if get_option('search_provider') + ++ dbus_interface_dir = get_option('dbus_interface_dir') ++ if dbus_interface_dir == '' ++ dbus_interface_dir = gt_prefix / gt_dbusinterfacedir ++ endif ++ + server_sources += files( + 'terminal-search-provider.cc', + 'terminal-search-provider.hh', +@@ -192,7 +197,7 @@ if get_option('search_provider') + + server_sources += gnome.gdbus_codegen( + 'terminal-search-provider-gdbus-generated', +- gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml', ++ dbus_interface_dir / 'org.gnome.ShellSearchProvider2.xml', + autocleanup: 'none', + install_header: false, + interface_prefix: 'org.gnome.Shell', +-- +2.43.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb index 8616f2c9b0..53f11e95fb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb @@ -19,15 +19,17 @@ DEPENDS = " \ libpcre2 \ " -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \ - file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - " +SRC_URI = " \ + git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \ + file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ + file://0001-meson-add-option-to-set-dbus_interfacedir.patch \ +" SRCREV = "5ac3b8e4bd6fa02651b3c23cedb0a7e1cd769655" S = "${WORKDIR}/git" PACKAGECONFIG ?= "" PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus" -PACKAGECONFIG[search_provider] = "-Dsearch_provider=true,-Dsearch_provider=false,,gnome-shell" +PACKAGECONFIG[search_provider] = "-Dsearch_provider=true -Ddbus_interface_dir=${STAGING_DATADIR}/dbus-1/interfaces,-Dsearch_provider=false,gnome-shell" FILES:${PN} += " \ ${datadir} \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.3.bb index 6093a0fe92..85bfdd5289 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.3.bb @@ -24,7 +24,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "2cd3c5efb22db76c79311cb1889a1aab2feb35b4a4dd03f3822aab7999da212c" +SRC_URI[archive.sha256sum] = "b78aea7f3e2bec8322a2af0404716be2269905c7d50c04b0b2a71a38814fcd01" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb index a151f3ca4c..50e5eaa79f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb @@ -17,7 +17,7 @@ DEPENDS = " \ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" GTKIC_VERSION = "4" -SRC_URI[archive.sha256sum] = "0b8c8def18dab05cc49bd464b90ca7f945ae52ff5e09242da702a15d94d3e8dd" +SRC_URI[archive.sha256sum] = "0c2f537813b10f728470d9d05d6c95713db2512f9c95096e1e85b1a6739605e6" PACKAGECONFIG ?= "webkitgtk" PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" diff --git a/meta-openembedded/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb b/meta-openembedded/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.5.bb index 1c03f41c29..7f9bb2638e 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.5.bb @@ -8,4 +8,4 @@ DEPENDS = "glib-2.0" inherit gnomebase gobject-introspection vala -SRC_URI[archive.sha256sum] = "e3d7160c3e45fe3216c07c7988bb4fc81397c32d1fc6113af0edfe8632039f65" +SRC_URI[archive.sha256sum] = "b987456eddaf715ba9d623aa2bc501ab1b697dffeb11aaa783a637275df186da" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index 6797899808..444bc1cf39 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -61,7 +61,7 @@ RDEPENDS:${PN} += "python3-requests python3-pillow \ python3-xxhash python3-pako \ python3-six python3-cryptography \ python3-requests-futures \ - python3-xmlrunner python3-fasteners \ + python3-fasteners \ python3-python-vlc \ python3-padatious python3-padaos \ python3-petact python3-precise-runner \ 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 ead875824d..cee9078844 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 @@ -11,7 +11,7 @@ inherit autotools gettext pkgconfig python3native features_check REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native" +DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native python3-setuptools-native" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}" PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd" diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt index fa960ea2b9..ea561073ed 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt index fa960ea2b9..ea561073ed 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt index 19d0b6f765..5655a65852 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt index 19d0b6f765..5655a65852 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt index 19d0b6f765..5655a65852 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt index 19d0b6f765..5655a65852 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt index aa87368802..84816e06f5 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt index 407e4154c2..cdf7169cb0 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt index 407e4154c2..cdf7169cb0 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt index aa87368802..84816e06f5 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt index e94a5a4731..c563a27967 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt index a5c0d0d61e..31a27e2464 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt index a5c0d0d61e..31a27e2464 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt index 19d0b6f765..5655a65852 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt @@ -43,6 +43,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt index fa960ea2b9..ea561073ed 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt index fa960ea2b9..ea561073ed 100644 --- a/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt +++ b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt @@ -42,6 +42,6 @@ Checking errno of iconv for illegal multibyte sequence: NO Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK Checking value of GNUTLS_MAC_AES_CMAC_128: OK Checking whether fcntl supports flags to send direct I/O availability signals: NO -Checking whether fcntl supports setting/geting hints: NO +Checking whether fcntl supports setting/getting hints: NO Checking for readlink breakage: NO Checking for gnutls fips mode support: NO diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index c5499ffeeb..66ad83f711 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -25,7 +25,8 @@ EXTRA_OECONF = "--enable-nfq-module --disable-ipq-module --includedir=${included PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -inherit autotools +inherit autotools multilib_script +MULTILIB_SCRIPTS += "${PN}:${bindir}/daq-modules-config " DISABLE_STATIC = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch index 9f597bee2d..a498348c20 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch @@ -1,4 +1,4 @@ -From f6fa33bfc2e1272198db6ea08910b4162b364b18 Mon Sep 17 00:00:00 2001 +From 5c5418038e392cc00d3293e00ea0cd20b5e19c9a Mon Sep 17 00:00:00 2001 From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Mon, 18 Apr 2016 17:00:53 -0400 Subject: [PATCH] Don't check xsltproc manpages @@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript -index 60bb7cf..b7b0152 100644 +index ed5d45f..de3c648 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -144,7 +144,7 @@ def configure(conf): @@ -29,7 +29,7 @@ index 60bb7cf..b7b0152 100644 # we need this for the ldap backend if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): diff --git a/lib/talloc/wscript b/lib/talloc/wscript -index 3089663..76cd65e 100644 +index 075f1ec..9bd9f73 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -48,7 +48,7 @@ def configure(conf): @@ -42,7 +42,7 @@ index 3089663..76cd65e 100644 conf.CHECK_HEADERS('sys/auxv.h') conf.CHECK_FUNCS('getauxval') diff --git a/lib/tdb/wscript b/lib/tdb/wscript -index 71ada31..accd474 100644 +index 5e6a928..f13cf2a 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -95,7 +95,7 @@ def configure(conf): diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch index 3b02690926..b0ad5c4142 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch @@ -1,4 +1,4 @@ -From f7b8e2e149b06a8033e31f4242c392573fa9ab52 Mon Sep 17 00:00:00 2001 +From ba492aead265edfd1da2a6c45dd7661c248309cb Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 25 Jun 2019 14:25:08 +0800 Subject: [PATCH] do not import target module while cross compile @@ -6,18 +6,18 @@ Subject: [PATCH] do not import target module while cross compile Some modules such as dynamic library maybe cann't be imported while cross compile, we just check whether does the module exist. +Upstream-Status: Pending + Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> update to version 4.10.5, and switch to python3 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- -Upstream-Status: Pending - buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 7d2d855..01dcb56 100644 +index 2300565..26d9e8c 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -4,6 +4,7 @@ import sys @@ -28,7 +28,7 @@ index 7d2d855..01dcb56 100644 def PRIVATE_NAME(bld, name): '''possibly rename a library to include a bundled extension''' -@@ -241,17 +242,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): +@@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): # versions minversion = minimum_library_version(conf, libname, minversion) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch index f2e25eb105..2c9d29c9fe 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch @@ -1,4 +1,4 @@ -From 556bb3cf17ccdf0b0ee0d82801c4b20cf0990ae4 Mon Sep 17 00:00:00 2001 +From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 20 Jun 2019 14:11:16 +0800 Subject: [PATCH] Add config option without-valgrind @@ -9,38 +9,44 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Update patch to version 4.10.5 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 4.19.3 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- lib/replace/wscript | 5 +++-- - wscript | 4 ++++ - 2 files changed, 7 insertions(+), 2 deletions(-) + wscript | 7 +++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 2f17999..9ef9bd9 100644 +index 37d7759..9dd9b48 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -114,8 +114,9 @@ def configure(conf): +@@ -113,8 +113,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -+ if not Options.options.disable_valgrind: +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') ++ if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') diff --git a/wscript b/wscript -index 3af4207..54d7e9e 100644 +index 95ddd9e..6d9577a 100644 --- a/wscript +++ b/wscript -@@ -116,6 +116,10 @@ def options(opt): - help=("Disable RELRO builds"), - action="store_false", dest='enable_relro') +@@ -123,6 +123,13 @@ def options(opt): + help=('Disable kernely keyring support for credential storage'), + action='store_false', dest='enable_keyring') ++ opt.add_option('--with-valgrind', ++ help=("Enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') + opt.add_option('--without-valgrind', -+ help=("Disable use of the valgrind headers"), -+ action="store_true", dest='disable_valgrind', default=False) ++ help=("Disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) + gr = opt.option_group('developer options') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch index 2b0fbff8e7..c72bd133ee 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch @@ -1,9 +1,10 @@ -From 515f2455b4b69f5fcd2c61a532663280785db737 Mon Sep 17 00:00:00 2001 +From d302d9a4ac6eb2bbafd248064a878ba287d636b8 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Tue, 28 Apr 2020 02:05:33 +0200 Subject: [PATCH] Add options to configure the use of libbsd Upstream-Status: Inappropriate [oe deterministic build specific] + Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Rebase to 4.14.4 @@ -15,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index 8729b08..1c55428 100644 +index 30cb366..d167551 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), @@ -33,10 +34,10 @@ index 8729b08..1c55428 100644 gr.add_option('-C', diff --git a/lib/replace/wscript b/lib/replace/wscript -index 9ef9bd9..d47de4f 100644 +index 9dd9b48..a22ae59 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -439,20 +439,21 @@ def configure(conf): +@@ -444,20 +444,21 @@ def configure(conf): strlcpy_in_bsd = False diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch index e1b5fac0d0..53ef21948a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From a8b4a40b535a2c69eb408f649e7169bcc1975fc1 Mon Sep 17 00:00:00 2001 +From d2a2d0f82a37d0bf21123671774b0b03ffa976cf Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -46,10 +46,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch index cc4c15e099..13fbd35950 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-smbtorture-skip-test-case-tfork_cmd_send.patch @@ -1,4 +1,4 @@ -From 950b5977ea7e72343067d0070cc35fb0dc5163d4 Mon Sep 17 00:00:00 2001 +From 4fd04fc7c94d6981f3409d088ab8d32c48460010 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Thu, 25 Aug 2022 16:46:04 +0800 Subject: [PATCH] smbtorture: skip test case tfork_cmd_send diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch index 45a7c82d80..e3506adfb7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch @@ -1,4 +1,4 @@ -From f783bb9c87ce11e824dfefca473d0dcf6edad238 Mon Sep 17 00:00:00 2001 +From bf5552f937c745940081e29ef32d52ae26bfd8c1 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@fujitsu.com> Date: Sun, 30 Oct 2022 11:59:31 +0900 Subject: [PATCH] Deleted settiong of python to fix the install conflict error @@ -22,7 +22,8 @@ sys.path.insert(0, "/usr/lib/python3.10/site-packages") But this setting is for environment when running from source tree. There is no necessary on target. -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> --- source4/scripting/bin/samba-gpupdate | 1 - @@ -47,7 +48,7 @@ index 4b3f057..08fec2d 100755 import optparse from samba import getopt as options diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool -index f8a70a6..3c818de 100755 +index b02ad4d..f69ae10 100755 --- a/source4/scripting/bin/samba-tool +++ b/source4/scripting/bin/samba-tool @@ -22,7 +22,6 @@ @@ -59,7 +60,7 @@ index f8a70a6..3c818de 100755 # make sure the script dies immediately when hitting control-C, # rather than raising KeyboardInterrupt. As we do all database diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate -index 1ce53f5..2cdfbf8 100755 +index 69821e2..4037870 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -36,7 +36,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' @@ -95,7 +96,7 @@ index 67d801e..2fc0d6a 100755 import optparse import time diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate -index 84ff771..b6fe041 100755 +index b421886..5e18ad9 100755 --- a/source4/scripting/bin/samba_spnupdate +++ b/source4/scripting/bin/samba_spnupdate @@ -32,7 +32,6 @@ os.environ['PYTHONUNBUFFERED'] = '1' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch index 9a83574e66..0c967be62f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch @@ -1,4 +1,4 @@ -From 08003ea30d86a8b983be89f6a161d3baacdaa038 Mon Sep 17 00:00:00 2001 +From e5d9527e6b3b386229747f799c725fcd68bc5228 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 6 Nov 2016 23:40:54 -0800 Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() @@ -7,15 +7,15 @@ Subject: [PATCH] Musl does not have _r versions of getent() and getpwent() Taken from gentoo http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.3.9-remove-getpwent_r.patch -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- source4/torture/local/nss_tests.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2943122..bc185ca 100644 +index e911aa2..2b39b74 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c @@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 9bf1f9757c..4fcbb47572 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -1,22 +1,22 @@ -From 6822c61ade5617c9f109e32ad4cdc115fa9e12c8 Mon Sep 17 00:00:00 2001 +From c533bdced677e2104565fc06602e7e63d9c79ac0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 6 Nov 2016 23:40:54 -0800 Subject: [PATCH] Lifted from gentoo and ported to 4.4.5 http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- source3/wscript | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/source3/wscript b/source3/wscript -index 22be17a..ee9ce52 100644 +index b7f96f3..ed12b1e 100644 --- a/source3/wscript +++ b/source3/wscript -@@ -862,7 +862,7 @@ msg.msg_accrightslen = sizeof(fd); +@@ -863,7 +863,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -25,7 +25,7 @@ index 22be17a..ee9ce52 100644 use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -939,6 +939,17 @@ int i; i = PAM_RADIO_TYPE; +@@ -940,6 +940,17 @@ int i; i = PAM_RADIO_TYPE; "or headers not found. Use --without-pam to disable " "PAM support."); diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.9.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.3.bb index 73ceb7b754..4828526edf 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.9.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.3.bb @@ -31,9 +31,9 @@ SRC_URI:append:libc-musl = " \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[sha256sum] = "f455c1d6351ed3a36fc2cb6e8ab1bfd0effe54a56686ffd495d64ab52d50f245" +SRC_URI[sha256sum] = "280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96" -UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" +UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version pkgconfig @@ -85,7 +85,7 @@ PACKAGECONFIG[sasl] = ",,cyrus-sasl" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" PACKAGECONFIG[lttng] = "--with-lttng,--without-lttng,lttng-ust" PACKAGECONFIG[archive] = "--with-libarchive,--without-libarchive,libarchive" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.6.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.6.6.bb index a4f42e7bf4..4f7c6c357d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.6.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.6.6.bb @@ -13,7 +13,7 @@ PROVIDES += "cyassl" RPROVIDES:${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" -SRCREV = "37884f864d6fd9b04f44677cb04da15d0c9d6526" +SRCREV = "66596ad9e1d7efa8479656872cf09c9c1870a02e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb index dd193b12fc..85f4a6aa59 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb @@ -41,7 +41,11 @@ do_install:append() { fi } +PACKAGE_BEFORE_PN = "${PN}-samples" + FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" +FILES:${PN}-samples = "${sysconfdir}/keepalived/samples ${sysconfdir}/keepalived/keepalived.conf.sample" + SYSTEMD_SERVICE:${PN} = "keepalived.service" SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.5.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.6.bb index 8d5d1a3849..e5053f092c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.6.bb @@ -25,7 +25,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[sha256sum] = "99acd54ec9d68b2a9080d19fcc43eca1a245146cf162dbba689510d01e6d0f25" +SRC_URI[sha256sum] = "bc73ce506050334f51441f9054ffba4eb7cfd365a5e98a6d178b8263b9222f40" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch b/meta-openembedded/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch new file mode 100644 index 0000000000..ac758cc39d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/files/musl-__wordsize.patch @@ -0,0 +1,41 @@ +The definition of __WORDSIZE is found in <sys/reg.h> + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/usr/iscsi/iscsid.h ++++ b/usr/iscsi/iscsid.h +@@ -22,6 +22,9 @@ + #include <stdint.h> + #include <inttypes.h> + #include <netdb.h> ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + + #include "transport.h" + #include "list.h" +--- a/usr/tgtd.h ++++ b/usr/tgtd.h +@@ -1,6 +1,9 @@ + #ifndef __TARGET_DAEMON_H + #define __TARGET_DAEMON_H + ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + #include "log.h" + #include "scsi_cmnd.h" + #include "tgtadm_error.h" +--- a/usr/util.h ++++ b/usr/util.h +@@ -19,6 +19,9 @@ + #include <linux/fs.h> + #include <sys/types.h> + #include <sys/stat.h> ++#if !defined(__GLIBC__) ++#include <sys/reg.h> ++#endif + + #include "be_byteshift.h" + diff --git a/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_git.bb b/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb index c74ebb2a6d..35995f7876 100644 --- a/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_git.bb +++ b/meta-openembedded/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb @@ -4,13 +4,13 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" DEPENDS = "sg3-utils libaio" -SRCREV = "a6bd1f0578bf85788a1563cbfb42a75e500d5318" -PV = "1.0.83" +SRCREV = "df991fa788e22cd8b8e3013cfae306988c19c3d0" SRC_URI = "git://github.com/fujita/tgt.git;branch=master;protocol=https \ - file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ + file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ file://0001-usr-Makefile-WARNING-fix.patch \ file://usr-Makefile-apply-LDFLAGS-to-all-executables.patch \ + file://musl-__wordsize.patch \ " SRC_URI += "file://tgtd.init \ file://tgtd.service \ @@ -19,8 +19,6 @@ SRC_URI += "file://tgtd.init \ S = "${WORKDIR}/git" -COMPATIBLE_HOST:libc-musl = "null" - CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf" inherit update-rc.d systemd @@ -30,6 +28,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "disable" CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"' +CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" #do_compile() { # oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts #} diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch index 1c7eb17b28..0ddcb642bc 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch @@ -1,4 +1,4 @@ -From e8a1b7a176398c2a9b5969f1b48ae0e1aa30f4ec Mon Sep 17 00:00:00 2001 +From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 2 Mar 2022 14:51:13 +0800 Subject: [PATCH] Fix pkgconfig dir for multilib @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index add3edda..fea80b4a 100644 +index ab399a69..beae6eaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -602,7 +602,7 @@ endif() +@@ -637,7 +637,7 @@ endif() # create pkg-config file if(NOT WIN32) configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY) diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch index c22ef697b2..bdaf343606 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch @@ -1,4 +1,4 @@ -From aea4c06ee2a0661d0c7b4773e846276a4f10e2e8 Mon Sep 17 00:00:00 2001 +From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 9 Mar 2022 11:48:44 +0800 Subject: [PATCH] Install example configuration files to /etc/vsomeip @@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fea80b4a..e7a92ec6 100644 +index beae6eaf..d791c12e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -501,7 +501,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) +@@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) endif () install ( diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch index 370d8a0fe0..09dab9a8b0 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch @@ -1,4 +1,4 @@ -From e012f91a73af7469ef6f660c3a6a752430a4d649 Mon Sep 17 00:00:00 2001 +From b1bf398015bc090020459954e5cd1ec3b51b8ac3 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Tue, 11 Jul 2023 16:53:46 +0800 Subject: [PATCH] Do not build external gtest @@ -10,15 +10,16 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - CMakeLists.txt | 30 ++---------- - test/network_tests/CMakeLists.txt | 80 ------------------------------- - 2 files changed, 3 insertions(+), 107 deletions(-) + CMakeLists.txt | 11 ---- + test/CMakeLists.txt | 22 +------ + test/network_tests/CMakeLists.txt | 99 ------------------------------- + 3 files changed, 3 insertions(+), 129 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e7a92ec6..f6c680d4 100644 +index d791c12e..f1bcba27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,14 +18,6 @@ set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP +@@ -18,17 +18,6 @@ set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in set (CMAKE_VERBOSE_MAKEFILE off) @@ -26,16 +27,23 @@ index e7a92ec6..f6c680d4 100644 - if (DEFINED ENV{GTEST_ROOT}) - set(GTEST_ROOT $ENV{GTEST_ROOT}) - else() -- set(GTEST_ROOT "n/a" CACHE STRING "Path to root folder of googletest. Must be set for building the tests.") +- include(FetchContent) +- FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG v1.14.0) +- FetchContent_Populate(googletest) +- set(GTEST_ROOT ${googletest_SOURCE_DIR}) - endif() -endif() - ################################################################################################### # see http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file ################################################################################################### -@@ -630,27 +622,11 @@ find_package(benchmark) - ############################################################################## - # google test +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index f66ac5d3..6f09bf40 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -17,27 +17,11 @@ find_package(benchmark) + # remove export symbols from the cxx flags + string(REPLACE "${EXPORTSYMBOLS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -# check for set environment variable -if(${GTEST_ROOT} STREQUAL "n/a") @@ -62,13 +70,13 @@ index e7a92ec6..f6c680d4 100644 - set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 0) -endif() - - + ############################################################################## + # build tests diff --git a/test/network_tests/CMakeLists.txt b/test/network_tests/CMakeLists.txt -index 6a148604..a501b6a7 100644 +index 883cc5cf..9a2a4f5e 100644 --- a/test/network_tests/CMakeLists.txt +++ b/test/network_tests/CMakeLists.txt -@@ -3633,86 +3633,6 @@ if(NOT ${TESTS_BAT}) +@@ -4116,105 +4116,6 @@ if(NOT ${TESTS_BAT}) endif() @@ -97,6 +105,12 @@ index 6a148604..a501b6a7 100644 - add_dependencies(${TEST_CLIENT_ID_UTILITY} gtest) - add_dependencies(${TEST_DEBOUNCE_CLIENT} gtest) - add_dependencies(${TEST_DEBOUNCE_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_FILTER_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_FILTER_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_CALLBACK_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_CALLBACK_SERVICE} gtest) +- add_dependencies(${TEST_DEBOUNCE_FREQUENCY_CLIENT} gtest) +- add_dependencies(${TEST_DEBOUNCE_FREQUENCY_SERVICE} gtest) - add_dependencies(${TEST_SUBSCRIBE_NOTIFY_SERVICE} gtest) - add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE} gtest) - add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT} gtest) @@ -127,8 +141,13 @@ index 6a148604..a501b6a7 100644 - add_dependencies(${TEST_E2E_PROFILE_04_SERVICE} gtest) - add_dependencies(${TEST_E2E_PROFILE_04_CLIENT} gtest) - endif() +- if (${TEST_E2E_PROFILE_07}) +- add_dependencies(${TEST_E2E_PROFILE_07_SERVICE} gtest) +- add_dependencies(${TEST_E2E_PROFILE_07_CLIENT} gtest) +- endif() - add_dependencies(${TEST_EVENT_SERVICE} gtest) - add_dependencies(${TEST_EVENT_CLIENT} gtest) +- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") - add_dependencies(${TEST_NPDU_SERVICE_ONE} gtest) - add_dependencies(${TEST_NPDU_SERVICE_TWO} gtest) - add_dependencies(${TEST_NPDU_SERVICE_THREE} gtest) @@ -139,6 +158,7 @@ index 6a148604..a501b6a7 100644 - add_dependencies(${TEST_NPDU_CLIENT_FOUR} gtest) - add_dependencies(${TEST_NPDU_DAEMON_CLIENT} gtest) - add_dependencies(${TEST_NPDU_DAEMON_SERVICE} gtest) +- endif() - add_dependencies(${TEST_SOMEIPTP_CLIENT} gtest) - add_dependencies(${TEST_SOMEIPTP_SERVICE} gtest) - if(${TEST_SECOND_ADDRESS}) @@ -148,13 +168,20 @@ index 6a148604..a501b6a7 100644 - add_dependencies(${TEST_SUSPEND_RESUME_CLIENT} gtest) - add_dependencies(${TEST_SUSPEND_RESUME_SERVICE} gtest) -else() +- add_dependencies(${TEST_APPLICATION} gtest) +- add_dependencies(${TEST_HEADER_FACTORY} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_CLIENT} gtest) +- add_dependencies(${TEST_HEADER_FACTORY_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_PAYLOAD_CLIENT} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_SERVICE} gtest) +- add_dependencies(${TEST_BIG_PAYLOAD_CLIENT} gtest) - add_dependencies(${TEST_LOCAL_ROUTING_SERVICE} gtest) - add_dependencies(${TEST_LOCAL_ROUTING_CLIENT} gtest) -endif() -- + ############################################################################## # Add tests to the target build_network_tests - ############################################################################## -- 2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch index 970a37e50f..4bb2318555 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch @@ -1,4 +1,4 @@ -From 69805f9c8973a7a4d29297f8d50c29c88f981bee Mon Sep 17 00:00:00 2001 +From ec2d36466c9050ee282ea1c3bb1b5f1f61c96ecb Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Mon, 17 Jul 2023 14:33:32 +0800 Subject: [PATCH] Do not specify PIE flag explicitly @@ -24,15 +24,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6c680d4..dce1e701 100644 +index f1bcba27..2653a4df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,12 +60,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # This is only relevant for GCC and causes warnings on Clang set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc") -- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -pie -Wl,-z,relro,-z,now") -+ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wl,-z,relro,-z,now") +- set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -pie -Wno-tsan -Wl,-z,relro,-z,now") ++ set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -Wno-tsan -Wl,-z,relro,-z,now") endif() set(NO_DEPRECATED "") diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch new file mode 100644 index 0000000000..25d66514f8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch @@ -0,0 +1,41 @@ +From 8676ef287bb25b49668be4336387bdf83a0cae5c Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 1 Jan 2024 17:02:41 +0800 +Subject: [PATCH] test/common/CMakeLists.txt: add missing link with dlt + +The libvsomeip_utilities library uses functions e.g. +dlt_check_library_version/dlt_register_app/dlt_unregister_app which are +provided by dlt therefore add it to linker flags. + +Fixes: +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_check_library_version +>>> referenced by test/common/libvsomeip_utilities.so + +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_register_app +>>> referenced by test/common/libvsomeip_utilities.so + +x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_unregister_app +>>> referenced by test/common/libvsomeip_utilities.so + +Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/602] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + test/common/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt +index d4d14534..afc8c2d6 100644 +--- a/test/common/CMakeLists.txt ++++ b/test/common/CMakeLists.txt +@@ -27,6 +27,7 @@ TARGET_LINK_LIBRARIES ( + ${Boost_LIBRARIES} + ${DL_LIBRARY} + ${TEST_LINK_LIBRARIES} ++ ${DLT_LIBRARIES} + ) + + # ---------------------------------------------------------------------------- +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.3.8.bb b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb index b45bd2d63e..4c38970205 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.3.8.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb @@ -12,9 +12,10 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name= file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \ file://0003-Do-not-build-external-gtest.patch \ file://0004-Do-not-specify-PIE-flag-explicitly.patch \ + file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ " -SRCREV = "07464840f503670bc75997b8e926b54734ffa410" +SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" COMPATIBLE_HOST:mips = "null" COMPATIBLE_HOST:mips64 = "null" @@ -55,6 +56,8 @@ do_install:append() { install -d ${D}/opt/${PN}-test/test/test/common cp -rf ${S}/test/common/examples_policies \ ${D}/opt/${PN}-test/test/test/common/ + install -m 0755 ${B}/test/common/libvsomeip_utilities.so \ + ${D}/opt/${PN}-test/test/test/common/ for d in unit_tests network_tests; do install -d ${D}/opt/${PN}-test/test/$d diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.4.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.5.bb index d4e03bc182..ed26e59879 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.5.bb @@ -39,7 +39,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ SRC_URI:append:libc-musl = " \ file://0001-Fix-compilation-with-musl.patch \ " -SRC_URI[sha256sum] = "eafb07e6daf92b142200f478856dfed6efc9ea2d146eeded5edcb09b93127088" +SRC_URI[sha256sum] = "19fe1d9f4664d445a69a96c71e8fdb60bcd8df24c73d1386e02287f7366ad422" DEPENDS = "pps-tools" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch index e215242371..09c84b4405 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch @@ -1,4 +1,4 @@ -From 69c409195ede704ed7e9298ed4942cc70a52e099 Mon Sep 17 00:00:00 2001 +From 6a2f229e74804f70f4419b2a1e6843aab059e098 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 25 Jun 2019 14:25:08 +0800 Subject: [PATCH] do not import target module while cross compile @@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 7d2d855..01dcb56 100644 +index 2300565..26d9e8c 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -4,6 +4,7 @@ import sys @@ -30,7 +30,7 @@ index 7d2d855..01dcb56 100644 def PRIVATE_NAME(bld, name): '''possibly rename a library to include a bundled extension''' -@@ -241,17 +242,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): +@@ -245,17 +246,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): # versions minversion = minimum_library_version(conf, libname, minversion) diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch index 4b74a877b3..15e093fd68 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From acd3985f9c428882f1b731a6f9ce5cb1a4a3a02c Mon Sep 17 00:00:00 2001 +From e949da7cb100c571631cd9bc7532e528c1f74820 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 1 Jul 2019 16:14:16 +0800 Subject: [PATCH] ldb: Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] ldb: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -19,17 +18,20 @@ upgrade to version 1.5.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> Rebase to 2.3.0 + +Rebase to 2.8.0 +Remove libaio option Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 90 +++++++++++++++++++++++++++++++++++---------- - wscript | 8 ++++ - 2 files changed, 78 insertions(+), 20 deletions(-) + lib/replace/wscript | 80 +++++++++++++++++++++++++++++++++------------ + wscript | 8 +++++ + 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 5c2b750..a38baae 100644 +index 37d7759..d0d6bb0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -25,6 +25,41 @@ def options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -47,13 +49,6 @@ index 5c2b750..a38baae 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -71,7 +66,7 @@ index 5c2b750..a38baae 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -38,12 +73,25 @@ def configure(conf): +@@ -38,12 +66,22 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -92,28 +87,25 @@ index 5c2b750..a38baae 100644 + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') -@@ -113,8 +161,9 @@ def configure(conf): +@@ -113,8 +151,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -436,20 +485,21 @@ def configure(conf): +@@ -443,20 +482,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -131,7 +123,7 @@ index 5c2b750..a38baae 100644 - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ if Options.options.enable_libbsd: ++ if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', @@ -150,7 +142,7 @@ index 5c2b750..a38baae 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 03076e6..5365408 100644 +index ed5d45f..6bb0b37 100644 --- a/wscript +++ b/wscript @@ -40,6 +40,14 @@ def options(opt): diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch index acd521e69f..71934795b1 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From d9f4d5bbd3e58ca7fd7cbc4ab7656fe27bf4c346 Mon Sep 17 00:00:00 2001 +From 989addc0ca7be8233b413d42704c5dc900e85d81 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -42,10 +42,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch index 87909c952a..7e60b53051 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch @@ -1,4 +1,4 @@ -From cc86b8bdd45ca30bdf65a3b8b0960b27aeb34522 Mon Sep 17 00:00:00 2001 +From 226b75a0e9654fb3c0435256af5fed0178dc0d69 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 19 Nov 2015 20:45:56 +0100 Subject: [PATCH] avoid openldap unless wanted @@ -12,7 +12,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wscript b/wscript -index 7f14847..092da2d 100644 +index 6bb0b37..8ee25b1 100644 --- a/wscript +++ b/wscript @@ -154,9 +154,7 @@ def configure(conf): diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb index c4b7602bf8..ec56eb0205 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb @@ -22,7 +22,6 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[ldap] = ",,openldap" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" @@ -34,14 +33,14 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[sha256sum] = "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8" +SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" inherit pkgconfig waf-samba ptest S = "${WORKDIR}/ldb-${PV}" -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch index 026a348992..45d847c852 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 888bfe48236b4ce382dc3aa49791cadb70a1fbe4 Mon Sep 17 00:00:00 2001 +From 18e3d62f5c8f957acc45695cb99c24510d23b457 Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 14:14:08 +0900 Subject: [PATCH] talloc: Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] talloc: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -21,16 +20,20 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> Modified tp apply to version 2.2.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 2.4.1 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++---------- + lib/replace/wscript | 78 +++++++++++++++++++++++++++++++++------------ wscript | 7 +++- - 2 files changed, 75 insertions(+), 21 deletions(-) + 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 827d74f..0348715 100644 +index 199e636..3593eaf 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -25,6 +25,41 @@ def options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -48,13 +51,6 @@ index 827d74f..0348715 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -72,49 +68,51 @@ index 827d74f..0348715 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,18 +66,27 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') -+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') + conf.CHECK_HEADERS('sys/vfs.h sys/xattr.h termio.h termios.h sys/file.h') + conf.CHECK_HEADERS('sys/ucontext.h sys/wait.h sys/stat.h') + + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') - conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): + if not conf.CHECK_DECLS('malloc', headers='stdlib.h'): + conf.CHECK_HEADERS('malloc.h') + +@@ -113,8 +150,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -431,20 +480,20 @@ def configure(conf): +@@ -443,20 +481,20 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +148,7 @@ index 827d74f..0348715 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 3089663..fdf9510 100644 +index 075f1ec..6b4f273 100644 --- a/wscript +++ b/wscript @@ -31,7 +31,12 @@ def options(opt): diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 058ac34f81..59461412a6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 6580e8191c219909d50c991662310e668973722d Mon Sep 17 00:00:00 2001 +From 843d1dc810efc61275b1121d6b35649d00570851 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -40,10 +40,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index fe8d10d6f4..93c8a1e846 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -1,19 +1,18 @@ -From e18370c204056de799064d8ac72a656eb3745f95 Mon Sep 17 00:00:00 2001 +From 9130d340c37861a59e812e334e2b13577e705a6c Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 15:10:58 +0900 Subject: [PATCH] avoid attr unless wanted +Upstream-Status: Inappropriate [embedded specific] --- -Upstream-Status: Pending - lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 0348715..a8554d9 100644 +index 3593eaf..504a1cb 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -967,8 +967,6 @@ def build(bld): +@@ -968,8 +968,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' @@ -22,7 +21,7 @@ index 0348715..a8554d9 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -983,7 +981,7 @@ def build(bld): +@@ -984,7 +982,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, provide_builtin_linking=True, diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest new file mode 100644 index 0000000000..84e5381501 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite talloc_testsuite" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb index f8fef9f825..bf7fbc8649 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb @@ -11,10 +11,11 @@ export PYTHONHASHSEED="1" SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://0001-talloc-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI[sha256sum] = "6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba" +SRC_URI[sha256sum] = "410a547f08557007be0e88194f218868358edc0ab98c98ba8c167930db3d33f9" -inherit waf-samba +inherit waf-samba pkgconfig ptest PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -22,7 +23,6 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" @@ -31,8 +31,8 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr S = "${WORKDIR}/talloc-${PV}" -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ @@ -43,6 +43,11 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/*_testsuite ${D}${PTEST_PATH}/tests/ +} + PACKAGES += "pytalloc pytalloc-dev" RPROVIDES:${PN}-dbg += "pytalloc-dbg" diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch index 93a85e8545..477b1cec7b 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From d3b1d23e01e323b9610843ab6bef096512f6c244 Mon Sep 17 00:00:00 2001 +From 613cfb43622f0138edfcf3ad7a8fecc568e17db4 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Wed, 19 Jun 2019 17:53:34 +0800 Subject: [PATCH] tdb: Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] tdb: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -18,16 +17,20 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Update to 1.4.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 1.4.9 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 92 ++++++++++++++++++++++++++++++++++----------- - wscript | 6 +++ - 2 files changed, 77 insertions(+), 21 deletions(-) + lib/replace/wscript | 79 +++++++++++++++++++++++++++++++++------------ + wscript | 6 ++++ + 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 827d74f..70cde6f 100644 +index 199e636..cb13b62 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -25,6 +25,41 @@ def options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -45,13 +48,6 @@ index 827d74f..70cde6f 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -69,51 +65,45 @@ index 827d74f..70cde6f 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,12 +66,21 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) - conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') - conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') -+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') -+ + if Options.options.enable_acl: + conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') + + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + - conf.CHECK_HEADERS('port.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,9 +158,10 @@ def configure(conf): + conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') +@@ -113,8 +150,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -- conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') -+ ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') - conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h') -@@ -431,20 +480,21 @@ def configure(conf): +@@ -443,20 +481,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +140,7 @@ index 827d74f..70cde6f 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 71ada31..10b16a7 100644 +index 5e6a928..5443b43 100644 --- a/wscript +++ b/wscript @@ -69,6 +69,12 @@ def options(opt): diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 6bd118b536..00ec8a4775 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 10b4546edb194ede7a5e8bb5e4c9f5fdc67984eb Mon Sep 17 00:00:00 2001 +From de39c696a62894fd9c6626d3e2931e42e3407be5 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/run-ptest b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/run-ptest new file mode 100644 index 0000000000..7bc56f77c0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'tdb1-*') + +for f in replace_testsuite $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb index 5dc87bd91a..248b72967d 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb @@ -11,9 +11,10 @@ export PYTHONHASHSEED="1" SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://0001-tdb-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI[sha256sum] = "8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8" +SRC_URI[sha256sum] = "0ac226073e3a2db8648da7af744cb95f50766a52feeb001d558b2b321b74a765" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -22,17 +23,16 @@ PACKAGECONFIG ??= "\ PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" S = "${WORKDIR}/tdb-${PV}" -inherit waf-samba +inherit waf-samba pkgconfig ptest -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ @@ -42,6 +42,15 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/tdb1-* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/test + install -m 0644 ${B}/test/*.tdb ${D}${PTEST_PATH}/tests/test/ + install -m 0644 ${B}/test/*.corrupt ${D}${PTEST_PATH}/tests/test/ +} + PACKAGES += "tdb-tools python3-tdb" RPROVIDES:${PN}-dbg += "python3-tdb-dbg" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index cb66adba9c..7fdeec61f4 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From d9fd1c52d1646254944bfee37be611e04d4daddb Mon Sep 17 00:00:00 2001 +From c2241d7a1371ece3b89dfdad4861dcf0a152d5d4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 15:03:17 +0900 Subject: [PATCH] Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -24,16 +23,20 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> Update patch to version 0.14.1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +Rebase to 0.16.0 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- - wscript | 6 ++++ - 2 files changed, 73 insertions(+), 18 deletions(-) + lib/replace/wscript | 100 +++++++++++++++++++++++++++++++------------- + wscript | 6 +++ + 2 files changed, 77 insertions(+), 29 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 5c2b750..28835ac 100644 +index 77e655b..452c741 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -25,6 +25,41 @@ def options(opt): +@@ -25,6 +25,34 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') @@ -51,13 +54,6 @@ index 5c2b750..28835ac 100644 + help=("Disable use of attr"), + action="store_false", dest='enable_attr', default=False) + -+ opt.add_option('--with-libaio', -+ help=("Enable use of libaio"), -+ action="store_true", dest='enable_libaio') -+ opt.add_option('--without-libaio', -+ help=("Disable use of libaio"), -+ action="store_false", dest='enable_libaio', default=False) -+ + opt.add_option('--with-libbsd', + help=("Enable use of libbsd"), + action="store_true", dest='enable_libbsd') @@ -75,7 +71,7 @@ index 5c2b750..28835ac 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -38,12 +73,27 @@ def configure(conf): +@@ -38,12 +66,24 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -96,28 +92,25 @@ index 5c2b750..28835ac 100644 + if Options.options.enable_attr: + conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') + -+ if Options.options.enable_libaio: -+ conf.CHECK_HEADERS('libaio.h') -+ + if Options.options.enable_libcap: + conf.CHECK_HEADERS('sys/capability.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') -@@ -113,8 +163,9 @@ def configure(conf): +@@ -113,8 +153,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') +- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') -+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') ++ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -436,20 +487,18 @@ def configure(conf): +@@ -443,31 +484,32 @@ def configure(conf): strlcpy_in_bsd = False @@ -126,6 +119,17 @@ index 5c2b750..28835ac 100644 - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', - checklibc=True): - strlcpy_in_bsd = True +- elif conf.env.enable_fuzzing: +- # Just to complicate it more, some versions of Honggfuzz have +- # got strlcpy and strlcat in libc, but not in <string.h> +- # (unless it is there coincidentally, on a BSD). Therefore we +- # can't use CHECK_FUNCS alone to decide whether to add the +- # headers to replace.h. +- # +- # As this is only known to happen on a fuzzing compiler, we'll +- # skip the check when not in fuzzing mode. +- conf.CHECK_HEADERS('bsd/string.h') +- - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): @@ -138,12 +142,26 @@ index 5c2b750..28835ac 100644 + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ elif conf.env.enable_fuzzing: ++ # Just to complicate it more, some versions of Honggfuzz have ++ # got strlcpy and strlcat in libc, but not in <string.h> ++ # (unless it is there coincidentally, on a BSD). Therefore we ++ # can't use CHECK_FUNCS alone to decide whether to add the ++ # headers to replace.h. ++ # ++ # As this is only known to happen on a fuzzing compiler, we'll ++ # skip the check when not in fuzzing mode. ++ conf.CHECK_HEADERS('bsd/string.h') ++ + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -151,7 +169,7 @@ index 5c2b750..28835ac 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 0f6e92f..5a54f3a 100644 +index d912a8a..484a6fa 100644 --- a/wscript +++ b/wscript @@ -28,6 +28,12 @@ def options(opt): @@ -168,5 +186,5 @@ index 0f6e92f..5a54f3a 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.34.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index ba3f4ca7a6..f1b8f8e9b1 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 Mon Sep 17 00:00:00 2001 +From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 24 Nov 2021 13:33:35 +0800 Subject: [PATCH] Fix pyext_PATTERN for cross compilation @@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py -index a23bd01..af202e0 100644 +index b2dd1a9..2bd3545 100644 --- a/third_party/waf/waflib/Tools/python.py +++ b/third_party/waf/waflib/Tools/python.py -@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): +@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index e15f14ab78..a8cddcd045 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,19 +1,18 @@ -From 82dc31b72e77f263574645092ba1597a8f1152e7 Mon Sep 17 00:00:00 2001 +From ace8fed037ec3d03f65f861b4da217faff94015b Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 15:10:58 +0900 Subject: [PATCH] avoid attr unless wanted +Upstream-Status: Inappropriate [embedded specific] --- -Upstream-Status: Pending - lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 21a746a..6be3276 100644 +index 452c741..61fcde0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -968,8 +968,6 @@ def build(bld): +@@ -983,8 +983,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' @@ -22,7 +21,7 @@ index 21a746a..6be3276 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -984,7 +982,7 @@ def build(bld): +@@ -999,7 +997,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, provide_builtin_linking=True, diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb index 9a2b5ede27..0158f8bc74 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb @@ -16,7 +16,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" -SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" +SRC_URI[sha256sum] = "1aa58f21017ed8c2f606ae84aa7e795b5439edd4dd5f68f1a388a7d6fb40f682" inherit pkgconfig ptest waf-samba @@ -26,7 +26,6 @@ PACKAGECONFIG ??= "\ " PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" @@ -35,8 +34,8 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr S = "${WORKDIR}/tevent-${PV}" -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen +# Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +# to cross Popen export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ diff --git a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.0.bb b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb index b50d33f908..b50d33f908 100644 --- a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb diff --git a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools.inc index 942b2d482d..b99ce82810 100644 --- a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools.inc +++ b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools.inc @@ -5,4 +5,4 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" -SRCREV = "42c91efa63ef81992cdcc01e698cf3bc7764bbc3" +SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f" diff --git a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.0.bb b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb index 0c64889bc3..0c64889bc3 100644 --- a/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch deleted file mode 100644 index 00956fb117..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3a35611687864cf3599712d0d2ff54532b0118ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sun, 3 Oct 2021 21:42:32 +0200 -Subject: [PATCH] m4/ax_python_devel.m4: do not check for distutils - -With py 3.10 this prints a deprecation warning which is -taken as an error. Upstream should rework the code to not -use distuils. - -Upstream-Status: Inappropriate [needs a proper fix upstream] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - m4/ax_python_devel.m4 | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index e0804c5..cfc0b24 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -138,21 +138,6 @@ variable to configure. See ``configure --help'' for reference. - fi - fi - -- # -- # Check if you have distutils, else fail -- # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". --Please check your Python installation. The error was: --$ac_distutils_result]) -- PYTHON_VERSION="" -- fi -- - # - # Check for Python include path - # diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch index 2434884248..5bbccdcbf6 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch @@ -1,4 +1,4 @@ -From 7854c60c92243adb14ea89e16fc226d2e47dd4f9 Mon Sep 17 00:00:00 2001 +From 0ccfefe624e25f937b27b2caf3671e80c2c29391 Mon Sep 17 00:00:00 2001 From: Aws Ismail <aws.ismail@windriver.com> Date: Thu, 7 Jun 2012 16:00:13 -0400 Subject: [PATCH] Fix symlink install error in cmdlang @@ -9,17 +9,18 @@ creating a symbolic link for opeipmish in openipmi/cmdlang Upstream-Status: Pending Signed-off-by: Aws Ismail <aws.ismail@windriver.com> + --- cmdlang/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 0ca3827..d9a941f 100644 +index 7235446..4a81ae3 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ +@@ -41,6 +41,7 @@ openipmish_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ # compatability. - install-data-local: + install-exec-hook: rm -f $(DESTDIR)$(bindir)/ipmish + mkdir -p $(DESTDIR)$(bindir)/ $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch index 61b39995a6..18129e6fcb 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch @@ -1,4 +1,4 @@ -From 4f41e090e33a00117a27f0c77b6338fb8b495f37 Mon Sep 17 00:00:00 2001 +From d667aedc37aeabdb9f8574ee0b9cf85b844ca2d2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 2 Jun 2017 21:58:32 -0700 Subject: [PATCH] openipmi: Fix build with musl @@ -12,12 +12,13 @@ ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'? Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- ui/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/ui.c b/ui/ui.c -index 529ff22..066d118 100644 +index 9c6a51f..34f7e34 100644 --- a/ui/ui.c +++ b/ui/ui.c @@ -42,6 +42,7 @@ diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch index c4559c97b7..d9ee5cc28f 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch @@ -1,4 +1,4 @@ -From 6542ebe7a0d37dee8e9afb856feb8f6c3d334632 Mon Sep 17 00:00:00 2001 +From 7d9f6526dbcd46130d279c363d38781969807f74 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Mon, 29 Dec 2014 18:16:04 +0800 Subject: [PATCH] ipmi-init: fix the arguments @@ -10,12 +10,13 @@ not a string. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- ipmi.init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ipmi.init b/ipmi.init -index ea10b11..aac9f83 100644 +index bd80f0d..53305bb 100644 --- a/ipmi.init +++ b/ipmi.init @@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then @@ -39,4 +40,3 @@ index ea10b11..aac9f83 100644 echo ;; *) - diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch index 858adc50a8..f14626a38d 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch @@ -1,4 +1,4 @@ -From a6ffa3939a3ab2ad6a8d277cd8292b7dad6469c6 Mon Sep 17 00:00:00 2001 +From c76e727433ed895c605f9e7a3612bbc16ff558de Mon Sep 17 00:00:00 2001 From: Aws Ismail <aws.ismail@windriver.com> Date: Thu, 7 Jun 2012 12:28:34 -0400 Subject: [PATCH] Do not build openipmigui man page @@ -11,6 +11,7 @@ Upstream-Status: Pending Signed-off-by: Aws Ismail <aws.ismail@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch deleted file mode 100644 index 1aea32eaec..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 29 Dec 2014 18:16:04 +0800 -Subject: [PATCH] remove host path from la_LDFLAGS - -Upstream-Status: Inappropriate [ cross compile specific ] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - cmdlang/Makefile.am | 2 +- - unix/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 9cf180d..da46ceb 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index baf0815..80c3d5d 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb index 18f4deca16..470ce1e254 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb @@ -26,27 +26,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ file://fix-symlink-install-error-in-cmdlang.patch \ file://openipmi-no-openipmigui-man.patch \ - file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ file://ipmi-init-fix-the-arguments.patch \ file://include_sys_types.patch \ file://openipmi-helper \ file://ipmi.service \ - file://0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch \ " S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[md5sum] = "532404c9df7d0e8bde975b95b9e6775b" -SRC_URI[sha256sum] = "f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945" +SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f" -inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig +inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" EXTRA_OECONF = "--disable-static \ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ - --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \ - --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \ --with-glibver=2.0" PACKAGECONFIG ??= "gdbm" @@ -68,9 +63,8 @@ FILES:${PN}-dbg += " \ " do_configure () { - # Let's perform regular configuration first then handle perl issues. - autotools_do_configure + PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} autotools_do_configure perl_ver=`perl -V:version | cut -d\' -f 2` diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.3.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb index ed75ba34de..862cba91e9 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "05ebc7aba28a9100f9bbae54ceecbf75c82ccf46bdfce8b5d64806459a7e0412" +SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" 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 deleted file mode 100644 index 0d51ce1b8f..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch +++ /dev/null @@ -1,66 +0,0 @@ -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-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch new file mode 100644 index 0000000000..1903f38f5d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch @@ -0,0 +1,32 @@ +From 802d3cafa888b36aa72007d48232a010dbb0231d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 27 Dec 2023 16:57:28 +0100 +Subject: [PATCH] UseLemon.cmake: do not use lemon data from the host + +We use native lemon, and not the host one, so +the data should be taken from the source tree as well. + +Upstream-Status: Inappropriate [cross-specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + cmake/modules/UseLemon.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index fa4034e..83a7ca3 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -13,11 +13,12 @@ if(LEMON_EXECUTABLE) + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} + -l +- -T/usr/share/lemon/lempar.c ++ -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} + DEPENDS + ${_in} ++ ${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + ) + endmacro() + add_custom_target(lemon) 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 6ad8a62c28..202de62606 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 @@ -1,4 +1,4 @@ -From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001 +From d9c4cdad0c48becab491ea4e80e5cd81f7d1dc97 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Thu, 26 Nov 2020 05:38:31 -0800 Subject: [PATCH] wireshark-src: improve reproducibility @@ -8,15 +8,15 @@ comments. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- - tools/make-plugin-reg.py | 2 +- - tools/ncp2222.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + tools/ncp2222.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: wireshark-4.0.6/tools/ncp2222.py -=================================================================== ---- wireshark-4.0.6.orig/tools/ncp2222.py -+++ wireshark-4.0.6/tools/ncp2222.py +diff --git a/tools/ncp2222.py b/tools/ncp2222.py +index f14d0c5..05073b9 100755 +--- a/tools/ncp2222.py ++++ b/tools/ncp2222.py @@ -5891,7 +5891,7 @@ def produce_code(): print("/*") diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch index 069b5793d9..0e6249c939 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001 +From e4e88c2f55286cf24af230b265d0e059363baa6c Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Thu, 26 Nov 2020 12:00:43 -0800 Subject: [PATCH] flex: Remove #line directives @@ -8,12 +8,13 @@ generate #line directives with absolute file patch. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- cmake/modules/FindLEX.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake -index 0008bc4..ec68f84 100644 +index 20caa09..174f452 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated) @@ -22,25 +23,22 @@ index 0008bc4..ec68f84 100644 - ADD_CUSTOM_COMMAND( - OUTPUT ${_outc} ${_outh} -- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} +- COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} - DEPENDS ${_in} - ) + IF (DEFINED ENV{SOURCE_DATE_EPOCH}) + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ELSE () + ADD_CUSTOM_COMMAND( + OUTPUT ${_outc} ${_outh} -+ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} ++ COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in} + DEPENDS ${_in} + ) + ENDIF () LIST(APPEND ${_source} ${_in}) LIST(APPEND ${_generated} ${_outc}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) --- -2.26.2.Cisco - diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch index 134633f668..1a6fe8d39e 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch @@ -1,4 +1,4 @@ -From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001 +From 94b951c0cccf67b66749cc87c473e63fa5207e83 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Wed, 27 Jan 2021 06:47:13 -0800 Subject: [PATCH] lemon: Remove #line directives @@ -8,67 +8,28 @@ directives with extra option '-l'. Upstream-Status: Pending Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- - cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++----------- - 1 file changed, 34 insertions(+), 15 deletions(-) + cmake/modules/UseLemon.cmake | 2 ++ + 1 file changed, 2 insertions(+) -Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake -=================================================================== ---- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake -+++ wireshark-3.4.11/cmake/modules/UseLemon.cmake -@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated - - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) - -- ADD_CUSTOM_COMMAND( -- OUTPUT -- ${_out}.c -- # These files are generated as side-effect -- ${_out}.h -- ${_out}.out -- COMMAND $<TARGET_FILE:lemon> -- -T${_lemonpardir}/lempar.c -- -d. -- ${_in} -- DEPENDS -- ${_in} -- lemon -- ${_lemonpardir}/lempar.c -- ) -+ IF (DEFINED ENV{SOURCE_DATE_EPOCH}) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -l -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ELSE () -+ ADD_CUSTOM_COMMAND( -+ OUTPUT -+ ${_out}.c -+ # These files are generated as side-effect -+ ${_out}.h -+ ${_out}.out -+ COMMAND lemon -+ -T${_lemonpardir}/lempar.c -+ -d. -+ ${_in} -+ DEPENDS -+ ${_in} -+ lemon -+ ${_lemonpardir}/lempar.c -+ ) -+ ENDIF () - - LIST(APPEND ${_source} ${_in}) - LIST(APPEND ${_generated} ${_out}.c) +diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake +index e419de1..fa4034e 100644 +--- a/cmake/modules/UseLemon.cmake ++++ b/cmake/modules/UseLemon.cmake +@@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE) + ${_out}.h + ${_out}.out + COMMAND ${LEMON_EXECUTABLE} ++ -l + -T/usr/share/lemon/lempar.c + -d. + ${_in} +@@ -30,6 +31,7 @@ else() + ${_out}.h + ${_out}.out + COMMAND $<TARGET_FILE:lemon> ++ -l + -T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c + -d. + ${_in} diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb index 008aa8cb12..4a47680922 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb @@ -4,20 +4,20 @@ SECTION = "net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "pcre2 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 speexdsp" DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " 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 \ + file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \ " UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898" +SRC_URI[sha256sum] = "0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b" PE = "1" diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 9182acf449..06c7de3f8b 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -46,6 +46,7 @@ PTESTS_FAST_META_OE:remove:riscv64 = "nodejs" PTESTS_FAST_META_OE:remove:riscv32 = "nodejs" PTESTS_SLOW_META_OE = "\ + c-ares \ fftw \ libusb-compat \ rsyslog \ diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 4c63f1b399..83a9f7d566 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -49,6 +49,7 @@ LAYERSERIES_COMPAT_openembedded-layer = "nanbield" LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" +PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" # Configures whether coreutils or uutils-coreutils is used. PREFERRED_PROVIDER_coreutils = "coreutils" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 8ccdc27a8e..bff82fe35d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -32,4 +32,4 @@ do_install:append() { install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a } -FILES:${PN} += "${libdir}/python3.11/site-packages/pyrwmem" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyrwmem" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.3.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.4.bb index 868887a47f..e14179891e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.3.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "52e9aa97b39a3309ba5f3a2e0dc127ebe04cadfefc8eb57222a9ebd32e8faa16" +SRC_URI[sha256sum] = "94ee246ced4aa1f31d992f1571baae3282cc73eee76336fa9e9791adfeca13bc" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 037d58cf17..ee5c77a85d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -145,3 +145,5 @@ SYSTEMD_SERVICE:${PN} = "mongod.service" FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" RDEPENDS:${PN} += "tzdata-core" + +SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12" diff --git a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb index b1f8a7f805..b41ecffae4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -3,7 +3,6 @@ DESCRIPTION = "\ This package contains an I2C dev library and the i2c bus scanning \ utility lsi2c. \ " -AUTHOR = "Danielle Costantino" HOMEPAGE = "https://github.com/costad2/i2cdev" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "\ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb index 0d8923f342..d2b2536bc3 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c libnvme" -SRCREV = "bd2f882a49a14b0e21a94c928128b1979e4316fd" +SRCREV = "dcdad6f5d70ffb2fa151f229db048180671eb1fe" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb index 54e6b778b0..e1fe5e5671 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb @@ -103,26 +103,26 @@ do_install:append() { -i ${D}${bindir}/krb5-config } -PACKAGES =+ "${PN}-admin-server \ - ${PN}-gss-samples \ - ${PN}-k5tls \ - ${PN}-kdc \ - ${PN}-kdc-ldap \ - ${PN}-kpropd \ - ${PN}-otp \ - ${PN}-pkinit \ - ${PN}-spake \ - ${PN}-user \ - libgssapi-krb5 \ - libgssrpc \ - libk5crypto \ - libkadm5clnt-mit \ - libkadm5srv-mit \ - libkdb5 \ - libkrad \ - libkrb5 \ - libkrb5support \ - libverto" +PACKAGE_BEFORE_PN =+ "${PN}-admin-server \ + ${PN}-gss-samples \ + ${PN}-k5tls \ + ${PN}-kdc \ + ${PN}-kdc-ldap \ + ${PN}-kpropd \ + ${PN}-otp \ + ${PN}-pkinit \ + ${PN}-spake \ + ${PN}-user \ + libgssapi-krb5 \ + libgssrpc \ + libk5crypto \ + libkadm5clnt-mit \ + libkadm5srv-mit \ + libkdb5 \ + libkrad \ + libkrb5 \ + libkrb5support \ + libverto" FILES:${PN} = "${libdir}/krb5/plugins/preauth/test.so" FILES:${PN}-doc += "${datadir}/examples" @@ -198,4 +198,4 @@ pkg_postinst:${PN}-kdc () { BBCLASSEXTEND = "native nativesdk" inherit multilib_script -MULTILIB_SCRIPTS = "${PN}-user:${bindir}/krb5-config" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/krb5-config" diff --git a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aad..a529032aad 100644 --- a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231224.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb index 9c4e819c25..b788d6fd03 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231224.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "bea6f5bc96d9a5d11da36d23ee50d952d8bf3a8d" +SRCREV = "e4cb2a0f9ba947d23e526888930bb1487c2cf1d8" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch index fbdf06d692..594503ae2a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch @@ -1,4 +1,4 @@ -From c321f19ff1cd1251c19d20b17a2d86c4237ce506 Mon Sep 17 00:00:00 2001 +From 54e8dca9b39b8c8a6532576a0286e548f97607fa Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 19 Apr 2022 16:07:19 -0700 Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 @@ -15,12 +15,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b272816685..e1fe1102c4 100644 +index 06e6453b5c..476d7f1576 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -303,6 +303,9 @@ if(UNIX AND NOT HAIKU) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) - set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) +@@ -306,6 +306,9 @@ if(UNIX AND NOT HAIKU) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) + endif() endif() + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb index c30e52263d..14fca669d3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb @@ -20,8 +20,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "883e5f76976b86afee87415dc67bde58d9b295a4" -BRANCH = "v1.59.x" +SRCREV_grpc = "0ef13a7555dbaadd4633399242524129eef5e231" +BRANCH = "v1.60.x" SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb index 2e06b701cc..87f7f1a6df 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff" SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \ " -SRCREV = "4a537e969891dde542ad8b1a4a214955a83be29f" +SRCREV = "08bcf77a687fb06e34138e9e9fa12a4ecbe12332" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.1.bb b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb index 787ace440c..fef9d3a80e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Linear Algebra PACKage" URL = "http://www.netlib.org/lapack" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a32c99f24d097c72d1857e533b55642b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d" # Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended) # Enabling FORTRAN @@ -16,7 +16,7 @@ DEPENDS = "libgfortran \ " RDEPENDS:${PN}-ptest += "cmake" -SRCREV = "32b062a33352e05771dcc01b981ebe961bf2e42f" +SRCREV = "04b044e020a3560ccfa9988c8a80a1fb7083fc2e" SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index 06df0690ac..cadc9843d9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,17 +1,15 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=23d6278200de9b48fd1439f80507cba8" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=076b97f5c7e61532f7f6f3865f04da57" HOMEPAGE = "http://luajit.org" SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ file://0001-Use-builtin-for-clear_cache.patch \ " -# Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later. -PV = "2.1.0~beta3-220721" -SRCREV = "32984282ddae666b3c94cd27538e1c78b49a1877" +PV = "2.1" +SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb index 112df8c1e8..2451a36be2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python3 python3-native" +DEPENDS = "python3 python3-native python3-setuptools-native" RDEPENDS:${PN} = "python3 python3-modules" inherit python3native python3targetconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.71.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.72.bb index 7d8d6b69f7..ba3e3fdf7e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.71.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.72.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff inherit cpan -SRCREV = "7cefbaaa9057231b6e9b5765934f06e75994420d" +SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df" SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb index ecc89d075e..b2266394d6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb @@ -12,8 +12,6 @@ SRC_URI[sha256sum] = "4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d70 S = "${WORKDIR}/${SRCNAME}-${PV}" -COMPATIBLE_HOST:libc-musl = "null" - EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" inherit cpan diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb index e5c1ec1c82..6029b7aae9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb @@ -3,10 +3,9 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42e8ce9d45f628e587" -SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz \ - file://0001-Make-function-checks-more-robust-within-shared-libs.patch \ - " -SRC_URI[sha256sum] = "a5f1a83020bc5b5dd6c1b570f48c7546e0a8f7fac10a068740b03925ad9e14e8" +SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" + +SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb index 1d9ca9daae..545618a4ec 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb @@ -8,14 +8,14 @@ has been split out into the protobuf-c-rpc project." HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" SECTION = "console/tools" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d11077c6a2b5d2e64b9f32b61a9b78ba" DEPENDS = "protobuf-native protobuf" SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=next;protocol=https" SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" -SRCREV = "ba4c55f0e686e0252c451f7163ab529e4b36831a" +SRCREV = "8c201f6e47a53feaab773922a743091eb6c8972a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb new file mode 100644 index 0000000000..f9e3679590 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb @@ -0,0 +1,24 @@ +SUMMARY="SSD1306 OLED I2C drive" +DESCRIPTION = "SSD1306 OLED I2C driver working in Linux" +HOMEPAGE = "https://github.com/armlabs/ssd1306_linux" +SECTION = "console/utils" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f" + +SRC_URI = " \ + git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \ +" +SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251" + +S = "${WORKDIR}/git" + +# coreutils provides fmt which is used in the Makefile +DEPENDS = "i2c-tools coreutils-native" + +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${B}/ssd1306_bin ${D}${bindir} +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb index 582c29379a..1643af2546 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2" -SRC_URI[sha256sum] = "74aa626fc71e729ee227602870dd29a5a01cd8c9c1c7330837a51da2eb5722cc" +SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch deleted file mode 100644 index fa029da2b8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 16 May 2016 16:52:24 +0300 -Subject: [PATCH] Add 'm' suffix to the python library name. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - swig/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE - SET( NAME pyCmpiProvider ) - ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) - #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) --TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) - TARGET_LINK_LIBRARIES( ${NAME} pthread ) - TARGET_LINK_LIBRARIES( ${NAME} dl ) - TARGET_LINK_LIBRARIES( ${NAME} util ) diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch index 1d8013be6f..1f147d52f6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch @@ -1,20 +1,19 @@ -From b8e791ce93a467081fb1594b91841e2f57c634a0 Mon Sep 17 00:00:00 2001 +From 3ab3ac2876cbf4a34a94f0d3256a5be9d1202370 Mon Sep 17 00:00:00 2001 From: Qian Lei <qianl.fnst@cn.fujitsu.com> Date: Fri, 16 Jan 2015 18:37:26 +0800 Subject: [PATCH] Fix error Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> ---- Upstream-Status: Pending - +--- swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..8073fc8 100644 +index 93b4755..a7268f0 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -27,7 +27,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) +@@ -26,7 +26,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." @@ -23,6 +22,3 @@ index 3976296..8073fc8 100644 COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i --- -1.8.3.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch deleted file mode 100644 index 92e5e5662e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 070822507befe7c1b8bb1be2d36cb12141d03b8f Mon Sep 17 00:00:00 2001 -From: Qian Lei <qianl.fnst@cn.fujitsu.com> -Date: Tue, 6 Jan 2015 18:38:32 +0800 -Subject: [PATCH] Change the install path in cmakelist - -Upstream-Status: Pending -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> ---- - swig/python/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..93c87c1 100644 ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -56,18 +56,18 @@ TARGET_LINK_LIBRARIES( ${NAME} util ) - - INSTALL(TARGETS ${NAME} LIBRARY DESTINATION ${CMPI_LIBRARY_DIR}) - # .py: swig generated --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - - - # - # cmpi_pywbem_bindings.py: provider implementation - # --INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - #INSTALL(FILES Py_UnixProcessProvider.py DESTINATION /usr/lib/pycim ) - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi.py', dfile='${PYTHON_SITE_DIR}/cmpi.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi.py', dfile='\$ENV{ENV_INSTALL_PATH}/cmpi.py')\")") - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py', dfile='${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py', dfile='$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py')\")") - - - --- -1.8.3.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch deleted file mode 100644 index 5d5652a5f2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 323ced03a66e6cd963d8277b66cfcc7dce740be7 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Fri, 17 Jul 2015 01:33:43 -0700 -Subject: [PATCH] fix Xthe build error when python>3.0 - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- -Upstream-Status: Pending - - src/target_python.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/target_python.c b/src/target_python.c -index 90b43a1..2b76c9e 100644 ---- a/src/target_python.c -+++ b/src/target_python.c -@@ -167,7 +167,12 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) - - Py_SetProgramName("cmpi_swig"); - Py_Initialize(); -- SWIGEXPORT void SWIG_init(void); -+#if PY_VERSION_HEX >= 0x03000000 -+SWIGEXPORT PyObject* -+#else -+ SWIGEXPORT void -+#endif -+ SWIG_init(void); - SWIG_init(); - cmpiMainPyThreadState = PyGILState_GetThisThreadState(); - PyEval_ReleaseThread(cmpiMainPyThreadState); --- -2.1.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch index 2072da72b5..1f9e2394c3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch @@ -1,4 +1,4 @@ -From 7dd01e33f9dac75f177113de9a8ff458d4263a11 Mon Sep 17 00:00:00 2001 +From 0871fb048a48a02ec598c941e577f13d8d24f574 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Mon, 24 Aug 2015 11:00:13 +0900 Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl @@ -7,17 +7,18 @@ Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> + --- swig/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 8b5555c..c2655b9 100644 +index 00bf40c..d3cab38 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt -@@ -15,15 +15,15 @@ IF (PYTHON_LIBRARY) - ENDIF (PYTHON_LINK_LIBS) - ENDIF (PYTHON_LIBRARY) +@@ -49,15 +49,15 @@ ELSE (BUILD_PYTHON2) + MESSAGE(STATUS "*****") + ENDIF (BUILD_PYTHON3) -FIND_PACKAGE(Perl) -IF (PERL_EXECUTABLE) @@ -42,6 +43,3 @@ index 8b5555c..c2655b9 100644 +# ADD_SUBDIRECTORY(ruby) +# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) +#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch index b99337204d..04abd5e4b9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch @@ -1,12 +1,20 @@ -Port from Fedora20 +From bc32342fa63b8359f985fe1e187e811455c96a50 Mon Sep 17 00:00:00 2001 +From: Qian Lei <qianl.fnst@cn.fujitsu.com> +Date: Tue, 25 Aug 2015 13:19:51 +0800 +Subject: [PATCH] Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> -diff -up cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py ---- cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig 2012-03-01 17:05:31.878367281 +0100 -+++ cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py 2012-03-01 17:06:34.718110137 +0100 -@@ -350,10 +350,10 @@ class BrokerCIMOMHandle(object): +--- + swig/python/cmpi_pywbem_bindings.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/swig/python/cmpi_pywbem_bindings.py b/swig/python/cmpi_pywbem_bindings.py +index d643990..7f0cc77 100644 +--- a/swig/python/cmpi_pywbem_bindings.py ++++ b/swig/python/cmpi_pywbem_bindings.py +@@ -361,10 +361,10 @@ class BrokerCIMOMHandle(object): allow_null_ns = False else: allow_null_ns = True diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch deleted file mode 100644 index b6a51ec0d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Port from Fedora20 - -Upstream-Status: Pending -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> - -diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt ---- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old 2013-08-06 15:57:03.576285764 +0200 -+++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt 2013-08-06 15:57:14.891345941 +0200 -@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON) - - FIND_PACKAGE(PythonInterp REQUIRED) - --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) -+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) - - IF (NOT PYTHON_SITE_DIR) - SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR}) diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index 3b7453536b..781dc83da9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb @@ -4,39 +4,31 @@ HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" -DEPENDS = "swig-native python3 sblim-cmpi-devel" +DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native" SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ - file://cmpi-bindings-0.9.5-python-lib-dir.patch \ - file://0001-Modify-cmakelist.patch \ file://0001-Fix-error.patch \ - file://0001-fix-the-build-error-when-python-3.0.patch \ - file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \ - " + " -SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e" +SRCREV = "69077ee4d249816ed428155fc933dca424167e77" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake python3targetconfig EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ -DPYTHON_ABI=${PYTHON_ABI} \ + -DBUILD_PYTHON3=YES \ + -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \ " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) OECMAKE_GENERATOR = "Unix Makefiles" -do_configure:prepend() { - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_INCDIR=${STAGING_INCDIR} - export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} -} - -FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index bd4a5b3e89..02f1fcb420 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://collectd.org/" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854" -DEPENDS = "rrdtool curl libpcap libxml2 yajl libgcrypt libtool lvm2" +DEPENDS = "curl libpcap libxml2 yajl libgcrypt libtool lvm2" SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \ file://collectd.init \ diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240101.bb index 8887700e8a..988a8ee2b1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240101.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[sha256sum] = "315640ab0719225d5cbcab130585c05f0791fcf073072a5fe9479969aa2b833b" +SRC_URI[sha256sum] = "9419eb52b95837312a76ccb26002c5d624fab53abde0859f1c7364179dc0ebad" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index ed9f28e073..be420b4837 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Drop-using-register-storage-classifier.patch" SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" -DEPENDS += "cups python3 libusb1" +DEPENDS += "cups python3 libusb1 python3-setuptools-native" inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb index 3eefda7332..78640934a3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb @@ -23,7 +23,7 @@ CVE_STATUS_LIBLIST = " \ " do_configure:prepend() { - rm ${S}/m4/ax_python_devel.m4 + rm -f ${S}/m4/ax_python_devel.m4 } do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb index 0142bcbaf5..6fbc28394f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb @@ -24,7 +24,7 @@ CVE_STATUS_LIBLIST = " \ " do_configure:prepend() { - rm ${S}/m4/ax_python_devel.m4 + rm -f ${S}/m4/ax_python_devel.m4 } do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..7eaca66b5c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch new file mode 100644 index 0000000000..cd59a6d887 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch @@ -0,0 +1,26 @@ +From edc51ba1b446913232cdf2945f485392bca72dc7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 3 Aug 2015 13:43:14 +0800 +Subject: [PATCH] Makefile.am: respect ${PYTHONSITEDIR} + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/5192eab011ada47b0157f8d0524bf5b18bba3bd0] + + python/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 6e51744..0a3bad5 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} --install-lib=$(pythonsitedir) + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch deleted file mode 100644 index 636b294073..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 3 Aug 2015 13:43:14 +0800 -Subject: [PATCH] setup.py.in: add missing python include dir for cross - compiling - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - python/Makefile.am | 2 +- - python/setup.py.in | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index 1d00c0c..52816b2 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -14,7 +14,7 @@ all-local: - CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) - - install-exec-local: -- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} -+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} - - clean-local: - rm -rf py$(PYTHONREV) -diff --git a/python/setup.py.in b/python/setup.py.in -index a741b91..6759a95 100755 ---- a/python/setup.py.in -+++ b/python/setup.py.in -@@ -33,7 +33,7 @@ class sdist(_sdist): - - pwqmodule = Extension('pwquality', - sources = ['pwquality.c'], -- include_dirs = ['../src'], -+ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], - library_dirs = ['../src/.libs'], - libraries = ['pwquality']) - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb index 5287430c41..4454496f6c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb @@ -5,10 +5,11 @@ SECTION = "devel/lib" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" -DEPENDS = "cracklib" +DEPENDS = "cracklib python3-setuptools-native" SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \ - file://add-missing-python-include-dir-for-cross.patch \ + file://0001-Use-setuptools-instead-of-distutils.patch \ + file://0002-Makefile.am-respect-PYTHONSITEDIR.patch \ " SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch index dedb4adf9b..bd8f5be05d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch @@ -13,7 +13,7 @@ So using a wildcard helps in using any x86 arch Signed-off-by: Khem Raj <raj.khem@gmail.com> --- -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch deleted file mode 100644 index d1152ed641..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> -Date: Mon, 13 Apr 2020 20:12:11 +0200 -Subject: include: Declare gVERSION global as 'extern'. - -Fixes build with '-fno-common'. - -Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1012] -Signed-off-by: Adrian Bunk <bunk@stusta.de> ---- - include/version.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/version.h b/include/version.h -index 47366ef..3a567a1 100644 ---- a/include/version.h -+++ b/include/version.h -@@ -11,8 +11,8 @@ - extern "C" { - #endif - --const char* gVERSION; --const char* gVERSION_SHORT; -+extern const char* gVERSION; -+extern const char* gVERSION_SHORT; - - #ifdef __cplusplus - } --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch new file mode 100644 index 0000000000..4f07eae631 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch @@ -0,0 +1,46 @@ +From 30f78cb2775358dacd10b02c0ba2ec0c3ba2945d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 31 Dec 2023 19:16:35 -0800 +Subject: [PATCH 1/2] mraa: Use posix basename + +Musl has removed the declaration from string.h [1] which exposes the +problem especially with clang-17+ compiler where implicit function +declaration is flagged as error. Use posix basename and make a copy of +string to operate on to emulate GNU basename behaviour. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] + src/mraa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/mraa.c b/src/mraa.c +index 653ea1fa..b556d045 100644 +--- a/src/mraa.c ++++ b/src/mraa.c +@@ -12,6 +12,7 @@ + #endif + + #include <dlfcn.h> ++#include <libgen.h> + #include <pwd.h> + #include <sched.h> + #include <stddef.h> +@@ -341,9 +342,11 @@ static int + mraa_count_iio_devices(const char* path, const struct stat* sb, int flag, struct FTW* ftwb) + { + // we are only interested in files with specific names +- if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) { ++ char* tmp = strdup(path); ++ if (fnmatch(IIO_DEVICE_WILDCARD, basename(tmp), 0) == 0) { + num_iio_devices++; + } ++ free(tmp); + return 0; + } + +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..0e472255a9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,30 @@ +From ffa6f1254066b1d5d99192002043be945ff64297 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 31 Dec 2023 19:18:42 -0800 +Subject: [PATCH 2/2] gpio: Include limits.h for PATH_MAX + +Musl exposes this problem where PATH_MAX is used but limits.h is not +included, it works with glibc perhaps due to limits.h being indirectly +included by another system header. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] + src/gpio/gpio_chardev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gpio/gpio_chardev.c b/src/gpio/gpio_chardev.c +index 2cd15968..9f727de7 100644 +--- a/src/gpio/gpio_chardev.c ++++ b/src/gpio/gpio_chardev.c +@@ -12,6 +12,7 @@ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> + #include <poll.h> + #include <pthread.h> + #include <signal.h> +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index f1cdf66fc2..61f36d724d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,12 +5,13 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" -SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" +SRCREV = "3c288a09109969eef9c2da7d92d3c62f92a015cc" PV = "2.2.0+git${SRCPV}" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ - file://0001-include-Declare-gVERSION-global-as-extern.patch \ + file://0001-mraa-Use-posix-basename.patch \ + file://0002-gpio-Include-limits.h-for-PATH_MAX.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.19.bb b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb index 6b3160f090..5f45d7fbd6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.19.bb +++ b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb @@ -11,4 +11,4 @@ DEPENDS = "zstd liburing" SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz" -SRC_URI[sha256sum] = "d95bc8ee8a9f79b9f69ce63df53fb85b202139f243bbb84c399555eda22e6165" +SRC_URI[sha256sum] = "9b3d2842a08e69633c0ffa480c139603514ce59f1d021c263e9301324976959f" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb index 2df5e09194..3e757e6037 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb @@ -8,7 +8,7 @@ DEPENDS += "hiredis" SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" -SRCREV = "8b9ce389099608cf9bae617d79d257d2cc05e12f" +SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch index a90f588d2b..45556afa8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch @@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build SR_PKG_CHECK([python3], [SRD_PKGLIBS], - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) -+ [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) AS_IF([test "x$sr_have_python3" = xno], [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index 0695f99695..a86f4a80d8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" -DEPENDS = "libjpeg-turbo mraa" +DEPENDS = "libjpeg-turbo mraa python3-setuptools-native" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index aff555ad54..cc03ab4fea 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -27,7 +27,7 @@ DEPENDS += " \ swig-native \ " -PACKAGECONFIG ??= "python3" +PACKAGECONFIG ??= "" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" EXTRA_OECONF = "--without-python" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.2.bb index 577acda59b..d10f5ad413 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.2.bb @@ -11,6 +11,6 @@ inherit meson SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "a3e1050341956fcae53b2b4403affcf2578a42f4" +SRCREV = "8056d8701afbd9b985668916557159432e6ad824" FILES:${PN} = "${datadir}/themes" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb index 782833b228..83fb234fb3 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "d9cf9ebc4237252a82f88d9e99bea0c4b398c08a" +SRCREV = "60bb85d53d5da74903ab1e227fbecfa3a3be1b05" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb index 603ebe48d1..b503c6ed9c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" # Tag v0.9.1 -SRCREV = "cdd4d0e83e9ee79f73aeb0a4fb60b4abd8ecf947" +SRCREV = "c8781615183ce3cb4f5d72caf70f2c01d7d4d2af" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb index 40145b873c..2c38ce614b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb @@ -9,7 +9,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "ec5e44d3cfe6f50f1c64f28a6f0225d958f4f4621726d9c2a04b5a32e5106d23" +SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb index 404e86b86a..31dd495fd7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb @@ -24,6 +24,8 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" +PACKAGECONFIG = "readline" +PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" CFLAGS += "-fno-strict-aliasing" LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch new file mode 100644 index 0000000000..98a820bd9e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch @@ -0,0 +1,42 @@ +From 0a1af74ed3fae9a9a08b8b1ab89e88c02427ae06 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 10 Jan 2024 05:57:00 +0000 +Subject: [PATCH] csv-revision: Drop the git revision info + +The git revison info is added [1] to make the version more descriptive +to produce an incremental revision number like 1.8.18.13 or 1.8.18.14 +and etc and more clear in terms of "what codebase was used" like +`1.8.18.13.gee01aa5`. But it also introduces the below version +inconsistence. + root@qemux86-64:~# ipmitool -V + ipmitool version 1.8.19.19.gab5ce5b + root@qemux86-64:~# rpm -qa | grep ipmitool + ipmitool-1.8.19-r0.core2_64 + +Considering the version we acutally used in oe is a release version, +the git revision info as [1] is meaningness. So drop the git revsion +info to remove the above version inconsitence. + +[1] https://github.com/ipmitool/ipmitool/commit/ba01dc84b4e225c86eac3f562e629662d752040f + +Upstream-Status: Inappropriate [OE-Specific as we use a release version in oe] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + csv-revision | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/csv-revision b/csv-revision +index 289c133..3fa9f1c 100755 +--- a/csv-revision ++++ b/csv-revision +@@ -1,5 +1,6 @@ + #!/bin/sh + ++exit 0 + git describe --first-parent --tags 2>/dev/null | ( + IFS=- read tag rev hash + if [ $? ] && [ -n "$rev" ]; then +-- +2.35.5 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index a8279f5755..0f1c8846b4 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -24,6 +24,7 @@ DEPENDS = "openssl readline ncurses" SRCREV = "ab5ce5baff097ebb6e2a17a171858be213ee68d3" SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \ ${IANA_ENTERPRISE_NUMBERS} \ + file://0001-csv-revision-Drop-the-git-revision-info.patch \ " IANA_ENTERPRISE_NUMBERS ?= "" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 291a83aaad..6c97e28545 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -93,6 +93,7 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t sed -i -e 's|^all: docs|all:|' ${S}/tools/testing/selftests/bpf/Makefile sed -i -e '/mrecord-mcount/d' ${S}/Makefile sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile + sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.* for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb index c02645a6b8..f314d9b6ae 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb @@ -24,6 +24,7 @@ PACKAGECONFIG ??= "media-ctl" PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" +PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" SRC_URI = "\ git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ @@ -77,7 +78,9 @@ FILES:${PN} = "${bindir} ${sbindir}" FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ ${libdir}/libdvbv5*${SOLIBS} \ - ${libdir}/libv4l/*-decomp" + ${libdir}/libv4l/*-decomp \ + ${libdir}/libv4l2tracer.so \ +" FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch new file mode 100644 index 0000000000..d66ad4f268 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch @@ -0,0 +1,35 @@ +From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:13:09 +0100 +Subject: [PATCH] cmake: extract libtool from configure.ac and convert to + SOVERSION + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adc73b09..7ae5043f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) + + project(WavPack VERSION 5.6.0) + ++file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) ++string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") ++set(LT_CURRENT "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") ++set(LT_REVISION "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") ++set(LT_AGE "${CMAKE_MATCH_1}") ++ ++math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") ++math(EXPR SOVERSION_MINOR "${LT_AGE}") ++math(EXPR SOVERSION_MICRO "${LT_REVISION}") ++ + # Languages + + include(CheckLanguage) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch new file mode 100644 index 0000000000..faddb7b754 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch @@ -0,0 +1,26 @@ +From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:23:51 +0100 +Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack + +This is used to version .so libraries on Linux + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ae5043f..285b295b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) + target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") + endif() + else() ++ set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") ++ set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") + check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb deleted file mode 100644 index 9096123939..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" - -SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" -SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" -S = "${WORKDIR}/git" - -inherit autotools lib_package diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb new file mode 100644 index 0000000000..7384d2892f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \ + file://set-soversion-and-version.patch \ + file://extract-libtool-and-convert-to-soversion.patch \ + " + +SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.6.4.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb index 2dd7b684e4..92655e3c6f 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.6.4.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" -SRCREV = "d8371889d070d2f88636434ebd8412708a63e54e" +SRCREV = "986d2485784d57d7a84cc5af50e67bde827b0dc9" inherit cmake pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb index 5380e90223..7136ed6a4c 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb @@ -27,7 +27,7 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "auditd" SYSTEMD_SERVICE:auditd = "auditd.service" -DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" +DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native python3-setuptools-native" EXTRA_OECONF = " --with-libwrap \ --enable-gssapi-krb5=no \ 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 52c62cde30..f9fe82a91d 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 @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4 inherit autotools-brokensep pkgconfig python3native -PACKAGECONFIG ?= "ncat nping ndiff pcap" +PACKAGECONFIG ?= "ncat nping pcap" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest index 15971dec05..46572111b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest @@ -1,6 +1,6 @@ #!/bin/sh -if ./arestest; then +if ./arestest --gtest_filter=-*.Live*; then echo "PASS: c-ares" else echo "FAIL: c-ares" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch deleted file mode 100644 index 6b225a10cf..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0912e49d58c2a5f455fabf76ab7dc61cfc44cfb9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2023 20:50:26 -0700 -Subject: [PATCH] m4: Use autconf provided AC_FUNC_FSEEKO - -This helps in building with autoconf 2.72 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - m4/ac_func_fseeko.m4 | 18 +----------------- - 1 file changed, 1 insertion(+), 17 deletions(-) - -diff --git a/m4/ac_func_fseeko.m4 b/m4/ac_func_fseeko.m4 -index eaeabb978..f9b8859cf 100644 ---- a/m4/ac_func_fseeko.m4 -+++ b/m4/ac_func_fseeko.m4 -@@ -53,20 +53,4 @@ - # -------------- - AN_FUNCTION([ftello], [AC_FUNC_FSEEKO]) - AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO]) --AC_DEFUN([AC_FUNC_FSEEKO], --[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, -- [ac_cv_sys_largefile_source], -- [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).], -- [[#include <sys/types.h> /* for off_t */ -- #include <stdio.h>]], -- [[int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]]) -- --# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug --# in glibc 2.1.3, but that breaks too many other things. --# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. --if test $ac_cv_sys_largefile_source != unknown; then -- AC_DEFINE(HAVE_FSEEKO, 1, -- [Define to 1 if fseeko (and presumably ftello) exists and is declared.]) --fi --])# AC_FUNC_FSEEKO -+AC_FUNC_FSEEKO --- -2.40.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index e59b511a72..dcc951bce8 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,16 +4,15 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "-8" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \ - file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch" -SRCREV = "920f79206ff59f30a4cff22c9c9c393508b82663" +PV .= "-26" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" +SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2" S = "${WORKDIR}/git" @@ -38,7 +37,7 @@ PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" do_install:append:class-target() { for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do - sed -i 's,${STAGING_DIR_NATIVE},,g' ${D}${bindir}/"$file" + sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file" done sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb index 878d28f137..422d96359c 100644 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" # v2.7.6 -SRCREV = "e6372b88e09a4d1c573b57270de6b40846825a8b" +SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ file://ldflags.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index d78ee7a8df..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 51ec4c1f533dee9a499490c1c5bbd23d2191a4a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 20 Mar 2022 11:14:25 -0700 -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR - -Do not hardcode library path, this helps it install in right location -independent of platforms, e.g. ppc64 uses lib64 and not lib - -Upstream-Status: Submitted [https://github.com/mfontanini/cppkafka/pull/291] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4e44e6..25ec1ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ option(CPPKAFKA_EXPORT_CMAKE_CONFIG "Generate CMake config, target and version f - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - - if (NOT CPPKAFKA_CONFIG_DIR) -- set(CPPKAFKA_CONFIG_DIR lib/cmake/${PROJECT_NAME}) -+ set(CPPKAFKA_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - endif() - - # Maintain previous compatibility --- -2.35.1 - 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 fd57e4e283..cf2d933169 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -9,17 +9,21 @@ file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ " SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ - file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ " -SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" +SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab" -DEPENDS = "librdkafka boost chrpath-replacement-native" +BASEPV = "0.4.0" +PV = "${BASEPV}+git" + +DEPENDS = "librdkafka curl boost chrpath-replacement-native" inherit cmake +EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON" + S = "${WORKDIR}/git" do_install:append(){ - chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1 + chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV} sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc } diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch deleted file mode 100644 index ef9cc47d25..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 30 Sep 2023 06:38:53 +0100 -Subject: [PATCH] test: handle POSIX ioctl prototype - -glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...) -POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...) - -Check which prototype is used in <sys/ioctl.h> to avoid a conflict and conditionally -define the right one for the system. - -Bug: https://bugs.gentoo.org/914921 -Signed-off-by: Sam James <sam@gentoo.org> -Upstream-Status: Backport [https://github.com/linux-nvme/libnvme/commit/ca47ba3119365eafac0ab25a86cab9d9a1b29bd4] ---- - meson.build | 10 ++++++++++ - test/ioctl/mock.c | 6 +++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6fcf1da..2c979cc 100644 ---- a/meson.build -+++ b/meson.build -@@ -230,6 +230,16 @@ conf.set( - ), - description: 'Is network address and service translation available' - ) -+conf.set( -+ 'HAVE_GLIBC_IOCTL', -+ cc.compiles( -+ '''#include <sys/ioctl.h> -+ int ioctl(int fd, unsigned long request, ...); -+ ''', -+ name: 'ioctl has glibc-style prototype' -+ ), -+ description: 'Is ioctl the glibc interface (rather than POSIX)' -+) - - if cc.has_function_attribute('fallthrough') - conf.set('fallthrough', '__attribute__((__fallthrough__))') -diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c -index e917244..5d2ac94 100644 ---- a/test/ioctl/mock.c -+++ b/test/ioctl/mock.c -@@ -114,7 +114,11 @@ void end_mock_cmds(void) - } \ - }) - -+#ifdef HAVE_GLIBC_IOCTL - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - struct mock_cmds *mock_cmds; - bool result64; -@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...) - result64 = true; - break; - default: -- fail("unexpected %s %lu", __func__, request); -+ fail("unexpected %s %lu", __func__, (unsigned long) request); - } - check(mock_cmds->remaining_cmds, - "unexpected %s command", mock_cmds->name); --- -2.40.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb index 802edac508..985fd7c55c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb @@ -11,11 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "37a803cf77e224f66d86b1e1d9e74a15f55ea600" +SRCREV = "13ba38387e5446849ae59d3ccd8183cf9aca3145" -SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \ - file://0001-test-handle-POSIX-ioctl-prototype.patch \ -" +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb index 911582553c..a45ffe1849 100644 --- a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" -SRC_URI[sha256sum] = "474e9575e1235a0d8e3661f072de0193bab6ea1023363772f698a2cc39d640cf" +SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" inherit perlnative autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index a3bbbe39ef..4d089f3b79 100644 --- a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -2,8 +2,8 @@ SUMMARY = "raw image decoder" LICENSE = "LGPL-2.1-only | CDDL-1.0" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" -SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=master;protocol=https" -SRCREV = "cccb97647fcee56801fa68231fa8a38aa8b52ef7" +SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" +SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch index 19775fa529..d2d1fb5955 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch @@ -1,4 +1,4 @@ -From 0cade4573334571055127a2d4fe3641e2397948d Mon Sep 17 00:00:00 2001 +From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 20 Mar 2023 21:59:19 -0700 Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt @@ -18,15 +18,16 @@ TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/libgcrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index da5588ad..e482b654 100644 +index f410d997..e3f66781 100644 --- a/src/libgcrypt.c +++ b/src/libgcrypt.c -@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { +@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { } static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, @@ -41,6 +42,3 @@ index da5588ad..e482b654 100644 gcry_cipher_decrypt(cipher->key[0], out, len, in, len); } --- -2.40.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch index 0c7f53029e..d6bc75c3a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -1,4 +1,4 @@ -From d2525ba0bc7b11de12c54ea1a3d1eb862537136d Mon Sep 17 00:00:00 2001 +From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 15 Mar 2023 16:51:58 +0800 Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host @@ -9,12 +9,13 @@ not required by unittests, we can skip the search. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 22a36f37..aa32ca2e 100644 +index f5c30061..885c926a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES @@ -25,7 +26,7 @@ index 22a36f37..aa32ca2e 100644 # OpenSSH Capabilities are required for all unit tests find_program(SSH_EXECUTABLE NAMES ssh) if (SSH_EXECUTABLE) -@@ -293,6 +294,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) +@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") endif () @@ -33,6 +34,3 @@ index 22a36f37..aa32ca2e 100644 configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb index f33987acf5..31f29c1b7d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb @@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34" +SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb index 7ef4d89ce0..cece68c632 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" +SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ file://run-ptest" @@ -19,7 +19,9 @@ CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" do_install_ptest() { install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest install -d ${D}${PTEST_PATH}/resources/out - install -Dm 0644 ${B}/resources/*.xml ${D}${PTEST_PATH}/resources/ + for f in ${S}/resources/*.xml; do + install -m 0644 $f ${D}${PTEST_PATH}/resources/ + done } BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.8.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb index 2144592286..b29437db1e 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -14,7 +14,7 @@ SRC_URI = "\ file://run-ptest \ " -SRC_URI[sha256sum] = "28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e" +SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" BINCONFIG = "${bindir}/onig-config" diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb index 781e698cbf..6cacd3722c 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" -SRCREV = "d34bc1a3bdc148e2e1fe64998398e1a0552ab04c" +SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" S = "${WORKDIR}/git" DEPENDS += "opencl-headers virtual/opencl-icd" do_install() { - install -D -m 755 clinfo ${D}${bindir}/clinfo + oe_runmake install PREFIX=${D}${prefix} MANDIR=${D}${mandir} } diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch deleted file mode 100644 index e270a8e2e6..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6f868bbcd9e65447f459f74381c09d1e315a32f6 Mon Sep 17 00:00:00 2001 -From: Jakub Jelen <jjelen@redhat.com> -Date: Thu, 1 Dec 2022 20:08:53 +0100 -Subject: [PATCH 1/2] pkcs11-tool: Fix private key import - -Upstream-Status: Backport ---- - src/tools/pkcs11-tool.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c -index aae205fe2cd6..cfee8526d5b0 100644 ---- a/src/tools/pkcs11-tool.c -+++ b/src/tools/pkcs11-tool.c -@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - RSA_get0_factors(r, &r_p, &r_q); - RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); - #else -- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || -+ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || -- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { - util_fatal("OpenSSL error during RSA private key parsing"); -+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { - } - #endif - RSA_GET_BN(rsa, private_exponent, r_d); --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch deleted file mode 100644 index 880a13ac61..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4b5702409e7feea8cb410254285c120c57c10e1b Mon Sep 17 00:00:00 2001 -From: Jakub Jelen <jjelen@redhat.com> -Date: Thu, 1 Dec 2022 20:11:41 +0100 -Subject: [PATCH 2/2] pkcs11-tool: Log more information on OpenSSL errors - -Upstream-Status: Backport ---- - src/tools/pkcs11-tool.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c -index cfee8526d5b0..f2e6b1dd91cd 100644 ---- a/src/tools/pkcs11-tool.c -+++ b/src/tools/pkcs11-tool.c -@@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp; - r = EVP_PKEY_get1_RSA(pkey); - if (!r) { -- if (private) -- util_fatal("OpenSSL error during RSA private key parsing"); -- else -- util_fatal("OpenSSL error during RSA public key parsing"); -+ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - - RSA_get0_key(r, &r_n, &r_e, NULL); -@@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL; - if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) { -- if (private) -- util_fatal("OpenSSL error during RSA private key parsing"); -- else -- util_fatal("OpenSSL error during RSA public key parsing"); -+ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - #endif - RSA_GET_BN(rsa, modulus, r_n); -@@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || -- util_fatal("OpenSSL error during RSA private key parsing"); - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { -+ util_fatal("OpenSSL error during RSA private key parsing: %s", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - #endif - RSA_GET_BN(rsa, private_exponent, r_d); --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch deleted file mode 100644 index 165fc316bf..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch +++ /dev/null @@ -1,54 +0,0 @@ -CVE: CVE-2023-2977 -Upstream-Status: Backport [ https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a ] -Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> - - -From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001 -From: fullwaywang <fullwaywang@tencent.com> -Date: Mon, 29 May 2023 10:38:48 +0800 -Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer - overrun bug. Fixes #2785 - ---- - src/pkcs15init/pkcs15-cardos.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c -index 9715cf390f..f41f73c349 100644 ---- a/src/pkcs15init/pkcs15-cardos.c -+++ b/src/pkcs15init/pkcs15-cardos.c -@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - sc_apdu_t apdu; - u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; - int r; -- const u8 *p = rbuf, *q; -+ const u8 *p = rbuf, *q, *pp; - size_t len, tlen = 0, ilen = 0; - - sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); -@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - return 0; - - while (len != 0) { -- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); -- if (p == NULL) -+ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); -+ if (pp == NULL) - return 0; - if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { - /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ - /* and Package Number 0x07 */ -- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); -+ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); - if (q == NULL || ilen != 4) - return 0; - if (q[0] == 0x07) -@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { - /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ - /* and Package Number 0x02 */ -- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); -+ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); - if (q == NULL || ilen != 4) - return 0; - if (q[0] == 0x02) diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.24.0.bb index b3fc1f0458..fd64cf9e85 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.24.0.bb @@ -12,11 +12,8 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 -SRCREV = "5497519ea6b4af596628f8f8f2f904bacaa3148f" +SRCREV = "f15d0c5295f3247ae56bf976cf411fec4b47b6ec" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ - file://0001-pkcs11-tool-Fix-private-key-import.patch \ - file://0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch \ - file://CVE-2023-2977.patch \ " DEPENDS = "virtual/libiconv openssl" @@ -44,6 +41,7 @@ FILES:${PN} += "\ ${libdir}/pkcs11-spy.so \ " FILES:${PN}-dev += "\ + ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/opensc-pkcs11.so \ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.1.bb index e7f4551afa..0862f955b6 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" DEPENDS = "autoconf-archive-native flex-native" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356" +SRC_URI[sha256sum] = "5edcaf5d4544403bdab6ee2b5d6c02c6f97ea64eebf0825b8d0fa61ba417dada" inherit autotools systemd pkgconfig perlnative @@ -23,11 +23,12 @@ EXTRA_OECONF = " \ S = "${WORKDIR}/pcsc-lite-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev" PACKAGECONFIG:class-native ??= "" PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" +PACKAGECONFIG[polkit] = ",--disable-polkit,polkit" PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" @@ -35,7 +36,8 @@ RRECOMMENDS:${PN} = "ccid" RRECOMMENDS:${PN}:class-native = "" RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" -FILES:${PN} = "${sbindir}/pcscd" +FILES:${PN} = "${sbindir}/pcscd \ + ${datadir}/polkit-1" FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" FILES:${PN}-dev = "${includedir} \ ${libdir}/pkgconfig \ diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.2.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb index b71fb0427b..97a94ec973 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" -SRCREV = "b1018b83346f8a3bc3d42c96f2ed4dc62147cb24" +SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" inherit autotools pkgconfig S = "${WORKDIR}/git" -DEPENDS = "pcsc-lite" +DEPENDS = "pcsc-lite autoconf-archive-native" RDEPENDS:${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ @@ -21,4 +21,5 @@ RDEPENDS:${PN} += " \ libpcsc-perl \ " -FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt" +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt \ + ${datadir}/pcsc/gscriptor.png" diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch deleted file mode 100644 index c6b01d06fc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9664809da36bd7bada3e44f50cfc042539fb61ee Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Sun, 14 Jul 2019 19:13:21 -0700 -Subject: [PATCH] Fix building with musl - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- - termios2.c | 27 +++++++++++++++++++++++++++ - termios2.h | 5 +++++ - 2 files changed, 32 insertions(+) - -diff --git a/termios2.c b/termios2.c -index 97c3be0..88ff6fc 100644 ---- a/termios2.c -+++ b/termios2.c -@@ -37,6 +37,7 @@ - #include <errno.h> - #include <termios.h> - #include <sys/ioctl.h> -+#include <asm/ioctls.h> - - /* Contains the definition of the termios2 structure and some related - constants that we should normally include from system -@@ -53,6 +54,10 @@ - */ - #define IBAUD0 020000000000 - -+#if !defined(__GLIBC__) -+#define __MAX_BAUD B4000000 -+#endif -+ - int - tc2setattr(int fd, int optional_actions, const struct termios *tios) - { -@@ -79,8 +84,13 @@ tc2setattr(int fd, int optional_actions, const struct termios *tios) - t2.c_cflag = tios->c_cflag; - t2.c_lflag = tios->c_lflag; - t2.c_line = tios->c_line; -+#if !defined(__GLIBC__) -+ t2.c_ispeed = tios->__c_ispeed; -+ t2.c_ospeed = tios->__c_ospeed; -+#else - t2.c_ispeed = tios->c_ispeed; - t2.c_ospeed = tios->c_ospeed; -+#endif - memcpy(&t2.c_cc[0], &tios->c_cc[0], K_NCCS * sizeof (cc_t)); - - return ioctl(fd, cmd, &t2); -@@ -101,8 +111,13 @@ tc2getattr(int fd, struct termios *tios) - tios->c_cflag = t2.c_cflag; - tios->c_lflag = t2.c_lflag; - tios->c_line = t2.c_line; -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = t2.c_ispeed; -+ tios->__c_ospeed = t2.c_ospeed; -+#else - tios->c_ispeed = t2.c_ispeed; - tios->c_ospeed = t2.c_ospeed; -+#endif - memcpy(&tios->c_cc[0], &t2.c_cc[0], K_NCCS * sizeof (cc_t)); - - for (i = K_NCCS; i < NCCS; i++) -@@ -131,7 +146,11 @@ cf2setispeed(struct termios *tios, speed_t speed) - errno = EINVAL; - return -1; - } -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (speed << IBSHIFT); - -@@ -156,7 +175,11 @@ cf2setospeed_custom(struct termios *tios, int speed) - } - tios->c_cflag &= ~(CBAUD | CBAUDEX); - tios->c_cflag |= BOTHER; -+#if !defined(__GLIBC__) -+ tios->__c_ospeed = speed; -+#else - tios->c_ospeed = speed; -+#endif - - return 0; - } -@@ -177,7 +200,11 @@ cf2setispeed_custom(struct termios *tios, int speed) - } else { - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (BOTHER << IBSHIFT); -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - } - - return 0; -diff --git a/termios2.h b/termios2.h -index e13b0e3..63dd0ce 100644 ---- a/termios2.h -+++ b/termios2.h -@@ -37,8 +37,13 @@ - /* And define these new ones */ - #define cfsetospeed_custom cf2setospeed_custom - #define cfsetispeed_custom cf2setispeed_custom -+#if defined(__linux__) && !defined(__GLIBC__) -+#define cfgetospeed_custom(tiop) ((tiop)->__c_ospeed) -+#define cfgetispeed_custom(tiop) ((tiop)->__c_ispeed) -+#else - #define cfgetospeed_custom(tiop) ((tiop)->c_ospeed) - #define cfgetispeed_custom(tiop) ((tiop)->c_ispeed) -+#endif - - /* Replacements for the standard tcsetattr(3), tcgetattr(3) - * functions. Same user interface, but these use the new termios2 diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb index 55dc292710..4ec256bb99 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb @@ -1,16 +1,15 @@ SUMMARY = "Lightweight and minimal dumb-terminal emulation program" SECTION = "console/utils" LICENSE = "GPL-2.0-or-later" -HOMEPAGE = "https://github.com/npat-efault/picocom" +HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" -BASEPV = "3.1" +BASEPV = "2023-04" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" +SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" -SRC_URI = "git://github.com/npat-efault/picocom;branch=master;protocol=https \ - file://0001-Fix-building-with-musl.patch \ +SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index 4d709fc526..f0824944b9 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" -SRCREV = "f6afdbb9288d20d1257122e71d88e53348a53af3" -PV = "3.6.5" +SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" +PV = "3.6.6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch b/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch new file mode 100644 index 0000000000..5a74323bca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch @@ -0,0 +1,31 @@ +From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001 +From: "Ilya A. Kriveshko" <iillyyaa@gmail.com> +Date: Tue, 2 Jan 2024 15:37:10 -0500 +Subject: [PATCH] cmake: respect explicit install prefix + +If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows +the pattern suggested by cmake documentation in: +https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html + +Upstream-status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/68] +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b8108c..ac9f464e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries) + include(GNUInstallDirs) + + # FHS compliant paths for Linux installation +-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") +- set(CMAKE_INSTALL_PREFIX "/usr") ++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ++ AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE) + endif() + + # Pull in the rest of the pieces diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb index 06ce48e65c..3e8a87d07f 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = " \ https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ file://0001-Disable-doxygen.patch \ - file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch" + file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \ + file://0001-cmake-respect-explicit-install-prefix.patch" SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" S = "${WORKDIR}/${BP}-Source" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb index 6149a7ac49..3c6b7db811 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb @@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://no-musttail-arm.patch \ " -SRC_URI[sha256sum] = "0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2" +SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch index 53c119765a..f107f42dab 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -1,4 +1,4 @@ -From 9ed3b4e628f9254d5c86006fe63c33a1eb02aee5 Mon Sep 17 00:00:00 2001 +From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 4 Feb 2020 23:39:49 -0800 Subject: [PATCH] nss/nspr: fix for multilib @@ -6,15 +6,16 @@ Subject: [PATCH] nss/nspr: fix for multilib Upstream-Status: Pending Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index b46d97d..39f4318 100644 +index 51621d6..3d23683 100644 --- a/configure.ac +++ b/configure.ac -@@ -920,24 +920,24 @@ fi +@@ -960,24 +960,24 @@ fi dnl Priority 1: User specifies the path to installation if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) @@ -47,6 +48,3 @@ index b46d97d..39f4318 100644 fi fi --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 1451ff5647..3a1531deb1 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -1,4 +1,4 @@ -From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 +From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -8,20 +8,21 @@ Upstream-Status: Pending Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 951b3eb..1fdeb0f 100644 +index ce8a278..51621d6 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,7 +866,7 @@ MOZILLA_MIN_VERSION="1.4" +@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" -NSS_INCLUDE_MARKER="nss/nss.h" +NSS_INCLUDE_MARKER="nss3/nss.h" NSS_LIB_MARKER="libnss3$shrext" - NSS_LIBS_LIST="-lnss3 -lsmime3" + NSS_LIBS_LIST="-lnss3 -lsmime3 -lnssutil3" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch index a5a298af0d..7b07628e5f 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -1,4 +1,7 @@ -xmlsec1: Fix configure QA error caused by host lookup path +From c16d384fb64cf53351e150fb9e9b99cc6ba970b2 Mon Sep 17 00:00:00 2001 +From: Anatol Belski <anbelski@linux.microsoft.com> +Date: Thu, 14 Jan 2021 17:36:23 +0000 +Subject: [PATCH] xmlsec1: Fix configure QA error caused by host lookup path ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. @@ -7,9 +10,15 @@ It will eventually arise after the configure QA as the configure script should o Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> ---- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000 -+++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000 -@@ -250,8 +250,8 @@ +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d23683..baf27b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -286,8 +286,8 @@ fi dnl ========================================================================== dnl Common installation locations dnl ========================================================================== diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch index af598fe749..73c6ddb027 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch @@ -1,4 +1,4 @@ -From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001 +From 1b9701faf22f5a17a81a2a2732794d9627499fcb Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Thu, 21 Jan 2010 14:11:20 +0800 Subject: [PATCH] force to use our own libtool @@ -12,10 +12,10 @@ Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ltmain.sh b/ltmain.sh -index 147d758..a61f16b 100644 +index 1dea62a..bfb9784 100755 --- a/ltmain.sh +++ b/ltmain.sh -@@ -6969,7 +6969,7 @@ func_mode_link () +@@ -7225,7 +7225,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.3.bb index ff5b6faeb4..7a5f01e4fd 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.3.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf" +SRC_URI[sha256sum] = "ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2" inherit autotools-brokensep ptest pkgconfig diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 7b7d7bee98..41fce53274 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -210,7 +210,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-jsonpath-rw \ python3-jsonpointer \ python3-jsonref \ - python3-jsonrpcserver \ python3-jsonschema \ python3-jstyleson \ python3-kconfiglib \ @@ -218,7 +217,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-keras-preprocessing \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "python3-kivy", "", d)} \ python3-kiwisolver \ - python3-kmod \ python3-langtable \ python3-lazy-object-proxy \ python3-libconf \ @@ -459,7 +457,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-wtforms \ python3-xlrd \ python3-xlsxwriter \ - python3-xmlrunner \ python3-xmltodict \ python3-xmodem \ python3-xstatic \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch b/meta-openembedded/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch new file mode 100644 index 0000000000..34caaca982 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch @@ -0,0 +1,29 @@ +From 0920bd21ceab75bc4b655c571a37835526dd2468 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 27 Dec 2023 15:12:19 +0100 +Subject: [PATCH] versioneer.py: do not use SafeConfigParser + +This has been deprecated for a long time, and finally removed in python 3.12 + +Upstream-Status: Submitted [https://github.com/rsokl/custom_inherit/pull/49] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + versioneer.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/versioneer.py b/versioneer.py +index 64fea1c..3aa5da3 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb index 4c4ed3ffd9..694f577b06 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb @@ -3,7 +3,7 @@ SUMMARY = "jinja2 template renderer for aiohttp.web (http server for asyncio)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=29dca541e03964615590ca7b50392d97" -SRC_URI[sha256sum] = "8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01" +SRC_URI[sha256sum] = "a3a7ff5264e5bca52e8ae547bbfd0761b72495230d438d05b6c0915be619b0e2" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.30.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.0.bb index 78e6149649..24a579fb93 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.30.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.0.bb @@ -12,10 +12,10 @@ tool; Argh just makes it easy to use." LICENSE = "LGPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ - file://README.rst;beginline=261;endline=275;md5=39ec83a704aed9f33618c5d04e478a08 \ + file://README.rst;beginline=261;endline=275;md5=ba124578a6853962d5038eabef535d12 \ " -SRC_URI[sha256sum] = "b37dfd617a09d19a4a7bcaed0e060b288bc7ac8dfdc0facf886a49a25ff33728" +SRC_URI[sha256sum] = "b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0" inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.9.2.bb index 0d7107a0f2..7d7be0b1aa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.9.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "912efbeed6d8b155c8e8c37464f79d75b1de58936c0f29ffb599ce95af5563f2" +SRC_URI[sha256sum] = "a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.2.bb index e26405dd7f..ad2025e644 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "98c4d007a6d9803c6433c743c0240e73de930530f8255e1e21d2e20e8991a30b" +SRC_URI[sha256sum] = "8069a8f473bb1679990bea0903f3a22d58df5495aebbf09f58d49f627511b619" PYPI_PACKAGE = "cantools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.0.bb index 42bc9fc8ed..cb1041c2ff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.0.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] = "020d56d2da5bc22a0e00a5b0d54597ee91ad72446fa4cf1b97c35022f6b6dbf0" +SRC_URI[sha256sum] = "707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb index 478abbf1fd..e7409f77e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f910a85a4c3da51edf780f17a7608434" PYPI_PACKAGE = "custom_inherit" +SRC_URI += "file://0001-versioneer.py-do-not-use-SafeConfigParser.patch" SRC_URI[sha256sum] = "7052eb337bcce83551815264391cc4efc2bf70b295a3c52aba64f1ab57c3a8a2" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.3.2.bb index 70e9831770..d7d4b22fbd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.2.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cvxopt_1.3.2.bb @@ -1,11 +1,11 @@ SUMMARY = "Convex optimization package" HOMEPAGE = "http://cvxopt.org" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ba1a8a73d8ebea5c47a1173aaf476ddd" +LIC_FILES_CHKSUM = "file://LICENSE;md5=66ec4f8e53d3e733a8c26d5ca3830fba" SRC_URI = "git://github.com/cvxopt/cvxopt;protocol=https;branch=master" -SRCREV = "d5a21cf1da62e4269176384b1ff62edac5579f94" +SRCREV = "3b718ee560b3b97d6255c55f0ed7f64cb4b72082" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.0.bb index 99a61f136d..e0afd3718f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc" +SRC_URI[sha256sum] = "cfadcdb638b609361d29ec22360d6070a77d7463dcb3ab08d2c2f2f168845f58" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask" UPSTREAM_CHECK_REGEX = "/Flask/(?P<pver>(\d+[\.\-_]*)+)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch new file mode 100644 index 0000000000..1171322e26 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch @@ -0,0 +1,263 @@ +From 43f132103cedfd92b85173bcdacfbabd5916d9fc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 27 Dec 2023 14:52:16 +0100 +Subject: [PATCH] src: fix python 3.12 builds + +This is a backport for 3.1.x versions provided separately in https://github.com/aleaxit/gmpy/issues/446 + +Upstream-Status: Inappropriate [can be dropped when 2.2.x is released] + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/gmpy2_convert.h | 21 +++++++ + src/gmpy2_convert_gmp.c | 129 +++++++++++++------------------------- + src/gmpy2_convert_utils.c | 2 +- + 3 files changed, 65 insertions(+), 87 deletions(-) + +diff --git a/src/gmpy2_convert.h b/src/gmpy2_convert.h +index f887d47..3e8cb2b 100644 +--- a/src/gmpy2_convert.h ++++ b/src/gmpy2_convert.h +@@ -142,6 +142,27 @@ extern "C" { + #define IS_TYPE_COMPLEX_ONLY(x) ((x > OBJ_TYPE_REAL) && \ + (x < OBJ_TYPE_COMPLEX)) + ++/* Compatibility macros (to work with PyLongObject internals). ++ */ ++ ++#if PY_VERSION_HEX >= 0x030C0000 ++# define TAG_FROM_SIGN_AND_SIZE(is_neg, size) ((is_neg?2:(size==0)) | (((size_t)size) << 3)) ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (obj->long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE(is_neg, size)) ++#elif PY_VERSION_HEX >= 0x030900A4 ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SET_SIZE(obj, (is_neg?-1:1)*size)) ++#else ++# define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SIZE(obj) = (is_neg?-1:1)*size) ++#endif ++ ++#if PY_VERSION_HEX >= 0x030C0000 ++# define GET_OB_DIGIT(obj) obj->long_value.ob_digit ++# define _PyLong_IsNegative(obj) ((obj->long_value.lv_tag & 3) == 2) ++# define _PyLong_DigitCount(obj) (obj->long_value.lv_tag >> 3) ++#else ++# define GET_OB_DIGIT(obj) obj->ob_digit ++# define _PyLong_IsNegative(obj) (Py_SIZE(obj) < 0) ++# define _PyLong_DigitCount(obj) (_PyLong_IsNegative(obj)? -Py_SIZE(obj):Py_SIZE(obj)) ++#endif + + /* Since the macros are used in gmpy2's codebase, these functions are skipped + * until they are needed for the C API in the future. +diff --git a/src/gmpy2_convert_gmp.c b/src/gmpy2_convert_gmp.c +index cf0891e..8b8df81 100644 +--- a/src/gmpy2_convert_gmp.c ++++ b/src/gmpy2_convert_gmp.c +@@ -59,33 +59,24 @@ GMPy_MPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(result->z, 0); + break; +- case 1: +- mpz_set_si(result->z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(result->z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(result->z, result->z); +- } ++ if (negative) { ++ mpz_neg(result->z, result->z); + } + return result; + } +@@ -105,33 +96,24 @@ mpz_set_PyIntOrLong(mpz_t z, PyObject *obj) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(z, 0); + break; +- case 1: +- mpz_set_si(z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(z, z); +- } ++ if (negative) { ++ mpz_neg(z, z); + } + return; + } +@@ -186,12 +168,7 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context) + + /* Assume gmp uses limbs as least as large as the builtin longs do */ + +- if (mpz_sgn(obj->z) < 0) { +- negative = 1; +- } else { +- negative = 0; +- } +- ++ negative = mpz_sgn(obj->z) < 0; + size = (mpz_sizeinbase(obj->z, 2) + PyLong_SHIFT - 1) / PyLong_SHIFT; + + if (!(result = _PyLong_New(size))) { +@@ -200,31 +177,20 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context) + /* LCOV_EXCL_STOP */ + } + +- mpz_export(result->ob_digit, &count, -1, sizeof(result->ob_digit[0]), 0, +- sizeof(result->ob_digit[0])*8 - PyLong_SHIFT, obj->z); ++ mpz_export(GET_OB_DIGIT(result), &count, -1, sizeof(GET_OB_DIGIT(result)[0]), 0, ++ sizeof(GET_OB_DIGIT(result)[0])*8 - PyLong_SHIFT, obj->z); + + if (count == 0) { +- result->ob_digit[0] = 0; ++ GET_OB_DIGIT(result)[0] = 0; + } + + /* long_normalize() is file-static so we must reimplement it */ + /* longobjp = long_normalize(longobjp); */ +- while ((size>0) && (result->ob_digit[size-1] == 0)) { ++ while ((size>0) && (GET_OB_DIGIT(result)[size-1] == 0)) { + size--; + } +-#if PY_VERSION_HEX >= 0x030900A4 +- Py_SET_SIZE(result, size); +-#else +- Py_SIZE(result) = size; +-#endif + +- if (negative) { +-#if PY_VERSION_HEX >= 0x030900A4 +- Py_SET_SIZE(result, - Py_SIZE(result)); +-#else +- Py_SIZE(result) = - Py_SIZE(result); +-#endif +- } ++ _PyLong_SetSignAndDigitCount(result, negative, size); + return (PyObject*)result; + } + +@@ -476,33 +442,24 @@ GMPy_XMPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context) + } + #endif + +- switch (Py_SIZE(templong)) { +- case -1: +- mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]); ++ len = _PyLong_DigitCount(templong); ++ negative = _PyLong_IsNegative(templong); ++ ++ switch (len) { ++ case 1: ++ mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]); + break; + case 0: + mpz_set_si(result->z, 0); + break; +- case 1: +- mpz_set_si(result->z, templong->ob_digit[0]); +- break; + default: +- mpz_set_si(result->z, 0); +- +- if (Py_SIZE(templong) < 0) { +- len = - Py_SIZE(templong); +- negative = 1; +- } else { +- len = Py_SIZE(templong); +- negative = 0; +- } +- +- mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0, +- sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit); ++ mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0, ++ sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT, ++ GET_OB_DIGIT(templong)); ++ } + +- if (negative) { +- mpz_neg(result->z, result->z); +- } ++ if (negative) { ++ mpz_neg(result->z, result->z); + } + return result; + } +@@ -639,7 +596,7 @@ GMPy_MPQ_From_PyStr(PyObject *s, int base, CTXT_Object *context) + } + + cp = PyBytes_AsString(ascii_str); +- ++ + { + char *whereslash = strchr((char*)cp, '/'); + char *wheredot = strchr((char*)cp, '.'); +diff --git a/src/gmpy2_convert_utils.c b/src/gmpy2_convert_utils.c +index d676eaf..8908d17 100644 +--- a/src/gmpy2_convert_utils.c ++++ b/src/gmpy2_convert_utils.c +@@ -123,7 +123,7 @@ static unsigned long + GMPy_Integer_AsUnsignedLongWithType_v2(PyObject *x, int xtype) + { + if IS_TYPE_PyInteger(xtype) { +- if (Py_SIZE(x) < 0) { ++ if (_PyLong_IsNegative(((PyLongObject*)x))) { + VALUE_ERROR("n must be > 0"); + return (unsigned long)-1; + } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb index 9a66af9a98..d9e9bd50e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb @@ -10,5 +10,6 @@ PYPI_PACKAGE = "gmpy2" SRC_URI[sha256sum] = "bc297f1fd8c377ae67a4f493fc0f926e5d1b157e5c342e30a4d84dc7b9f95d96" inherit pypi setuptools3 python3native +SRC_URI += "file://0001-src-fix-python-3.12-builds.patch" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.111.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.112.0.bb index 89613516e6..b1614b854f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.111.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.112.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] = "3a45a53c031478d1c82c7162dd25c9a965247bca6bd438af0838a9d9b8219405" +SRC_URI[sha256sum] = "c3bcb5fd70d57f4c94b30c0dbeade53c216febfbf1d771eeb1a2fa74bd0d6756" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.25.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.1.bb index 2f527611e4..1a4913b718 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.25.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "42f707937feb4f5e5a39e6c4f343a17300a459aaf03141457ba505812841cc40" +SRC_URI[sha256sum] = "54385acca5c0fbdda510cd8585ba6f3fcb06eeecf8a6ecca39d3ee148b092590" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch new file mode 100644 index 0000000000..aba62ddf14 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch @@ -0,0 +1,796 @@ +From 1e02dbe5533d679b9ef064078a303607a7d0542a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 29 Dec 2023 14:33:38 +0100 +Subject: [PATCH] Fix Cython 3 compatibility + +Upstream-Status: Backport [https://github.com/h5py/h5py/pull/2345/commits] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + benchmarks/benchmark_slicing.py | 12 ++++---- + docs/conf.py | 2 +- + docs/high/dataset.rst | 4 +-- + docs/high/file.rst | 6 ++-- + docs/requirements-rtd.txt | 5 ++-- + docs/vds.rst | 2 +- + docs/whatsnew/3.0.rst | 2 +- + docs/whatsnew/3.7.rst | 4 +-- + h5py/_errors.pxd | 10 +++---- + h5py/_errors.pyx | 4 +-- + h5py/_hl/base.py | 4 +-- + h5py/_hl/dataset.py | 8 ++--- + h5py/_hl/dims.py | 3 +- + h5py/_hl/files.py | 2 +- + h5py/_locks.pxi | 6 ++-- + h5py/_proxy.pyx | 4 +-- + h5py/_selector.pyx | 2 +- + h5py/api_compat.h | 13 ++++---- + h5py/api_types_hdf5.pxd | 48 +++++++++++++++--------------- + h5py/h5fd.pyx | 38 ++++++++++++++++------- + h5py/h5p.pyx | 4 +-- + h5py/h5t.pyx | 2 +- + h5py/tests/test_attrs_data.py | 2 +- + h5py/tests/test_big_endian_file.py | 4 +-- + h5py/tests/test_dataset.py | 4 +-- + h5py/tests/test_file.py | 6 ++-- + h5py/tests/test_file_alignment.py | 4 +-- + h5py/tests/test_group.py | 4 +-- + h5py/tests/test_selections.py | 2 +- + pylintrc | 2 +- + pyproject.toml | 2 +- + setup_configure.py | 2 +- + tox.ini | 2 +- + 33 files changed, 116 insertions(+), 103 deletions(-) + +diff --git a/benchmarks/benchmark_slicing.py b/benchmarks/benchmark_slicing.py +index e9a34dad..b833f012 100644 +--- a/benchmarks/benchmark_slicing.py ++++ b/benchmarks/benchmark_slicing.py +@@ -7,7 +7,7 @@ import logging + logger = logging.getLogger(__name__) + import h5py + +-#Needed for mutithreading: ++#Needed for multithreading: + from queue import Queue + from threading import Thread, Event + import multiprocessing +@@ -173,8 +173,8 @@ class SlicingBenchmark: + + if __name__ == "__main__": + logging.basicConfig(level=logging.INFO) +- benckmark = SlicingBenchmark() +- benckmark.setup() +- benckmark.time_sequential_reads() +- benckmark.time_threaded_reads() +- benckmark.teardown() ++ benchmark = SlicingBenchmark() ++ benchmark.setup() ++ benchmark.time_sequential_reads() ++ benchmark.time_threaded_reads() ++ benchmark.teardown() +diff --git a/docs/conf.py b/docs/conf.py +index 93b23939..a0f6c1ac 100644 +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -109,7 +109,7 @@ pygments_style = 'sphinx' + + # The theme to use for HTML and HTML Help pages. See the documentation for + # a list of builtin themes. +-html_theme = 'default' ++html_theme = 'sphinx_rtd_theme' + + # Theme options are theme-specific and customize the look and feel of a theme + # further. For a list of options available for each theme, see the +diff --git a/docs/high/dataset.rst b/docs/high/dataset.rst +index 0f27284f..cb75fffe 100644 +--- a/docs/high/dataset.rst ++++ b/docs/high/dataset.rst +@@ -58,7 +58,7 @@ the requested ``dtype``. + Reading & writing data + ---------------------- + +-HDF5 datasets re-use the NumPy slicing syntax to read and write to the file. ++HDF5 datasets reuse the NumPy slicing syntax to read and write to the file. + Slice specifications are translated directly to HDF5 "hyperslab" + selections, and are a fast and efficient way to access data in the file. The + following slicing arguments are recognized: +@@ -464,7 +464,7 @@ Reference + >>> dset = f["MyDS"] + >>> f.close() + >>> if dset: +- ... print("datset accessible") ++ ... print("dataset accessible") + ... else: + ... print("dataset inaccessible") + dataset inaccessible +diff --git a/docs/high/file.rst b/docs/high/file.rst +index 484498ce..e757fe1a 100644 +--- a/docs/high/file.rst ++++ b/docs/high/file.rst +@@ -392,7 +392,7 @@ Data alignment + When creating datasets within files, it may be advantageous to align the offset + within the file itself. This can help optimize read and write times if the data + become aligned with the underlying hardware, or may help with parallelism with +-MPI. Unfortunately, aligning small variables to large blocks can leave alot of ++MPI. Unfortunately, aligning small variables to large blocks can leave a lot of + empty space in a file. To this effect, application developers are left with two + options to tune the alignment of data within their file. The two variables + ``alignment_threshold`` and ``alignment_interval`` in the :class:`File` +@@ -415,7 +415,7 @@ number of regions. Setting a small value can reduce the overall file size, + especially in combination with the ``libver`` option. This controls how the + overall data and metadata are laid out within the file. + +-For more information, see the offical HDF5 documentation `H5P_SET_META_BLOCK_SIZE ++For more information, see the official HDF5 documentation `H5P_SET_META_BLOCK_SIZE + <https://portal.hdfgroup.org/display/HDF5/H5P_SET_META_BLOCK_SIZE>`_. + + Reference +@@ -497,7 +497,7 @@ Reference + Only available with HDF5 >= 1.12.1 or 1.10.x >= 1.10.7. + :param alignment_threshold: Together with ``alignment_interval``, this + property ensures that any file object greater than or equal +- in size to the alignement threshold (in bytes) will be ++ in size to the alignment threshold (in bytes) will be + aligned on an address which is a multiple of alignment interval. + :param alignment_interval: This property should be used in conjunction with + ``alignment_threshold``. See the description above. For more +diff --git a/docs/requirements-rtd.txt b/docs/requirements-rtd.txt +index e67a3eee..52096927 100644 +--- a/docs/requirements-rtd.txt ++++ b/docs/requirements-rtd.txt +@@ -1,3 +1,2 @@ +-sphinx==4.3.0 +-sphinx_rtd_theme==1.0.0 +-readthedocs-sphinx-search==0.1.1 ++sphinx==7.2.6 ++sphinx_rtd_theme==1.3.0 +diff --git a/docs/vds.rst b/docs/vds.rst +index a9a7c7f6..bd47ad1c 100644 +--- a/docs/vds.rst ++++ b/docs/vds.rst +@@ -124,7 +124,7 @@ Reference + slice it to indicate which regions should be used in the virtual dataset. + + When `creating a virtual dataset <creating_vds_>`_, paths to sources present +- in the same file are changed to a ".", refering to the current file (see ++ in the same file are changed to a ".", referring to the current file (see + `H5Pset_virtual <https://portal.hdfgroup.org/display/HDF5/H5P_SET_VIRTUAL>`_). + This will keep such sources valid in case the file is renamed. + +diff --git a/docs/whatsnew/3.0.rst b/docs/whatsnew/3.0.rst +index db30ad66..ff3c2bef 100644 +--- a/docs/whatsnew/3.0.rst ++++ b/docs/whatsnew/3.0.rst +@@ -44,7 +44,7 @@ New features + See also the deprecation related to the ``external`` argument. + * Support for setting file space strategy at file creation. Includes option to + persist empty space tracking between sessions. See :class:`.File` for details. +-* More efficient writing when assiging a scalar to a chunked dataset, when the ++* More efficient writing when assigning a scalar to a chunked dataset, when the + number of elements to write is no more than the size of one chunk. + * Introduced support for the split :ref:`file driver <file_driver>` + (:pr:`1468`). +diff --git a/docs/whatsnew/3.7.rst b/docs/whatsnew/3.7.rst +index 27790254..2e822d68 100644 +--- a/docs/whatsnew/3.7.rst ++++ b/docs/whatsnew/3.7.rst +@@ -19,7 +19,7 @@ New features + include it. Alternatively, you can :ref:`build h5py from source <source_install>` + against an HDF5 build with the direct driver enabled. + * The :class:`.File` constructor contains two new parameters ``alignment_threshold``, +- and ``alignment_interval`` controling the data alignment within the HDF5 ++ and ``alignment_interval`` controlling the data alignment within the HDF5 + file (:pr:`2040`). + * :meth:`~.Group.create_dataset` and :meth:`~.Group.require_dataset` now accept + parameters ``efile_prefix`` and ``virtual_prefix`` to set a filesystem path +@@ -40,7 +40,7 @@ Bug fixes + attributes with ``track_order=True``. + * Fix for building with mpi4py on Python 3.10 (:pr:`2101`). + * Fixed fancy indexing with a boolean array for a single dimension (:pr:`2079`). +-* Avoid returning unitialised memory when reading from a chunked dataset with ++* Avoid returning uninitialised memory when reading from a chunked dataset with + missing chunks and no fill value (:pr:`2076`). + * Enable setting of fillvalue for datasets with variable length string dtype + (:pr:`2044`). +diff --git a/h5py/_errors.pxd b/h5py/_errors.pxd +index df9c1bbe..3cba6307 100644 +--- a/h5py/_errors.pxd ++++ b/h5py/_errors.pxd +@@ -23,7 +23,7 @@ cdef extern from "hdf5.h": + H5E_ARGS, # invalid arguments to routine + H5E_RESOURCE, # resource unavailable + H5E_INTERNAL, # Internal error (too specific to document) +- H5E_FILE, # file Accessability ++ H5E_FILE, # file Accessibility + H5E_IO, # Low-level I/O + H5E_FUNC, # function Entry/Exit + H5E_ATOM, # object Atom +@@ -121,7 +121,7 @@ cdef extern from "hdf5.h": + # No error + H5E_NONE_MINOR # No error + +- # File accessability errors ++ # File accessibility errors + H5E_FILEEXISTS # File already exists + H5E_FILEOPEN # File already open + H5E_CANTCREATE # Unable to create file +@@ -207,7 +207,7 @@ cdef extern from "hdf5.h": + H5E_ARGS, # invalid arguments to routine + H5E_RESOURCE, # resource unavailable + H5E_INTERNAL, # Internal error (too specific to document) +- H5E_FILE, # file Accessability ++ H5E_FILE, # file Accessibility + H5E_IO, # Low-level I/O + H5E_FUNC, # function Entry/Exit + H5E_ID, # object ID +@@ -305,7 +305,7 @@ cdef extern from "hdf5.h": + # No error + H5E_NONE_MINOR # No error + +- # File accessability errors ++ # File accessibility errors + H5E_FILEEXISTS # File already exists + H5E_FILEOPEN # File already open + H5E_CANTCREATE # Unable to create file +@@ -425,4 +425,4 @@ ctypedef struct err_cookie: + cdef err_cookie set_error_handler(err_cookie handler) + + # Set the default error handler set by silence_errors/unsilence_errors +-cdef void set_default_error_handler() nogil ++cdef void set_default_error_handler() noexcept nogil +diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx +index c3bd184e..2a7524b2 100644 +--- a/h5py/_errors.pyx ++++ b/h5py/_errors.pyx +@@ -94,7 +94,7 @@ cdef struct err_data_t: + H5E_error_t err + int n + +-cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil noexcept: ++cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) noexcept nogil: + + cdef err_data_t *ee = <err_data_t*>e + +@@ -168,7 +168,7 @@ cdef err_cookie _error_handler # Store error handler used by h5py + _error_handler.func = NULL + _error_handler.data = NULL + +-cdef void set_default_error_handler() nogil: ++cdef void set_default_error_handler() noexcept nogil: + """Set h5py's current default error handler""" + H5Eset_auto(<hid_t>H5E_DEFAULT, _error_handler.func, _error_handler.data) + +diff --git a/h5py/_hl/base.py b/h5py/_hl/base.py +index cad37053..9d261c90 100644 +--- a/h5py/_hl/base.py ++++ b/h5py/_hl/base.py +@@ -20,7 +20,7 @@ import posixpath + import numpy as np + + # The high-level interface is serialized; every public API function & method +-# is wrapped in a lock. We re-use the low-level lock because (1) it's fast, ++# is wrapped in a lock. We reuse the low-level lock because (1) it's fast, + # and (2) it eliminates the possibility of deadlocks due to out-of-order + # lock acquisition. + from .._objects import phil, with_phil +@@ -524,7 +524,7 @@ def product(nums): + # Daniel Greenfeld, BSD license), where it is attributed to bottle (Copyright + # (c) 2009-2022, Marcel Hellkamp, MIT license). + +-class cached_property(object): ++class cached_property: + def __init__(self, func): + self.__doc__ = getattr(func, "__doc__") + self.func = func +diff --git a/h5py/_hl/dataset.py b/h5py/_hl/dataset.py +index b69aba48..77b202d2 100644 +--- a/h5py/_hl/dataset.py ++++ b/h5py/_hl/dataset.py +@@ -334,10 +334,10 @@ class ChunkIterator: + self._layout = dset.chunks + if source_sel is None: + # select over entire dataset +- slices = [] +- for dim in range(rank): +- slices.append(slice(0, self._shape[dim])) +- self._sel = tuple(slices) ++ self._sel = tuple( ++ slice(0, self._shape[dim]) ++ for dim in range(rank) ++ ) + else: + if isinstance(source_sel, slice): + self._sel = (source_sel,) +diff --git a/h5py/_hl/dims.py b/h5py/_hl/dims.py +index d3c9206b..0cf4c9f3 100644 +--- a/h5py/_hl/dims.py ++++ b/h5py/_hl/dims.py +@@ -53,8 +53,7 @@ class DimensionProxy(base.CommonStateObject): + + @with_phil + def __iter__(self): +- for k in self.keys(): +- yield k ++ yield from self.keys() + + @with_phil + def __len__(self): +diff --git a/h5py/_hl/files.py b/h5py/_hl/files.py +index aa4fb78d..bfcf3098 100644 +--- a/h5py/_hl/files.py ++++ b/h5py/_hl/files.py +@@ -480,7 +480,7 @@ class File(Group): + + alignment_threshold + Together with ``alignment_interval``, this property ensures that +- any file object greater than or equal in size to the alignement ++ any file object greater than or equal in size to the alignment + threshold (in bytes) will be aligned on an address which is a + multiple of alignment interval. + +diff --git a/h5py/_locks.pxi b/h5py/_locks.pxi +index bc8b2dd9..1ec4e2fc 100644 +--- a/h5py/_locks.pxi ++++ b/h5py/_locks.pxi +@@ -63,7 +63,7 @@ cdef class FastRLock: + return self._owner == pythread.PyThread_get_thread_ident() + + +-cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) nogil: ++cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) noexcept nogil: + # Note that this function *must* hold the GIL when being called. + # We just use 'nogil' in the signature to make sure that no Python + # code execution slips in that might free the GIL +@@ -83,7 +83,7 @@ cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) n + lock, current_thread, + pythread.WAIT_LOCK if blocking else pythread.NOWAIT_LOCK) + +-cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) nogil: ++cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) noexcept nogil: + # Note that this function *must* hold the GIL when being called. + # We just use 'nogil' in the signature to make sure that no Python + # code execution slips in that might free the GIL +@@ -111,7 +111,7 @@ cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) nogil: + lock._count = 1 + return 1 + +-cdef inline void unlock_lock(FastRLock lock) nogil: ++cdef inline void unlock_lock(FastRLock lock) noexcept nogil: + # Note that this function *must* hold the GIL when being called. + # We just use 'nogil' in the signature to make sure that no Python + # code execution slips in that might free the GIL +diff --git a/h5py/_proxy.pyx b/h5py/_proxy.pyx +index 46b4fe0d..e40504f5 100644 +--- a/h5py/_proxy.pyx ++++ b/h5py/_proxy.pyx +@@ -241,7 +241,7 @@ ctypedef struct h5py_scatter_t: + void* buf + + cdef herr_t h5py_scatter_cb(void* elem, hid_t type_id, unsigned ndim, +- const hsize_t *point, void *operator_data) nogil except -1: ++ const hsize_t *point, void *operator_data) except -1 nogil: + cdef h5py_scatter_t* info = <h5py_scatter_t*>operator_data + + memcpy(elem, (<char*>info[0].buf)+((info[0].i)*(info[0].elsize)), +@@ -252,7 +252,7 @@ cdef herr_t h5py_scatter_cb(void* elem, hid_t type_id, unsigned ndim, + return 0 + + cdef herr_t h5py_gather_cb(void* elem, hid_t type_id, unsigned ndim, +- const hsize_t *point, void *operator_data) nogil except -1: ++ const hsize_t *point, void *operator_data) except -1 nogil: + cdef h5py_scatter_t* info = <h5py_scatter_t*>operator_data + + memcpy((<char*>info[0].buf)+((info[0].i)*(info[0].elsize)), elem, +diff --git a/h5py/_selector.pyx b/h5py/_selector.pyx +index 8b858c82..69970176 100644 +--- a/h5py/_selector.pyx ++++ b/h5py/_selector.pyx +@@ -341,7 +341,7 @@ cdef class Reader: + + arr = PyArray_ZEROS(arr_rank, arr_shape, self.np_typenum, 0) + if not self.native_byteorder: +- arr = arr.newbyteorder() ++ arr = arr.view(arr.dtype.newbyteorder()) + finally: + efree(arr_shape) + +diff --git a/h5py/api_compat.h b/h5py/api_compat.h +index 52917f4d..a359e827 100644 +--- a/h5py/api_compat.h ++++ b/h5py/api_compat.h +@@ -24,7 +24,6 @@ typedef void *PyMPI_MPI_Message; + #include <stddef.h> + #include "Python.h" + #include "numpy/arrayobject.h" +-#include "hdf5.h" + + /* The HOFFSET macro can't be used from Cython. */ + +@@ -35,14 +34,14 @@ typedef void *PyMPI_MPI_Message; + #define h5py_size_n256 (sizeof(npy_complex256)) + #endif + +-#define h5py_offset_n64_real (HOFFSET(npy_complex64, real)) +-#define h5py_offset_n64_imag (HOFFSET(npy_complex64, imag)) +-#define h5py_offset_n128_real (HOFFSET(npy_complex128, real)) +-#define h5py_offset_n128_imag (HOFFSET(npy_complex128, imag)) ++#define h5py_offset_n64_real (0) ++#define h5py_offset_n64_imag (sizeof(float)) ++#define h5py_offset_n128_real (0) ++#define h5py_offset_n128_imag (sizeof(double)) + + #ifdef NPY_COMPLEX256 +-#define h5py_offset_n256_real (HOFFSET(npy_complex256, real)) +-#define h5py_offset_n256_imag (HOFFSET(npy_complex256, imag)) ++#define h5py_offset_n256_real (0) ++#define h5py_offset_n256_imag (sizeof(long double)) + #endif + + #endif +diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd +index a198f105..099e0f58 100644 +--- a/h5py/api_types_hdf5.pxd ++++ b/h5py/api_types_hdf5.pxd +@@ -257,27 +257,27 @@ cdef extern from "hdf5.h": + herr_t (*sb_encode)(H5FD_t *file, char *name, unsigned char *p) + herr_t (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p) + size_t fapl_size +- void * (*fapl_get)(H5FD_t *file) +- void * (*fapl_copy)(const void *fapl) +- herr_t (*fapl_free)(void *fapl) ++ void * (*fapl_get)(H5FD_t *file) except * ++ void * (*fapl_copy)(const void *fapl) except * ++ herr_t (*fapl_free)(void *fapl) except -1 + size_t dxpl_size + void * (*dxpl_copy)(const void *dxpl) + herr_t (*dxpl_free)(void *dxpl) +- H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) +- herr_t (*close)(H5FD_t *file) ++ H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) except * ++ herr_t (*close)(H5FD_t *file) except -1 + int (*cmp)(const H5FD_t *f1, const H5FD_t *f2) + herr_t (*query)(const H5FD_t *f1, unsigned long *flags) + herr_t (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map) + haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) + herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size) +- haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) +- herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) +- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) ++ haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept ++ herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept ++ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1 + herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle) +- herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) +- herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) +- herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) +- herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) ++ herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except * ++ herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except * ++ herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 ++ herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 + herr_t (*lock)(H5FD_t *file, hbool_t rw) + herr_t (*unlock)(H5FD_t *file) + H5FD_mem_t fl_map[<int>H5FD_MEM_NTYPES] +@@ -295,27 +295,27 @@ cdef extern from "hdf5.h": + herr_t (*sb_encode)(H5FD_t *file, char *name, unsigned char *p) + herr_t (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p) + size_t fapl_size +- void * (*fapl_get)(H5FD_t *file) +- void * (*fapl_copy)(const void *fapl) +- herr_t (*fapl_free)(void *fapl) ++ void * (*fapl_get)(H5FD_t *file) except * ++ void * (*fapl_copy)(const void *fapl) except * ++ herr_t (*fapl_free)(void *fapl) except -1 + size_t dxpl_size + void * (*dxpl_copy)(const void *dxpl) + herr_t (*dxpl_free)(void *dxpl) +- H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) +- herr_t (*close)(H5FD_t *file) ++ H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) except * ++ herr_t (*close)(H5FD_t *file) except -1 + int (*cmp)(const H5FD_t *f1, const H5FD_t *f2) + herr_t (*query)(const H5FD_t *f1, unsigned long *flags) + herr_t (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map) + haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) + herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size) +- haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) +- herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) +- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) ++ haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept ++ herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept ++ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1 + herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle) +- herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) +- herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) +- herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) +- herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) ++ herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except * ++ herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except * ++ herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 ++ herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 + herr_t (*lock)(H5FD_t *file, hbool_t rw) + herr_t (*unlock)(H5FD_t *file) + H5FD_mem_t fl_map[<int>H5FD_MEM_NTYPES] +diff --git a/h5py/h5fd.pyx b/h5py/h5fd.pyx +index e9746057..d39cf68f 100644 +--- a/h5py/h5fd.pyx ++++ b/h5py/h5fd.pyx +@@ -144,10 +144,10 @@ cdef herr_t H5FD_fileobj_close(H5FD_fileobj_t *f) except -1 with gil: + stdlib_free(f) + return 0 + +-cdef haddr_t H5FD_fileobj_get_eoa(const H5FD_fileobj_t *f, H5FD_mem_t type): ++cdef haddr_t H5FD_fileobj_get_eoa(const H5FD_fileobj_t *f, H5FD_mem_t type) noexcept nogil: + return f.eoa + +-cdef herr_t H5FD_fileobj_set_eoa(H5FD_fileobj_t *f, H5FD_mem_t type, haddr_t addr): ++cdef herr_t H5FD_fileobj_set_eoa(H5FD_fileobj_t *f, H5FD_mem_t type, haddr_t addr) noexcept nogil: + f.eoa = addr + return 0 + +@@ -191,22 +191,38 @@ cdef herr_t H5FD_fileobj_flush(H5FD_fileobj_t *f, hid_t dxpl, hbool_t closing) e + cdef H5FD_class_t info + memset(&info, 0, sizeof(info)) + ++# Cython doesn't support "except X" in casting definition currently ++ctypedef herr_t (*file_free_func_ptr)(void *) except -1 ++ ++ctypedef herr_t (*file_close_func_ptr)(H5FD_t *) except -1 ++ctypedef haddr_t (*file_get_eoa_func_ptr)(const H5FD_t *, H5FD_mem_t) noexcept ++ctypedef herr_t (*file_set_eof_func_ptr)(H5FD_t *, H5FD_mem_t, haddr_t) noexcept ++ctypedef haddr_t (*file_get_eof_func_ptr)(const H5FD_t *, H5FD_mem_t) except -1 ++ctypedef herr_t (*file_read_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void*) except -1 ++ctypedef herr_t (*file_write_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void*) except -1 ++ctypedef herr_t (*file_truncate_func_ptr)(H5FD_t *, hid_t, hbool_t) except -1 ++ctypedef herr_t (*file_flush_func_ptr)(H5FD_t *, hid_t, hbool_t) except -1 ++ ++ + info.name = 'fileobj' + info.maxaddr = libc.stdint.SIZE_MAX - 1 + info.fc_degree = H5F_CLOSE_WEAK + info.fapl_size = sizeof(PyObject *) + info.fapl_get = <void *(*)(H5FD_t *)>H5FD_fileobj_fapl_get + info.fapl_copy = <void *(*)(const void *)>H5FD_fileobj_fapl_copy +-info.fapl_free = <herr_t (*)(void *)>H5FD_fileobj_fapl_free ++ ++info.fapl_free = <file_free_func_ptr>H5FD_fileobj_fapl_free ++ + info.open = <H5FD_t *(*)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr)>H5FD_fileobj_open +-info.close = <herr_t (*)(H5FD_t *)>H5FD_fileobj_close +-info.get_eoa = <haddr_t (*)(const H5FD_t *, H5FD_mem_t)>H5FD_fileobj_get_eoa +-info.set_eoa = <herr_t (*)(H5FD_t *, H5FD_mem_t, haddr_t)>H5FD_fileobj_set_eoa +-info.get_eof = <haddr_t (*)(const H5FD_t *, H5FD_mem_t)>H5FD_fileobj_get_eof +-info.read = <herr_t (*)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void *)>H5FD_fileobj_read +-info.write = <herr_t (*)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void *)>H5FD_fileobj_write +-info.truncate = <herr_t (*)(H5FD_t *, hid_t, hbool_t)>H5FD_fileobj_truncate +-info.flush = <herr_t (*)(H5FD_t *, hid_t, hbool_t)>H5FD_fileobj_flush ++ ++info.close = <file_close_func_ptr>H5FD_fileobj_close ++info.get_eoa = <file_get_eoa_func_ptr>H5FD_fileobj_get_eoa ++info.set_eoa = <file_set_eof_func_ptr>H5FD_fileobj_set_eoa ++info.get_eof = <file_get_eof_func_ptr>H5FD_fileobj_get_eof ++info.read = <file_read_func_ptr>H5FD_fileobj_read ++info.write = <file_write_func_ptr>H5FD_fileobj_write ++info.truncate = <file_truncate_func_ptr>H5FD_fileobj_truncate ++info.flush = <file_flush_func_ptr>H5FD_fileobj_flush + # H5FD_FLMAP_DICHOTOMY + info.fl_map = [H5FD_MEM_SUPER, # default + H5FD_MEM_SUPER, # super +diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx +index 779ea1b5..dc8bf65a 100644 +--- a/h5py/h5p.pyx ++++ b/h5py/h5p.pyx +@@ -1177,7 +1177,7 @@ cdef class PropFAID(PropInstanceID): + size_t block_size IN: File system block size + size_t cbuf_size IN: Copy buffer size + +- Properites with value of 0 indicate that the HDF5 library should ++ Properties with value of 0 indicate that the HDF5 library should + choose the value. + """ + H5Pset_fapl_direct(self.id, alignment, block_size, cbuf_size) +@@ -1761,7 +1761,7 @@ cdef class PropOCID(PropCreateID): + + max_compact -- maximum number of attributes to be stored in compact storage(default:8) + must be greater than or equal to min_dense +- min_dense -- minmum number of attributes to be stored in dense storage(default:6) ++ min_dense -- minimum number of attributes to be stored in dense storage(default:6) + + """ + H5Pset_attr_phase_change(self.id, max_compact, min_dense) +diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx +index e7aae14f..b9d7e74d 100644 +--- a/h5py/h5t.pyx ++++ b/h5py/h5t.pyx +@@ -1938,7 +1938,7 @@ def check_dtype(**kwds): + + vlen = dtype + If the dtype represents an HDF5 vlen, returns the Python base class. +- Currently only builting string vlens (str) are supported. Returns ++ Currently only built-in string vlens (str) are supported. Returns + None if the dtype does not represent an HDF5 vlen. + + enum = dtype +diff --git a/h5py/tests/test_attrs_data.py b/h5py/tests/test_attrs_data.py +index 56481ca0..5083a1aa 100644 +--- a/h5py/tests/test_attrs_data.py ++++ b/h5py/tests/test_attrs_data.py +@@ -262,7 +262,7 @@ class TestEmpty(BaseAttrs): + self.assertTrue(is_empty_dataspace(h5a.open(self.f.id, b'y'))) + + def test_modify(self): +- with self.assertRaises(IOError): ++ with self.assertRaises(OSError): + self.f.attrs.modify('x', 1) + + def test_values(self): +diff --git a/h5py/tests/test_big_endian_file.py b/h5py/tests/test_big_endian_file.py +index 4d81de01..170b5bcc 100644 +--- a/h5py/tests/test_big_endian_file.py ++++ b/h5py/tests/test_big_endian_file.py +@@ -24,14 +24,14 @@ def test_vlen_big_endian(): + assert dset[4] == 1.2 + assert dset.dtype == "<f8" + +- # Same float values with big endianess ++ # Same float values with big endianness + assert f["DSBEfloat"][0] == 3.14 + assert f["DSBEfloat"].dtype == ">f8" + + assert f["DSLEint"][0] == 1 + assert f["DSLEint"].dtype == "<u8" + +- # Same int values with big endianess ++ # Same int values with big endianness + assert f["DSBEint"][0] == 1 + assert f["DSBEint"].dtype == ">i8" + +diff --git a/h5py/tests/test_dataset.py b/h5py/tests/test_dataset.py +index e104dd53..0ffa5c80 100644 +--- a/h5py/tests/test_dataset.py ++++ b/h5py/tests/test_dataset.py +@@ -1939,9 +1939,9 @@ class TestCommutative(BaseDataset): + dset = self.f.create_dataset("test", shape, dtype=float, + data=np.random.rand(*shape)) + +- # grab a value from the elements, ie dset[0] ++ # grab a value from the elements, ie dset[0, 0] + # check that mask arrays are commutative wrt ==, != +- val = np.float64(dset[0]) ++ val = np.float64(dset[0, 0]) + + assert np.all((val == dset) == (dset == val)) + assert np.all((val != dset) == (dset != val)) +diff --git a/h5py/tests/test_file.py b/h5py/tests/test_file.py +index b47d408e..1aa38731 100644 +--- a/h5py/tests/test_file.py ++++ b/h5py/tests/test_file.py +@@ -326,7 +326,7 @@ class TestDrivers(TestCase): + # could be an integer multiple of 512 + # + # To allow HDF5 to do the heavy lifting for different platform, +- # We didn't provide any argumnets to the first call ++ # We didn't provide any arguments to the first call + # and obtained HDF5's default values there. + + # Testing creation with a few different property lists +@@ -639,9 +639,9 @@ class TestUnicode(TestCase): + Modes 'r' and 'r+' do not create files even when given unicode names + """ + fname = self.mktemp(prefix=chr(0x201a)) +- with self.assertRaises(IOError): ++ with self.assertRaises(OSError): + File(fname, 'r') +- with self.assertRaises(IOError): ++ with self.assertRaises(OSError): + File(fname, 'r+') + + +diff --git a/h5py/tests/test_file_alignment.py b/h5py/tests/test_file_alignment.py +index c280bb76..da13ee04 100644 +--- a/h5py/tests/test_file_alignment.py ++++ b/h5py/tests/test_file_alignment.py +@@ -50,7 +50,7 @@ class TestFileAlignment(TestCase): + alignment_interval = 4096 + + for shape in [ +- (1033,), # A prime number above the thresold ++ (1033,), # A prime number above the threshold + (1000,), # Exactly equal to the threshold + (1001,), # one above the threshold + ]: +@@ -75,7 +75,7 @@ class TestFileAlignment(TestCase): + alignment_interval = 1024 + + for shape in [ +- (881,), # A prime number below the thresold ++ (881,), # A prime number below the threshold + (999,), # Exactly one below the threshold + ]: + fname = self.mktemp() +diff --git a/h5py/tests/test_group.py b/h5py/tests/test_group.py +index 328c352a..4af1fb1f 100644 +--- a/h5py/tests/test_group.py ++++ b/h5py/tests/test_group.py +@@ -771,7 +771,7 @@ class TestExternalLinks(TestCase): + with self.assertRaises(KeyError): + self.f['ext'] + +- # I would prefer IOError but there's no way to fix this as the exception ++ # I would prefer OSError but there's no way to fix this as the exception + # class is determined by HDF5. + def test_exc_missingfile(self): + """ KeyError raised when attempting to open missing file """ +@@ -844,7 +844,7 @@ class TestExtLinkBugs(TestCase): + try: + if x: + x.close() +- except IOError: ++ except OSError: + pass + return w + orig_name = self.mktemp() +diff --git a/h5py/tests/test_selections.py b/h5py/tests/test_selections.py +index 0b1722d7..01f6dcb7 100644 +--- a/h5py/tests/test_selections.py ++++ b/h5py/tests/test_selections.py +@@ -65,7 +65,7 @@ class TestTypeGeneration(BaseSelection): + self.assertEqual(out, np.dtype('i')) + self.assertEqual(format, np.dtype( [('a','i')] )) + +- # Field does not apear in named typed ++ # Field does not appear in named typed + with self.assertRaises(ValueError): + out, format = sel2.read_dtypes(dt, ('j', 'k')) + +diff --git a/pylintrc b/pylintrc +index 045df2f7..2401d3b0 100644 +--- a/pylintrc ++++ b/pylintrc +@@ -44,7 +44,7 @@ confidence= + # can either give multiple identifiers separated by comma (,) or put this + # option multiple times (only on the command line, not in the configuration + # file where it should appear only once).You can also use "--disable=all" to +-# disable everything first and then reenable specific checks. For example, if ++# disable everything first and then re-enable specific checks. For example, if + # you want to run only the similarities checker, you can use "--disable=all + # --enable=similarities". If you want to run only the classes checker, but have + # no Warning level messages displayed, use"--disable=all --enable=classes +diff --git a/pyproject.toml b/pyproject.toml +index ee573d2f..717200ef 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] + requires = [ +- "Cython >=0.29.31,<1", ++ "Cython >=0.29.31,<4", + "oldest-supported-numpy", + "pkgconfig", + "setuptools >=61", +diff --git a/setup_configure.py b/setup_configure.py +index 0fba53ba..c3b86a64 100644 +--- a/setup_configure.py ++++ b/setup_configure.py +@@ -165,7 +165,7 @@ class BuildConfig: + try: + if pkgconfig.exists(pc_name): + pc = pkgconfig.parse(pc_name) +- except EnvironmentError: ++ except OSError: + if os.name != 'nt': + print( + "Building h5py requires pkg-config unless the HDF5 path " +diff --git a/tox.ini b/tox.ini +index 0efb88a6..86a176dd 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -65,7 +65,7 @@ skip_install=True + package_env = DUMMY NON-EXISTENT ENV NAME + changedir=docs + deps= +- sphinx ++ -r docs/requirements-rtd.txt + commands= + sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb index e772106857..8a9158525e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" SRC_URI[sha256sum] = "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049" -SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" +SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch \ + file://0001-Fix-Cython-3-compatibility.patch" inherit pkgconfig pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb deleted file mode 100644 index 7e058a757b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library to process JSON-RPC requests" -HOMEPAGE = "https://github.com/explodinglabs/jsonrpcserver" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=61b63ea9d36f6fb63ddaaaac8265304f" - -SRC_URI[sha256sum] = "a71fb2cfa18541c80935f60987f92755d94d74141248c7438847b96eee5c4482" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - python3-apply-defaults \ - python3-asyncio \ - python3-core \ - python3-json \ - python3-jsonschema \ - python3-logging \ - python3-netclient \ - python3-pkgutil \ - python3-oslash \ - python3-typing-extensions \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb index a72ee14f6c..9e791c6e78 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Open source Python library for rapid development of applications \ that make use of innovative user interfaces, such as multi-touch apps." HOMEPAGE = "https://kivy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ed5cd0f2cfda42852c332e3b88c85fea" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d3bc49400e35d5a2279d14c40dcfb09" inherit setuptools3 pkgconfig features_check PIP_INSTALL_PACKAGE = "Kivy" @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \ file://0001-add-support-for-glesv2.patch \ " -SRCREV = "344768bfefd2e8f5302cc9dfb8ca41991ce6f7e7" +SRCREV = "9ef218027178115a66b417ae34b21f488bdd3617" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb deleted file mode 100644 index 52e1cf6af7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python bindings for kmod/libkmod." -HOMEPAGE = "https://github.com/agrover/python-kmod" -SECTION = "devel/python" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d62c2454850386a2ffe44f72db83d74" - -inherit pypi setuptools3 - -RECIPE_NO_UPDATE_REASON = "Version 0.9.2 is broken when using latest build machinery for C extensions" -SRC_URI[sha256sum] = "f3bf829059bf88eca22f4f549e17aa316cdaa14302bf2ba49ddeee60cea109ff" - -DEPENDS += " \ - kmod \ - python3-cython-native \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.3.bb index f0c8684b0d..746926da4e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.3.bb @@ -11,7 +11,7 @@ DEPENDS += " \ SRC_URI += "file://run-ptest" -SRC_URI[sha256sum] = "e1431d84a9cfb23e6773e72078ce8e65cad6745816d4cbf9ae67da5ea419acda" +SRC_URI[sha256sum] = "01fe674ef2889dbb9899d8a67361e0c4a2c833af5aeb37dd505727cf5d2a131e" inherit pkgconfig pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.0.bb index 471d939a82..15350e9426 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.0.bb @@ -2,7 +2,7 @@ SUMMARY = "A network address manipulation library for Python." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" -SRC_URI[sha256sum] = "7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128" +SRC_URI[sha256sum] = "4c30c54adf4ea4318b3c055ea3d8c7f6554a50aa2cd8aea4605a23caa0b0229e" 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 deleted file mode 100644 index b926484db0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Functors, Applicatives, And Monads in Python" -HOMEPAGE = "https://github.com/dbrattli/oslash" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=ed79d2637878dfe97de89e357b5c02dd" - -DEPENDS += "\ - ${PYTHON_PN}-pip-native \ - ${PYTHON_PN}-pytest-runner-native\ -" - -SRC_URI[sha256sum] = "868aeb58a656f2ed3b73d9dd6abe387b20b74fc9413d3e8653b615b15bf728f3" - -PYPI_PACKAGE = "OSlash" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-json \ - python3-typing-extensions \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.2.bb index 5ff6ffc9e3..f8a593c2b8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.2.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" -SRC_URI[sha256sum] = "b10bc4e5394856f1639ddc9bc754d9c26323ec5b828a135c6ed35f935b054b83" +SRC_URI[sha256sum] = "5b31255c48d4aca596c73fb872a82848cbe8ff92f008712a9a264455247063ee" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.6.bb index 01f180c8cb..e58ee7fd66 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.6.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI[sha256sum] = "6d30226dfc816dd0fdf120cae611dd2215117e4f9b124af8c60ab9093b6e8e71" +SRC_URI[sha256sum] = "1fd0c1d395372843fba13a51c28e3bb9d59bd7aebfeb17358ffaaa1e4dbbe948" DEPENDS = "python3-maturin-native python3-typing-extensions" @@ -34,6 +34,17 @@ RDEPENDS:${PN}-ptest += "\ python3-unittest-automake-output \ " +do_install:append() { + for f in ${D}/${libdir}/${PYTHON_DIR}/site-packages/pydantic_core/_pydantic_core.*.so + do + fname=`basename $f` + lname=`echo $fname | sed 's/musl/gnu/'` + if [ "$fname" != "$lname" ]; then + mv $f ${D}/${libdir}/${PYTHON_DIR}/site-packages/pydantic_core/$lname + fi + done +} + do_install_ptest() { cp -rf ${S}/tests/ ${D}${PTEST_PATH}/ rm -rf ${D}${PTEST_PATH}/tests/benchmarks diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyflakes_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyflakes_3.2.0.bb index 11f11b776d..b7ee20ebe4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyflakes_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyflakes_3.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/PyCQA/pyflakes" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=690c2d09203dc9e07c4083fc45ea981f" -SRC_URI[sha256sum] = "a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc" +SRC_URI[sha256sum] = "1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest index 7a5ceedf95..2a4e87e03a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest --benchmark-disable -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --benchmark-disable -vv --minimal-messages-config tests/test_functional.py | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb index 09ab1f26ff..cc33edd829 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb @@ -46,6 +46,9 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ install -Dm 0644 ${S}/tests/.pylint_primer_tests/.gitkeep ${D}${PTEST_PATH}/tests/.pylint_primer_tests/.gitkeep sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript + # regression_distutil_import_error_73.py fails to run see + # https://lists.openembedded.org/g/openembedded-devel/topic/103181847 + rm ${D}${PTEST_PATH}/tests/functional/r/regression_02/regression_distutil_import_error_73.py } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.182.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.183.bb index 12bf6245e5..dec8186993 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.182.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.183.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[sha256sum] = "888e848494e04148c8ff5887f04154a2b40f3065c53d93f9cec65f7ca7171362" +SRC_URI[sha256sum] = "00abe5592f07bb1cd41ca803f9b0b8b2b70474004a779be53cd215280fd625b3" inherit python_poetry_core pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.3.bb index a00778c99f..85f69ac3ab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=136e4f49dbf29942c572a3a8f6e88a77" -SRC_URI[sha256sum] = "c16052382554c7b22d48782ab3438d5b10f8cf7a4bdcae7f0f67f097d95beecc" +SRC_URI[sha256sum] = "af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb index 1ff3e75cbe..3a68011f4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb @@ -10,5 +10,6 @@ SRC_URI[sha256sum] = "3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6 inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS:${PN} += "python3-coverage" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.25.bb index 91ab762eb6..35011553c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.24.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.25.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ application developers the full power and flexibility of SQL" HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb" -SRC_URI[sha256sum] = "6db97656fd3fe3f7e5b077f12fa6adb5feb6e0b567a3e99f47ecf5f7ea0a09e3" +SRC_URI[sha256sum] = "a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb index 19ea0113a5..0089d6c6e1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ipython.org" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=13bed0ee6f46a6f6dbf1f9f9572f250a" -SRC_URI[sha256sum] = "fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772" +SRC_URI[sha256sum] = "8585105b371a04b8316a43d5ce29c098575c2e477850b62b848b964f1444527e" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.3.0.bb deleted file mode 100644 index d8ce4ab403..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.3.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Declarative parsing and validation of HTTP request objects, with built-in support for popular web frameworks." -HOMEPAGE = "https://github.com/marshmallow-code/webargs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c3ff8567ef1f2a8cf223f30ac5a6f094" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "cab207941b0686c4d086c823632ddcd4343151644341a32fcf50b8eaa71e31c7" - -RDEPENDS:${PN} += "\ - python3-marshmallow \ - python3-packaging \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb new file mode 100644 index 0000000000..ea830807c2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Declarative parsing and validation of HTTP request objects, with built-in support for popular web frameworks." +HOMEPAGE = "https://github.com/marshmallow-code/webargs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dfbd4ae0074716275fc229c775723e8f" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "ea99368214a4ce613924be99d71db58c269631e95eff4fa09b7354e52dc006a5" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-marshmallow \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-asyncio \ + ${PYTHON_PN}-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb index b57c311002..1459538ea8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=17ed54aa95f4a6cd0d7a4747d14b64d0" -SRC_URI[sha256sum] = "5e51df8af9a60f6beead75efa10975e97768825a82146a65c7cbf5b915990620" +SRC_URI[sha256sum] = "f8d76180d7239c94c6322f7990ae1216dae3659b7aa1cee94b6318bdffb474b9" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/WTForms" UPSTREAM_CHECK_REGEX = "/WTForms/(?P<pver>(\d+[\.\-_]*)+)" 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 deleted file mode 100644 index 7259c3fad3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting" -HOMEPAGE = "https://github.com/pycontribs/xmlrunner" -LICENSE = "LGPL-3.0-only" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a" - -SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" -SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-unittest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.4.bb index 932cf22b1f..920ff4d69d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/burnash/gspread" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" -SRC_URI[sha256sum] = "298ebab76e6ed6a998eabc81545ec58f5610f44e2ddb4858b539a0634093f8ce" +SRC_URI[sha256sum] = "3fcef90183f15d3c9233b4caa021a83682f2b2ee678340c42d7ca7d8be98c6d1" S = "${WORKDIR}/gspread-${PV}" diff --git a/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_2.0.0.bb index fde1029c74..f0a6abd733 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_2.0.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/pydot/pydot" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3f6fa041dfcc7ff7747cfceaa34a3180" -SRC_URI[sha256sum] = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d" +SRC_URI[sha256sum] = "60246af215123fa062f21cd791be67dda23a6f280df09f68919e637a1e4f3235" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/CVE-2023-44487.patch b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/CVE-2023-44487.patch new file mode 100644 index 0000000000..2fc6a60f6f --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/CVE-2023-44487.patch @@ -0,0 +1,78 @@ +From 6ceef192e7af1c507826ac38a2d43f08bf265fb9 Mon Sep 17 00:00:00 2001 +From: Maxim Dounin <mdounin@mdounin.ru> +Date: Wed, 10 Jan 2024 18:52:11 +0000 +Subject: [PATCH] HTTP/2: per-iteration stream handling limit. + +To ensure that attempts to flood servers with many streams are detected +early, a limit of no more than 2 * max_concurrent_streams new streams per one +event loop iteration was introduced. This limit is applied even if +max_concurrent_streams is not yet reached - for example, if corresponding +streams are handled synchronously or reset. + +Further, refused streams are now limited to maximum of max_concurrent_streams +and 100, similarly to priority_limit initial value, providing some tolerance +to clients trying to open several streams at the connection start, yet +low tolerance to flooding attempts. + +Upstream-Status: Backport [https://github.com/nginx/nginx/commit/6ceef192e7af1c507826ac38a2d43f08bf265fb9] +CVE: CVE-2023-44487 + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + src/http/v2/ngx_http_v2.c | 15 +++++++++++++++ + src/http/v2/ngx_http_v2.h | 2 ++ + 2 files changed, 17 insertions(+) + +diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c +index ea3f27c..1116e56 100644 +--- a/src/http/v2/ngx_http_v2.c ++++ b/src/http/v2/ngx_http_v2.c +@@ -361,6 +361,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev) + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler"); + + h2c->blocked = 1; ++ h2c->new_streams = 0; + + if (c->close) { + c->close = 0; +@@ -1321,6 +1322,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos, + goto rst_stream; + } + ++ if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) { ++ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, ++ "client sent too many streams at once"); ++ ++ status = NGX_HTTP_V2_REFUSED_STREAM; ++ goto rst_stream; ++ } ++ + if (!h2c->settings_ack + && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) + && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW) +@@ -1386,6 +1395,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos, + + rst_stream: + ++ if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) { ++ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, ++ "client sent too many refused streams"); ++ return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR); ++ } ++ + if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) { + return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR); + } +diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h +index 4e25293..b9daf92 100644 +--- a/src/http/v2/ngx_http_v2.h ++++ b/src/http/v2/ngx_http_v2.h +@@ -124,6 +124,8 @@ struct ngx_http_v2_connection_s { + ngx_uint_t processing; + ngx_uint_t frames; + ngx_uint_t idle; ++ ngx_uint_t new_streams; ++ ngx_uint_t refused_streams; + ngx_uint_t priority_limit; + + ngx_uint_t pushing; diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb index 2e865e400e..e5666f6fe6 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.24.0.bb @@ -2,5 +2,7 @@ require nginx.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=175abb631c799f54573dc481454c8632" +SRC_URI:append = " file://CVE-2023-44487.patch" + SRC_URI[sha256sum] = "77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb index ab05fd3777..df7f47a118 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e inherit gettext pkgconfig autotools systemd features_check inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} -DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" +DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native" DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" COMPATIBLE_HOST:libc-musl = "null" |